diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/sipsak | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/sipsak')
| -rw-r--r-- | package/sipsak/Makefile | 9 | ||||
| -rw-r--r-- | package/sipsak/ipkg/sipsak.control | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 8db0a1ec6..df2a00ef3 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -9,15 +9,18 @@ PKG_NAME:= sipsak PKG_VERSION:= 0.9.6 PKG_RELEASE:= 1 PKG_MD5SUM:= c4eb8e282902e75f4f040f09ea9d99d5 -MASTER_SITES:= http://download.berlios.de/sipsak/ \ +PKG_DESCR:= a SIP (Session Initiation Protocol) stress and diagnostics utility +PKG_SECTION:= net +PKG_DEPENDS:= libopenssl +PKG_URL:= http://sipsak.org +PKG_SITES:= http://download.berlios.de/sipsak/ \ http://ftp.iptel.org/pub/sipsak/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SIPSAK,sipsak,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SIPSAK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes CONFIGURE_ARGS+= --disable-gnutls BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/sipsak/ipkg/sipsak.control b/package/sipsak/ipkg/sipsak.control deleted file mode 100644 index 790629f78..000000000 --- a/package/sipsak/ipkg/sipsak.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: sipsak -Priority: optional -Section: net -Depends: libopenssl -Description: a SIP (Session Initiation Protocol) stress and diagnostics utility |