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/lynx | |
| 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/lynx')
| -rw-r--r-- | package/lynx/Makefile | 11 | ||||
| -rw-r--r-- | package/lynx/ipkg/lynx.control | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/package/lynx/Makefile b/package/lynx/Makefile index aee2812e7..e51227fea 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -9,17 +9,22 @@ PKG_NAME= lynx PKG_VERSION= 2.8.7dev.7 PKG_RELEASE= 1 PKG_MD5SUM= 83891107c873421e5ac917cc0ab53fe8 -MASTER_SITES= http://lynx.isc.org/current/ \ +PKG_DESCR:= Standard text browser +PKG_SECTION:= text +PKG_DEPENDS:= libncurses libopenssl +PKG_URL:= http://lynx.isc.org +PKG_SITES= http://lynx.isc.org/current/ \ ${MASTER_SITE_MIRBSD} + DISTFILES= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/lynx2-8-7 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu -TCPPFLAGS+= -DLYNX_VERSION=\"${PKG_VERSION}-OpenADK-${PKG_RELEASE}\" +TCPPFLAGS+= -DLYNX_VERSION=\"${PKG_VERSION}-${PKG_RELEASE}\" # do not hardcode paths; do not scan for ports stuff CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_TN3270=tn3270 \ diff --git a/package/lynx/ipkg/lynx.control b/package/lynx/ipkg/lynx.control deleted file mode 100644 index 7ee22ce73..000000000 --- a/package/lynx/ipkg/lynx.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lynx -Priority: base -Section: www -Description: Standard text browser -Depends: libncurses, libopenssl |