[pkgsrc/trunk]: pkgsrc/www/elinks Update to current 0.11 branch as of 2008/01...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2156c6db1a26
branches:  trunk
changeset: 537447:2156c6db1a26
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Jan 09 03:48:07 2008 +0000

description:
Update to current 0.11 branch as of 2008/01/09.  Too many changes/fixes
to list here; one may check the log at <http://repo.or.cz/w/elinks.git>
(see the elinks-0.11 branch).  There should be a 0.11.4 release out
fairly soon.

While here, add two patches (from debian maintainer): one to ensure that
its gettext doesn't look for files in ../po/, and the other to disable
transparency by default.

Bump revision.

diffstat:

 www/elinks/Makefile         |   8 +++++---
 www/elinks/distinfo         |  14 ++++++++------
 www/elinks/patches/patch-aa |  10 +++++-----
 www/elinks/patches/patch-ab |  10 +++++-----
 www/elinks/patches/patch-af |  23 +++++++++++++++++++++++
 www/elinks/patches/patch-ag |  15 +++++++++++++++
 6 files changed, 61 insertions(+), 19 deletions(-)

diffs (157 lines):

diff -r a5220ff12eb3 -r 2156c6db1a26 www/elinks/Makefile
--- a/www/elinks/Makefile       Wed Jan 09 02:54:39 2008 +0000
+++ b/www/elinks/Makefile       Wed Jan 09 03:48:07 2008 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2007/08/09 13:03:21 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/01/09 03:48:07 bjs Exp $
 
-DISTNAME=              elinks-0.11.3
+DISTNAME=              elinks-0.11-20080109
+PKGREVISION=           1
+PKGNAME=               ${DISTNAME:R}.${DISTNAME:E:S/-/./}
 CATEGORIES=            www
-MASTER_SITES=          http://elinks.or.cz/download/
+MASTER_SITES=          ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
diff -r a5220ff12eb3 -r 2156c6db1a26 www/elinks/distinfo
--- a/www/elinks/distinfo       Wed Jan 09 02:54:39 2008 +0000
+++ b/www/elinks/distinfo       Wed Jan 09 03:48:07 2008 +0000
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.20 2007/08/09 13:03:21 joerg Exp $
+$NetBSD: distinfo,v 1.21 2008/01/09 03:48:07 bjs Exp $
 
-SHA1 (elinks-0.11.3.tar.bz2) = e4d8b0edd5fa4ec4310662242f0b5cf32864ed11
-RMD160 (elinks-0.11.3.tar.bz2) = 936f0cd4dbc69f70c329cf0ef5d7acd722652b6e
-Size (elinks-0.11.3.tar.bz2) = 2516793 bytes
-SHA1 (patch-aa) = d396437d47a7162e0414368ac55b513b33b0f7cd
-SHA1 (patch-ab) = b08b2c8a9148e69ab18eb8577f95672cd707cdf3
+SHA1 (elinks-0.11-20080109.tar.bz2) = d6453c67551b1a9d8449915bffd557faefa26f13
+RMD160 (elinks-0.11-20080109.tar.bz2) = 508e3ff1b311c95980e71fddf3c600dc4c54d779
+Size (elinks-0.11-20080109.tar.bz2) = 5049225 bytes
+SHA1 (patch-aa) = e4106d39982ca00606667d9463982ee86afbf868
+SHA1 (patch-ab) = dd1c48e0c1b7980b6332e11ab38e13202325cd55
 SHA1 (patch-ac) = f7dc18652782a5ad0768a5693a69bcadc6e5754d
 SHA1 (patch-ad) = 3378dc9415533234fe98a038831cd5208c85f0aa
 SHA1 (patch-ae) = 566ac2d8900c0f64414eb7b9164fd3b8557046fd
+SHA1 (patch-af) = 55922138dc8ef861fcb9ab352670bac614afb405
+SHA1 (patch-ag) = 34d794c4c0cb99d6c5a1b19f4485f7c59962064a
diff -r a5220ff12eb3 -r 2156c6db1a26 www/elinks/patches/patch-aa
--- a/www/elinks/patches/patch-aa       Wed Jan 09 02:54:39 2008 +0000
+++ b/www/elinks/patches/patch-aa       Wed Jan 09 03:48:07 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2007/08/09 13:03:21 joerg Exp $
+$NetBSD: patch-aa,v 1.8 2008/01/09 03:48:07 bjs Exp $
 
---- configure.orig     2007-04-15 16:51:12.000000000 -0400
+--- configure.orig     2008-01-08 18:35:23.000000000 -0500
 +++ configure
 @@ -907,7 +907,7 @@ Optional Packages:
    --without-openssl       disable OpenSSL support
@@ -20,7 +20,7 @@
                        ASCIIDOC_FLAGS=--unsafe
                fi
                rm config.asciidoc-unsafe.*
-@@ -17564,7 +17564,7 @@ if test -z "$disable_lua"; then
+@@ -17624,7 +17624,7 @@ if test -z "$disable_lua"; then
        for luadir in "$withval" "" /usr /usr/local; do
                for suffix in "" 50 51; do
                        if test "$cf_result" = no; then
@@ -29,7 +29,7 @@
  
                                if test ! -z "$luadir"; then
                                        LUA_LIBS="-L$luadir/lib $LUA_LIBS"
-@@ -20479,9 +20479,9 @@ done
+@@ -20603,9 +20603,9 @@ done
  
  
  
@@ -41,7 +41,7 @@
  
      for dir in `echo "$withval" | tr : ' '`; do
        if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-@@ -23231,7 +23231,7 @@ _ACEOF
+@@ -23355,7 +23355,7 @@ _ACEOF
  
  
  # Create LIBDIR #define for config.h
diff -r a5220ff12eb3 -r 2156c6db1a26 www/elinks/patches/patch-ab
--- a/www/elinks/patches/patch-ab       Wed Jan 09 02:54:39 2008 +0000
+++ b/www/elinks/patches/patch-ab       Wed Jan 09 03:48:07 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2006/09/06 15:14:34 abs Exp $
+$NetBSD: patch-ab,v 1.6 2008/01/09 03:48:07 bjs Exp $
 
---- src/scripting/lua/core.c.orig      2006-01-29 13:10:39.000000000 +0000
+--- src/scripting/lua/core.c.orig      2008-01-08 18:35:08.000000000 -0500
 +++ src/scripting/lua/core.c
-@@ -633,7 +633,7 @@ do_hooks_file(LS, unsigned char *prefix,
+@@ -641,7 +641,7 @@ do_hooks_file(LS, unsigned char *prefix,
        if (file_can_read(file)) {
                int oldtop = lua_gettop(S);
  
@@ -11,7 +11,7 @@
                        sleep(3); /* Let some time to see error messages. */
                lua_settop(S, oldtop);
        }
-@@ -644,13 +644,24 @@ do_hooks_file(LS, unsigned char *prefix,
+@@ -652,13 +652,24 @@ do_hooks_file(LS, unsigned char *prefix,
  void
  init_lua(struct module *module)
  {
@@ -43,7 +43,7 @@
  
        lua_register(L, LUA_ALERT, l_alert);
        lua_register(L, "current_url", l_current_url);
-@@ -755,7 +766,7 @@ handle_ret_eval(struct session *ses)
+@@ -763,7 +774,7 @@ handle_ret_eval(struct session *ses)
                int oldtop = lua_gettop(L);
  
                if (prepare_lua(ses) == 0) {
diff -r a5220ff12eb3 -r 2156c6db1a26 www/elinks/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/elinks/patches/patch-af       Wed Jan 09 03:48:07 2008 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-af,v 1.1 2008/01/09 03:48:08 bjs Exp $
+
+Turn off transparency by default--those who need it can turn it on,
+and it doesn't make sense for non-xterm use.
+
+--- src/config/options.inc.orig        2008-01-08 18:35:08.000000000 -0500
++++ src/config/options.inc
+@@ -826,11 +826,13 @@ static struct option_info config_options
+               "2 is 256 color mode, uses XTerm RGB codes")),
+ 
+       INIT_OPT_BOOL("terminal._template_", N_("Transparency"),
+-              "transparency", 0, 1,
++              "transparency", 0, 0,
+               N_("If we should not set the background to black. This is particularly\n"
+               "useful when we have a terminal (typically in some windowing\n"
+               "environment) with a background image or a transparent background -\n"
+-              "it will be visible in ELinks as well. Note that this option makes\n"
++              "it will be visible in ELinks as well (but ELinks document color handling\n"
++              "will still assume the background is black so if you have a bright background\n"
++              "you might experience contrast problems. Note that this option makes\n"
+               "sense only when colors are enabled.")),
+ 
+       INIT_OPT_BOOL("terminal._template_", N_("Underline"),
diff -r a5220ff12eb3 -r 2156c6db1a26 www/elinks/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/elinks/patches/patch-ag       Wed Jan 09 03:48:07 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2008/01/09 03:48:08 bjs Exp $
+
+Don't look for message catalogs in ../po/.
+
+--- src/intl/gettext/loadmsgcat.c.orig 2008-01-08 18:35:08.000000000 -0500
++++ src/intl/gettext/loadmsgcat.c
+@@ -259,7 +259,7 @@ _nl_load_domain(struct loaded_l10nfile *
+       {
+               struct string filename;
+ 
+-              if (init_string(&filename)
++              if (init_string(&filename) && 0
+                   && add_filename_to_string(&filename, domain_file)) {
+                       fd = open(filename.source, O_RDONLY | O_BINARY);
+               }