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/httptunnel/Makefile | |
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/httptunnel/Makefile')
-rw-r--r-- | package/httptunnel/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile index 145018c56..58d56e06b 100644 --- a/package/httptunnel/Makefile +++ b/package/httptunnel/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= httptunnel PKG_VERSION:= 3.0.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 2a710f377c82ab4eb201458f7b9f99c5 -MASTER_SITES:= http://www.nocrew.org/software/httptunnel/ +PKG_DESCR:= http tunneling software +PKG_SECTION:= net +PKG_URL:= http://www.nocrew.org/software/httptunnel +PKG_SITES:= http://www.nocrew.org/software/httptunnel/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HTTPTUNNEL,httptunnel,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HTTPTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto |