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/frickin | |
| 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/frickin')
| -rw-r--r-- | package/frickin/Makefile | 9 | ||||
| -rw-r--r-- | package/frickin/files/frickin.init | 3 | ||||
| -rw-r--r-- | package/frickin/files/frickin.postinst (renamed from package/frickin/ipkg/frickin.postinst) | 0 | ||||
| -rw-r--r-- | package/frickin/ipkg/frickin.control | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/package/frickin/Makefile b/package/frickin/Makefile index 1b4fe10cd..2e30b665b 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -9,19 +9,18 @@ PKG_NAME:= frickin PKG_VERSION:= 1.3 PKG_RELEASE:= 9 PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} +PKG_DESCR:= PPTP proxy +PKG_SECTION: net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FRICKIN,frickin,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto do-install: - ${INSTALL_DIR} ${IDIR_FRICKIN}/etc/init.d ${INSTALL_DIR} ${IDIR_FRICKIN}/usr/sbin - ${INSTALL_BIN} ./files/frickin.init \ - ${IDIR_FRICKIN}/etc/init.d/frickin ${INSTALL_BIN} ${WRKBUILD}/frickin ${IDIR_FRICKIN}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/frickin/files/frickin.init b/package/frickin/files/frickin.init index 2c3a117b3..4e63232c0 100644 --- a/package/frickin/files/frickin.init +++ b/package/frickin/files/frickin.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 75 +#PKG frickin +#INIT 75 . /etc/rc.conf case $1 in diff --git a/package/frickin/ipkg/frickin.postinst b/package/frickin/files/frickin.postinst index e7dfd069e..e7dfd069e 100644 --- a/package/frickin/ipkg/frickin.postinst +++ b/package/frickin/files/frickin.postinst diff --git a/package/frickin/ipkg/frickin.control b/package/frickin/ipkg/frickin.control deleted file mode 100644 index a8b3fb4f0..000000000 --- a/package/frickin/ipkg/frickin.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: frickin -Priority: optional -Section: net -Description: PPTP (Point-to-Point Tunneling Protocol) proxy |