Move elinks's own special locale, locale.alias, and charset.alias

files into its own directory under ${PREFIX}/share/elinks/locale.
This avoids any potential conflicts between these specially hacked
files installed for elinks and the system-wide ones owned by gettext-lib
and libiconv.

This fixes the installation conflict noted in the latest bulk build.
Bump PKGREVISION to 1.

5 files changed, 127 insertions, 41 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index f7c6541ffae..2449e86c150 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/12/23 10:18:39 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/06/21 15:52:15 jlam Exp $
 
 DISTNAME=		elinks-0.11.2
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -13,9 +14,9 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
 
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PKGBASE}
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--enable-256-colors
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 
 .include "options.mk"
 
diff --git a/www/elinks/PLIST b/www/elinks/PLIST
index b706003a1a2..239eecd2b25 100644
--- a/www/elinks/PLIST
+++ b/www/elinks/PLIST
@@ -1,36 +1,99 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/17 07:07:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/06/21 15:52:15 jlam Exp $
 bin/elinks
-@comment belongs to libiconv: lib/charset.alias
 man/man1/elinks.1
 man/man5/elinks.conf.5
 man/man5/elinkskeys.5
-share/locale/be/LC_MESSAGES/elinks.mo
-share/locale/bg/LC_MESSAGES/elinks.mo
-share/locale/ca/LC_MESSAGES/elinks.mo
-share/locale/cs/LC_MESSAGES/elinks.mo
-share/locale/da/LC_MESSAGES/elinks.mo
-share/locale/de/LC_MESSAGES/elinks.mo
-share/locale/el/LC_MESSAGES/elinks.mo
-share/locale/es/LC_MESSAGES/elinks.mo
-share/locale/et/LC_MESSAGES/elinks.mo
-share/locale/fi/LC_MESSAGES/elinks.mo
-share/locale/fr/LC_MESSAGES/elinks.mo
-share/locale/gl/LC_MESSAGES/elinks.mo
-share/locale/hr/LC_MESSAGES/elinks.mo
-share/locale/hu/LC_MESSAGES/elinks.mo
-share/locale/id/LC_MESSAGES/elinks.mo
-share/locale/is/LC_MESSAGES/elinks.mo
-share/locale/it/LC_MESSAGES/elinks.mo
-share/locale/lt/LC_MESSAGES/elinks.mo
-share/locale/nb/LC_MESSAGES/elinks.mo
-share/locale/nl/LC_MESSAGES/elinks.mo
-share/locale/pl/LC_MESSAGES/elinks.mo
-share/locale/pt/LC_MESSAGES/elinks.mo
-share/locale/pt_BR/LC_MESSAGES/elinks.mo
-share/locale/ro/LC_MESSAGES/elinks.mo
-share/locale/ru/LC_MESSAGES/elinks.mo
-share/locale/sk/LC_MESSAGES/elinks.mo
-share/locale/sr/LC_MESSAGES/elinks.mo
-share/locale/sv/LC_MESSAGES/elinks.mo
-share/locale/tr/LC_MESSAGES/elinks.mo
-share/locale/uk/LC_MESSAGES/elinks.mo
+share/elinks/locale/charset.alias
+share/elinks/locale/locale.alias
+share/elinks/locale/be/LC_MESSAGES/elinks.mo
+share/elinks/locale/bg/LC_MESSAGES/elinks.mo
+share/elinks/locale/ca/LC_MESSAGES/elinks.mo
+share/elinks/locale/cs/LC_MESSAGES/elinks.mo
+share/elinks/locale/da/LC_MESSAGES/elinks.mo
+share/elinks/locale/de/LC_MESSAGES/elinks.mo
+share/elinks/locale/el/LC_MESSAGES/elinks.mo
+share/elinks/locale/es/LC_MESSAGES/elinks.mo
+share/elinks/locale/et/LC_MESSAGES/elinks.mo
+share/elinks/locale/fi/LC_MESSAGES/elinks.mo
+share/elinks/locale/fr/LC_MESSAGES/elinks.mo
+share/elinks/locale/gl/LC_MESSAGES/elinks.mo
+share/elinks/locale/hr/LC_MESSAGES/elinks.mo
+share/elinks/locale/hu/LC_MESSAGES/elinks.mo
+share/elinks/locale/id/LC_MESSAGES/elinks.mo
+share/elinks/locale/is/LC_MESSAGES/elinks.mo
+share/elinks/locale/it/LC_MESSAGES/elinks.mo
+share/elinks/locale/lt/LC_MESSAGES/elinks.mo
+share/elinks/locale/nb/LC_MESSAGES/elinks.mo
+share/elinks/locale/nl/LC_MESSAGES/elinks.mo
+share/elinks/locale/pl/LC_MESSAGES/elinks.mo
+share/elinks/locale/pt/LC_MESSAGES/elinks.mo
+share/elinks/locale/pt_BR/LC_MESSAGES/elinks.mo
+share/elinks/locale/ro/LC_MESSAGES/elinks.mo
+share/elinks/locale/ru/LC_MESSAGES/elinks.mo
+share/elinks/locale/sk/LC_MESSAGES/elinks.mo
+share/elinks/locale/sr/LC_MESSAGES/elinks.mo
+share/elinks/locale/sv/LC_MESSAGES/elinks.mo
+share/elinks/locale/tr/LC_MESSAGES/elinks.mo
+share/elinks/locale/uk/LC_MESSAGES/elinks.mo
+@dirrm share/elinks/locale/uk/LC_MESSAGES
+@dirrm share/elinks/locale/uk
+@dirrm share/elinks/locale/tr/LC_MESSAGES
+@dirrm share/elinks/locale/tr
+@dirrm share/elinks/locale/sv/LC_MESSAGES
+@dirrm share/elinks/locale/sv
+@dirrm share/elinks/locale/sr/LC_MESSAGES
+@dirrm share/elinks/locale/sr
+@dirrm share/elinks/locale/sk/LC_MESSAGES
+@dirrm share/elinks/locale/sk
+@dirrm share/elinks/locale/ru/LC_MESSAGES
+@dirrm share/elinks/locale/ru
+@dirrm share/elinks/locale/ro/LC_MESSAGES
+@dirrm share/elinks/locale/ro
+@dirrm share/elinks/locale/pt_BR/LC_MESSAGES
+@dirrm share/elinks/locale/pt_BR
+@dirrm share/elinks/locale/pt/LC_MESSAGES
+@dirrm share/elinks/locale/pt
+@dirrm share/elinks/locale/pl/LC_MESSAGES
+@dirrm share/elinks/locale/pl
+@dirrm share/elinks/locale/nl/LC_MESSAGES
+@dirrm share/elinks/locale/nl
+@dirrm share/elinks/locale/nb/LC_MESSAGES
+@dirrm share/elinks/locale/nb
+@dirrm share/elinks/locale/lt/LC_MESSAGES
+@dirrm share/elinks/locale/lt
+@dirrm share/elinks/locale/it/LC_MESSAGES
+@dirrm share/elinks/locale/it
+@dirrm share/elinks/locale/is/LC_MESSAGES
+@dirrm share/elinks/locale/is
+@dirrm share/elinks/locale/id/LC_MESSAGES
+@dirrm share/elinks/locale/id
+@dirrm share/elinks/locale/hu/LC_MESSAGES
+@dirrm share/elinks/locale/hu
+@dirrm share/elinks/locale/hr/LC_MESSAGES
+@dirrm share/elinks/locale/hr
+@dirrm share/elinks/locale/gl/LC_MESSAGES
+@dirrm share/elinks/locale/gl
+@dirrm share/elinks/locale/fr/LC_MESSAGES
+@dirrm share/elinks/locale/fr
+@dirrm share/elinks/locale/fi/LC_MESSAGES
+@dirrm share/elinks/locale/fi
+@dirrm share/elinks/locale/et/LC_MESSAGES
+@dirrm share/elinks/locale/et
+@dirrm share/elinks/locale/es/LC_MESSAGES
+@dirrm share/elinks/locale/es
+@dirrm share/elinks/locale/el/LC_MESSAGES
+@dirrm share/elinks/locale/el
+@dirrm share/elinks/locale/de/LC_MESSAGES
+@dirrm share/elinks/locale/de
+@dirrm share/elinks/locale/da/LC_MESSAGES
+@dirrm share/elinks/locale/da
+@dirrm share/elinks/locale/cs/LC_MESSAGES
+@dirrm share/elinks/locale/cs
+@dirrm share/elinks/locale/ca/LC_MESSAGES
+@dirrm share/elinks/locale/ca
+@dirrm share/elinks/locale/bg/LC_MESSAGES
+@dirrm share/elinks/locale/bg
+@dirrm share/elinks/locale/be/LC_MESSAGES
+@dirrm share/elinks/locale/be
+@dirrm share/elinks/locale
+@dirrm share/elinks
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index 20f3d088b1e..0626a4525e5 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2006/12/06 22:28:58 reed Exp $
+$NetBSD: distinfo,v 1.19 2007/06/21 15:52:15 jlam Exp $
 
 SHA1 (elinks-0.11.2.tar.bz2) = 47669c38e1e5ebb35015a9a9a8f9c898821bd408
 RMD160 (elinks-0.11.2.tar.bz2) = a9d938cfdfa71be282b7596e1fed5797f2efd6a5
 Size (elinks-0.11.2.tar.bz2) = 2497270 bytes
-SHA1 (patch-aa) = 5a3e742a2a69b815052e9abad8df77fb9565c810
+SHA1 (patch-aa) = 53bf21217d63989e62f8050219135a9a7482cecf
 SHA1 (patch-ab) = b08b2c8a9148e69ab18eb8577f95672cd707cdf3
 SHA1 (patch-ac) = f7dc18652782a5ad0768a5693a69bcadc6e5754d
+SHA1 (patch-ad) = 3378dc9415533234fe98a038831cd5208c85f0aa
diff --git a/www/elinks/patches/patch-aa b/www/elinks/patches/patch-aa
index 235515da156..4ef19065f64 100644
--- a/www/elinks/patches/patch-aa
+++ b/www/elinks/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2006/10/05 10:57:37 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2007/06/21 15:52:16 jlam Exp $
 
---- configure.orig	2006-01-29 14:10:47.000000000 +0100
-+++ configure	2006-10-05 12:51:00.000000000 +0200
+--- configure.orig	2006-11-19 08:46:47.000000000 -0500
++++ configure
 @@ -2959,7 +2959,7 @@ _ACEOF
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2006/10/05 10:57:37 rillig Exp $
  			ASCIIDOC_FLAGS=--unsafe
  		fi
  		rm config.asciidoc-unsafe.*
-@@ -17103,7 +17103,7 @@ if test -z "$disable_lua"; then
+@@ -17578,7 +17578,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
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.5 2006/10/05 10:57:37 rillig Exp $
  
  				if test ! -z "$luadir"; then
  					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
-@@ -17127,10 +17127,10 @@ int
+@@ -17602,10 +17602,10 @@ int
  main ()
  {
  	lua_State *L = lua_open();
@@ -35,3 +35,12 @@ $NetBSD: patch-aa,v 1.5 2006/10/05 10:57:37 rillig Exp $
  						lua_pushboolean(L, 1);
  						lua_close(L);
    ;
+@@ -23243,7 +23243,7 @@ _ACEOF
+ 
+ 
+ # Create LIBDIR #define for config.h
+-LIBDIR=`eval echo "$libdir"`
++LIBDIR="$LOCALEDIR"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define LIBDIR "$LIBDIR"
diff --git a/www/elinks/patches/patch-ad b/www/elinks/patches/patch-ad
new file mode 100644
index 00000000000..1a95ebfb23a
--- /dev/null
+++ b/www/elinks/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2007/06/21 15:52:16 jlam Exp $
+
+--- src/intl/gettext/Makefile.orig	2006-11-19 08:46:37.000000000 -0500
++++ src/intl/gettext/Makefile
+@@ -3,6 +3,7 @@ include $(top_builddir)/Makefile.config
+ 
+ localedir = $(datadir)/locale
+ builddir = $(top_builddir)/src/intl/gettext
++libdir = $(localedir)
+ 
+ OBJS = \
+  bindtextdom.o \