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/reaim | |
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/reaim')
-rw-r--r-- | package/reaim/Makefile | 11 | ||||
-rw-r--r-- | package/reaim/files/reaim.init | 4 | ||||
-rw-r--r-- | package/reaim/files/reaim.postinst (renamed from package/reaim/ipkg/reaim.postinst) | 0 | ||||
-rw-r--r-- | package/reaim/ipkg/reaim.control | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/package/reaim/Makefile b/package/reaim/Makefile index 37cdda654..77d09db0e 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -9,20 +9,21 @@ PKG_NAME:= reaim PKG_VERSION:= 0.8 PKG_RELEASE:= 9 PKG_MD5SUM:= 647d2ab72ec454f89294accfb3182c09 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/} +PKG_DESCR:= A transparent AIM / MSN proxy +PKG_SECTION:= net +PKG_DEPENDS:= iptables +PKG_URL:= http://reaim.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=reaim/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,REAIM,reaim,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,REAIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_REAIM}/etc/init.d ${INSTALL_DIR} ${IDIR_REAIM}/usr/sbin - ${INSTALL_BIN} ./files/reaim.init \ - ${IDIR_REAIM}/etc/init.d/reaim ${INSTALL_BIN} ${WRKINST}/usr/sbin/reaim ${IDIR_REAIM}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/reaim/files/reaim.init b/package/reaim/files/reaim.init index 4ef211283..7450b7e08 100644 --- a/package/reaim/files/reaim.init +++ b/package/reaim/files/reaim.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 75 +#PKG reaim +#INIT 75 + . /etc/rc.conf IPT=/usr/sbin/iptables diff --git a/package/reaim/ipkg/reaim.postinst b/package/reaim/files/reaim.postinst index 39c37b222..39c37b222 100644 --- a/package/reaim/ipkg/reaim.postinst +++ b/package/reaim/files/reaim.postinst diff --git a/package/reaim/ipkg/reaim.control b/package/reaim/ipkg/reaim.control deleted file mode 100644 index 31bc9a9a3..000000000 --- a/package/reaim/ipkg/reaim.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: reaim -Priority: optional -Section: net -Depends: iptables -Description: A transparent AIM / MSN proxy |