summaryrefslogtreecommitdiff
path: root/lynx
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2011-01-02 23:27:23 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2011-01-02 23:27:23 +0100
commit9352995934adec8059077af241c35ccd1573bd80 (patch)
tree60286e266b3b31b90b952ac37e12a1ebbcdd2eb6 /lynx
parentef3b84d78197acbd45d73a9b1ae44b47b5904290 (diff)
parent880bca260c4ce91554a49b2475232cf5c0ffd447 (diff)
downloadqipackages-fork-9352995934adec8059077af241c35ccd1573bd80.tar.gz
Merge branch 'master' of git://projects.qi-hardware.com/openwrt-packagesHEADmaster
Conflicts: links/Makefile
Diffstat (limited to 'lynx')
-rw-r--r--lynx/Makefile24
-rw-r--r--lynx/files/etc/lynx.cfg3
2 files changed, 20 insertions, 7 deletions
diff --git a/lynx/Makefile b/lynx/Makefile
index 4c1ddbe..159072e 100644
--- a/lynx/Makefile
+++ b/lynx/Makefile
@@ -8,15 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lynx
-PKG_VERSION:=2.8.7rel.1
+PKG_VERSION:=2.8.8dev.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://lynx.isc.org/current
+PKG_MD5SUM:=289255204d23c2c3e8094b50a8638dfc
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-8-7
-
-PKG_INSTALL:=1
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-8-8
include $(INCLUDE_DIR)/package.mk
@@ -24,7 +23,7 @@ define Package/lynx
TITLE:=lynx
SECTION:=network
CATEGORY:=Network
- DEPENDS:=+libncurses +zlib
+ DEPENDS:=+libncursesw +zlib +libopenssl
URL:=http://lynx.isc.org
endef
@@ -32,11 +31,22 @@ define Package/lynx/description
text console browser
endef
-CONFIGURE_ARGS += --with-zlib
+CONFIGURE_ARGS += --with-zlib --with-ssl \
+ --with-screen=ncursesw \
+ --enable-widec \
+ --enable-locale-charset \
+ --disable-color-style \
+ --enable-charset-choice \
+ --enable-cjk \
+ --enable-japanese-utf8 \
+ --enable-nsl-fork
+
+CONFIGURE_VARS += cf_cv_ncurses_header="ncursesw/curses.h" \
+ ac_cv_path_NCURSES_CONFIG=""
define Package/lynx/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lynx $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lynx $(1)/usr/bin/
$(INSTALL_DATA) ./files/etc/lynx.cfg $(1)/etc/
$(INSTALL_DATA) ./files/etc/lynx.lss $(1)/etc/
endef
diff --git a/lynx/files/etc/lynx.cfg b/lynx/files/etc/lynx.cfg
index e69de29..e9487f0 100644
--- a/lynx/files/etc/lynx.cfg
+++ b/lynx/files/etc/lynx.cfg
@@ -0,0 +1,3 @@
+LOCALE_CHARSET:TRUE
+ASSUME_CHARSET:utf-8
+ASSUME_LOCAL_CHARSET:utf-8