summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/elinks/Makefile5
-rw-r--r--www/elinks/distinfo10
-rw-r--r--www/elinks/patches/patch-aa43
3 files changed, 12 insertions, 46 deletions
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 91cbb2b27ca..7448eb48449 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2011/04/22 13:44:58 obache Exp $
+# $NetBSD: Makefile,v 1.46 2011/06/14 13:36:34 wiz Exp $
-DISTNAME= elinks-0.12pre2
+DISTNAME= elinks-0.12pre5
PKGNAME= ${DISTNAME:S/pre/rc/}
-PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://elinks.or.cz/download/ \
http://ftp.icm.edu.pl/packages/elinks/
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index e1096dad65a..075667cdd9f 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2009/07/02 20:04:12 drochner Exp $
+$NetBSD: distinfo,v 1.27 2011/06/14 13:36:34 wiz Exp $
-SHA1 (elinks-0.12pre2.tar.bz2) = 7bb30f817cc053b87f80c32359dfccbc49e067eb
-RMD160 (elinks-0.12pre2.tar.bz2) = 94af523e31d24e09c9cb6a41e5d87456f288f234
-Size (elinks-0.12pre2.tar.bz2) = 2770126 bytes
-SHA1 (patch-aa) = b2bef596793e8fb75e89fb95daf399240f28fa0b
+SHA1 (elinks-0.12pre5.tar.bz2) = 15fb38fa938a0eec9d5f22fdd538a6785e2854af
+RMD160 (elinks-0.12pre5.tar.bz2) = 4983083f21928da78f937b4dea09f8937c3a9cb9
+Size (elinks-0.12pre5.tar.bz2) = 2783523 bytes
+SHA1 (patch-aa) = b188ab3975bcfd6a491c2e41a17b1f31703d4667
SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd
SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d
SHA1 (patch-ad) = 089e2455c64cbfb48907693a653e76cc97961622
diff --git a/www/elinks/patches/patch-aa b/www/elinks/patches/patch-aa
index ead33f79609..02d3ced295d 100644
--- a/www/elinks/patches/patch-aa
+++ b/www/elinks/patches/patch-aa
@@ -1,50 +1,17 @@
-$NetBSD: patch-aa,v 1.10 2008/11/06 08:33:31 bjs Exp $
+$NetBSD: patch-aa,v 1.11 2011/06/14 13:36:34 wiz Exp $
---- configure.orig 2008-09-21 07:15:24.000000000 -0400
+--- configure.orig 2009-07-08 09:57:36.000000000 +0000
+++ configure
-@@ -1453,7 +1453,7 @@ Optional Packages:
- --without-openssl disable OpenSSL support
- --with-openssl=DIR enable OpenSSL support (default)
- --with-x use the X Window System
-- --with-libiconv=DIR search for libiconv in DIR/include and DIR/lib
-+ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib
-
- Some influential environment variables:
- CC C compiler command
-@@ -3525,7 +3525,7 @@ _ACEOF
-
-
- echo > config.asciidoc-unsafe.txt
-- if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>/dev/null; then
-+ if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>&1 > /dev/null; then
- ASCIIDOC_FLAGS=--unsafe
- fi
- rm config.asciidoc-unsafe.*
-@@ -18899,8 +18899,8 @@ if test -z "$disable_lua"; then
+@@ -18993,7 +18993,7 @@ if test -z "$disable_lua"; then
for suffix in "" 50; do
if test "$cf_result" = no && ( test -f "$luadir/include/lua.h" || \
test -f "$luadir/include/lua$suffix/lua.h" ) ; then
- LUA_LIBS="-L$luadir/lib -llua$suffix -llualib$suffix -lm"
-- LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix"
+ LUA_LIBS="-L$luadir/lib -llua$suffix -lm"
-+ LUA_CFLAGS="-I$luadir/include"
+ LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix"
LIBS="$LUA_LIBS $LIBS_X"
- CFLAGS="$CFLAGS_X $LUA_CFLAGS"
-@@ -21532,9 +21532,9 @@ done
-
-
-
--# Check whether --with-libiconv was given.
--if test "${with_libiconv+set}" = set; then
-- withval=$with_libiconv;
-+# Check whether --with-libiconv-prefix was given.
-+if test "${with_libiconv_prefix+set}" = set; then
-+ withval=$with_libiconv_prefix;
- for dir in `echo "$withval" | tr : ' '`; do
- if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
- if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-@@ -24635,7 +24635,7 @@ _ACEOF
+@@ -25064,7 +25064,7 @@ _ACEOF
# Create LIBDIR #define for config.h