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/elinks | |
| 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/elinks')
| -rw-r--r-- | package/elinks/Makefile | 8 | ||||
| -rw-r--r-- | package/elinks/ipkg/elinks.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/elinks/Makefile b/package/elinks/Makefile index 122115882..77f1b5e91 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= elinks PKG_VERSION:= 0.11.3 PKG_RELEASE:= 1 PKG_MD5SUM:= 11547e054d7afb1f5ac9e9f65728cc6a -MASTER_SITES:= http://elinks.or.cz/download/ +PKG_DESCR:= advanced text web browser +PKG_SECTION:= text +PKG_DEPENDS:= libopenssl +PKG_URL:= http://elinks.or.cz +PKG_SITES:= http://elinks.or.cz/download/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes diff --git a/package/elinks/ipkg/elinks.control b/package/elinks/ipkg/elinks.control deleted file mode 100644 index bbcb216bc..000000000 --- a/package/elinks/ipkg/elinks.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: elinks -Priority: optional -Section: text -Description: An advanced text web browser -Depends: libopenssl |