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/haserl | |
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/haserl')
-rw-r--r-- | package/haserl/Makefile | 7 | ||||
-rw-r--r-- | package/haserl/ipkg/haserl.control | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/package/haserl/Makefile b/package/haserl/Makefile index f4f796e56..56ef46c19 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= haserl PKG_VERSION:= 0.8.0 PKG_RELEASE:= 1 PKG_MD5SUM:= bd9195d086566f56634c0bcbbbcbebea -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/} +PKG_DESCR:= a CGI wrapper to embed shell scripts in HTML documents +PKG_SECTION:= web +PKG_URL:= http://haserl.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=haserl/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HASERL,haserl,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HASERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCFLAGS+= -DMAX_UPLOAD_KB=8192 CONFIGURE_STYLE= gnu diff --git a/package/haserl/ipkg/haserl.control b/package/haserl/ipkg/haserl.control deleted file mode 100644 index 0243b6d75..000000000 --- a/package/haserl/ipkg/haserl.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: haserl -Priority: optional -Section: web -Description: a CGI wrapper to embed shell scripts in HTML documents |