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/bitlbee | |
| 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/bitlbee')
| -rw-r--r-- | package/bitlbee/Makefile | 14 | ||||
| -rw-r--r-- | package/bitlbee/files/bitlbee.conffiles (renamed from package/bitlbee/ipkg/bitlbee.conffiles) | 0 | ||||
| -rw-r--r-- | package/bitlbee/files/bitlbee.init | 3 | ||||
| -rw-r--r-- | package/bitlbee/files/bitlbee.postinst (renamed from package/bitlbee/ipkg/bitlbee.postinst) | 0 | ||||
| -rw-r--r-- | package/bitlbee/ipkg/bitlbee.control | 5 |
5 files changed, 9 insertions, 13 deletions
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 364c084f2..ea158d197 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -9,14 +9,18 @@ PKG_NAME:= bitlbee PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 2b1674d98804970809de3da3edf0bed2 -MASTER_SITES:= http://get.bitlbee.org/src/ \ +PKG_DESCR:= IRC gateway to IM chat networks +PKG_SECTION:= net +PKG_DEPENDS:= glib2 libopenssl libiconv +PKG_URL:= http://www.bitlbee.org +PKG_SITES:= http://get.bitlbee.org/src/ \ http://get.bitlbee.be/src/ \ http://get.us.bitlbee.org/src/ \ http://ftp.snt.utwente.nl/pub/software/bitlbee/src/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(ADK_IPV6),y) IPV6+= --ipv6=1 else @@ -57,12 +61,8 @@ post-configure: ${WRKBUILD}/Makefile.settings post-install: - ${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee - ${INSTALL_DIR} ${IDIR_BITLBEE}/etc/init.d - ${INSTALL_DIR} ${IDIR_BITLBEE}/usr/sbin + ${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee ${IDIR_BITLBEE}/usr/sbin ${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee ${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin - ${INSTALL_BIN} ./files/bitlbee.init \ - ${IDIR_BITLBEE}/etc/init.d/bitlbee include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bitlbee/ipkg/bitlbee.conffiles b/package/bitlbee/files/bitlbee.conffiles index 2ccc958d5..2ccc958d5 100644 --- a/package/bitlbee/ipkg/bitlbee.conffiles +++ b/package/bitlbee/files/bitlbee.conffiles diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init index 3ff950a9c..1ff40c754 100644 --- a/package/bitlbee/files/bitlbee.init +++ b/package/bitlbee/files/bitlbee.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 80 +#PKG bitlbee +#INIT 80 . /etc/rc.conf case $1 in diff --git a/package/bitlbee/ipkg/bitlbee.postinst b/package/bitlbee/files/bitlbee.postinst index a8e3b2ec4..a8e3b2ec4 100644 --- a/package/bitlbee/ipkg/bitlbee.postinst +++ b/package/bitlbee/files/bitlbee.postinst diff --git a/package/bitlbee/ipkg/bitlbee.control b/package/bitlbee/ipkg/bitlbee.control deleted file mode 100644 index 37ca895c8..000000000 --- a/package/bitlbee/ipkg/bitlbee.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bitlbee -Priority: optional -Section: net -Depends: glib2, libopenssl, libiconv -Description: IRC gateway to IM chat networks |