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/srelay | |
| 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/srelay')
| -rw-r--r-- | package/srelay/Makefile | 11 | ||||
| -rw-r--r-- | package/srelay/files/srelay.conffiles (renamed from package/srelay/ipkg/srelay.conffiles) | 0 | ||||
| -rw-r--r-- | package/srelay/files/srelay.init | 4 | ||||
| -rw-r--r-- | package/srelay/files/srelay.postinst (renamed from package/srelay/ipkg/srelay.postinst) | 0 | ||||
| -rw-r--r-- | package/srelay/ipkg/srelay.control | 4 |
5 files changed, 8 insertions, 11 deletions
diff --git a/package/srelay/Makefile b/package/srelay/Makefile index db3d0134c..6106efb1f 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -9,22 +9,21 @@ PKG_NAME:= srelay PKG_VERSION:= 0.4.6 PKG_RELEASE:= 9 PKG_MD5SUM:= 4a9f3298b38d8588f0ffde31b946a47f -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/} +PKG_DESCR:= A socks 4/5 proxy server +PKG_SECTION:= net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-thread BUILD_STYLE:= auto do-install: - ${INSTALL_DIR} ${IDIR_SRELAY}/usr/bin - ${INSTALL_DIR} ${IDIR_SRELAY}/etc/init.d + ${INSTALL_DIR} ${IDIR_SRELAY}/usr/bin ${IDIR_SRELAY}/etc ${INSTALL_BIN} ${WRKBUILD}/srelay ${IDIR_SRELAY}/usr/bin/ - ${INSTALL_BIN} ./files/srelay.init \ - ${IDIR_SRELAY}/etc/init.d/${PKG_NAME} ${INSTALL_DATA} ./files/srelay.conf ${IDIR_SRELAY}/etc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/srelay/ipkg/srelay.conffiles b/package/srelay/files/srelay.conffiles index d821cfd26..d821cfd26 100644 --- a/package/srelay/ipkg/srelay.conffiles +++ b/package/srelay/files/srelay.conffiles diff --git a/package/srelay/files/srelay.init b/package/srelay/files/srelay.init index e12024cf3..5cae3c161 100644 --- a/package/srelay/files/srelay.init +++ b/package/srelay/files/srelay.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG srelay +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/srelay/ipkg/srelay.postinst b/package/srelay/files/srelay.postinst index a3322a763..a3322a763 100644 --- a/package/srelay/ipkg/srelay.postinst +++ b/package/srelay/files/srelay.postinst diff --git a/package/srelay/ipkg/srelay.control b/package/srelay/ipkg/srelay.control deleted file mode 100644 index fdc21c864..000000000 --- a/package/srelay/ipkg/srelay.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: srelay -Priority: optional -Section: net -Description: A socks 4/5 proxy server |