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/tinyproxy | |
| 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/tinyproxy')
| -rw-r--r-- | package/tinyproxy/Makefile | 9 | ||||
| -rw-r--r-- | package/tinyproxy/files/tinyproxy.init | 4 | ||||
| -rw-r--r-- | package/tinyproxy/files/tinyproxy.postinst (renamed from package/tinyproxy/ipkg/tinyproxy.postinst) | 0 | ||||
| -rw-r--r-- | package/tinyproxy/ipkg/tinyproxy.control | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 6b2a65db7..9d2fa7637 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= tinyproxy PKG_VERSION:= 1.6.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 3157b9159a8d005f4248cf4d4d6c65e2 -MASTER_SITES:= https://www.banu.com/pub/tinyproxy/1.6/ +PKG_DESCR:= Tinyproxy is a lightweight HTTP and HTTPS proxy. +PKG_SECTION:= net +PKG_URL:= https://www.banu.com/tinyproxy +PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.6/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,TINYPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto @@ -33,12 +36,10 @@ endif post-install: ${INSTALL_DIR} ${IDIR_TINYPROXY}/usr/sbin \ ${IDIR_TINYPROXY}/etc/tinyproxy \ - ${IDIR_TINYPROXY}/etc/init.d \ ${IDIR_TINYPROXY}/usr/share/tinyproxy ${INSTALL_BIN} ${WRKINST}/usr/sbin/tinyproxy ${IDIR_TINYPROXY}/usr/sbin/ ${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/{debug,default,stats}.html ${IDIR_TINYPROXY}/usr/share/tinyproxy/ ${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/HTML_VARIABLES ${IDIR_TINYPROXY}/usr/share/tinyproxy/ ${INSTALL_DATA} ${WRKINST}/etc/tinyproxy/tinyproxy.conf ${IDIR_TINYPROXY}/etc/tinyproxy/ - ${INSTALL_BIN} files/${PKG_NAME}.init ${IDIR_TINYPROXY}/etc/init.d/${PKG_NAME} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init index e1b7f6f7c..8cf6fbb6a 100644 --- a/package/tinyproxy/files/tinyproxy.init +++ b/package/tinyproxy/files/tinyproxy.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 70 +#PKG tinyproxy +#INIT 70 + . /etc/rc.conf case $1 in diff --git a/package/tinyproxy/ipkg/tinyproxy.postinst b/package/tinyproxy/files/tinyproxy.postinst index 4965f625d..4965f625d 100644 --- a/package/tinyproxy/ipkg/tinyproxy.postinst +++ b/package/tinyproxy/files/tinyproxy.postinst diff --git a/package/tinyproxy/ipkg/tinyproxy.control b/package/tinyproxy/ipkg/tinyproxy.control deleted file mode 100644 index 821b927e4..000000000 --- a/package/tinyproxy/ipkg/tinyproxy.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: tinyproxy -Version: 1.6.3 -Section: net -Description: Tinyproxy is a lightweight HTTP and HTTPS proxy. -Priority: optional |