X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Felinks%2FMakefile;h=af26ac173d3bf1c255c30be39bab1bec3cfd951a;hb=5dd0b3be74481c0d48d2f75ed6c4bf60914590a7;hp=c9d9ce9bd0100e15dac8d10441d26a27810c5124;hpb=0550a9ac78eaf2c17bd304f198fdf6a6eb3e6e6d;p=packages.git

diff --git a/net/elinks/Makefile b/net/elinks/Makefile
index c9d9ce9bd..af26ac173 100644
--- a/net/elinks/Makefile
+++ b/net/elinks/Makefile
@@ -1,27 +1,23 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=elinks
-PKG_VERSION:=0.11.1
-PKG_RELEASE:=2
-PKG_MD5SUM:=c09d726075e4b5810fa07f8654088755
+PKG_VERSION:=0.11.7
+PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://elinks.or.cz/download/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://elinks.or.cz/download
+PKG_MD5SUM:=fcd087a6d2415cd4c6fd1db53dceb646
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/elinks
-  SUBMENU:=Web
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libopenssl
@@ -33,14 +29,18 @@ define Package/elinks/description
 An advanced text based web browser
 endef
 
+SHVAR_TRANS:= \
+	$(STAGING_DIR_HOST)/bin/sed -e \
+	'y%*+%pp%;s%[^_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]%_%g'
+
 define Build/Configure
  (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-                x=`echo ac_cv_file_./features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
-                x=`echo ac_cv_file_$(PKG_BUILD_DIR)/features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
+                x=`echo ac_cv_file_./features.conf | $(SHVAR_TRANS)` && export $$$${x}=yes && \
+                x=`echo ac_cv_file_$(abspath $(PKG_BUILD_DIR)/features.conf) | $(SHVAR_TRANS)` && export $$$${x}=yes && \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
-                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+                CPPFLAGS="$(TARGET_CPPFLAGS)" \
+                LDFLAGS="$(TARGET_LDFLAGS)" \
                 ./configure \
                         --target=$(GNU_TARGET_NAME) \
                         --host=$(GNU_TARGET_NAME) \
@@ -59,7 +59,6 @@ define Build/Configure
                         --mandir=/usr/share/man \
                         --sbindir=/usr/sbin \
                         --sysconfdir=/etc \
-                        $(DISABLE_LARGEFILE) \
                         $(DISABLE_NLS) \
                         --enable-small\
                         --enable-256-colors\
@@ -82,18 +81,12 @@ define Build/Configure
                         --without-spidermonkey\
                         --without-x\
                         --without-zlib \
-                        --disable-ipv6 \
  	);
 endef
 
 define Package/elinks/install
-	mkdir -p $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/src/elinks $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/elinks $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,elinks))
-
-$(eval $(call RequireCommand,autoconf, \
-	$(PKG_NAME) requires GNU autoconf. \
-))
-