Update 0.96.1 -> 0.98

PR:		ports/33146
Submitted by:	Jochem Kossen <j.kossen@home.nl>

Fix the locale directories.
Add a WITH_SOCKS5 knob while I'm here.

4 files changed, 53 insertions, 27 deletions

diff --git a/net/gnomeicu/files/patch-ac b/net/gnomeicu/files/patch-ac
deleted file mode 100644
index c0a042787c06..000000000000
--- a/net/gnomeicu/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Sat Jan 29 16:04:07 2000
-+++ po/Makefile.in.in	Sat Jan 29 16:08:19 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/net/gnomeicu/files/patch-configure b/net/gnomeicu/files/patch-configure
index fcb467e8a8ef..005f7f7c92d5 100644
--- a/net/gnomeicu/files/patch-configure
+++ b/net/gnomeicu/files/patch-configure
@@ -1,16 +1,29 @@
---- configure.orig	Tue Feb 27 13:35:06 2001
-+++ configure	Thu Apr 19 15:50:55 2001
-@@ -5039,5 +5039,5 @@
- 
--ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
--echo "configure:5043: checking for iconv.h" >&5
-+ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
-+echo "configure:5043: checking for giconv.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-@@ -5048,3 +5048,3 @@
+--- configure.orig	Mon Dec 24 17:17:59 2001
++++ configure	Mon Dec 24 17:18:21 2001
+@@ -3017,7 +3017,7 @@
+ #line 3018 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+ iconv_t cd = iconv_open("","");
+        iconv(cd,NULL,NULL,NULL,NULL);
+@@ -3039,7 +3039,7 @@
+ #line 3040 "configure"
  #include "confdefs.h"
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+ iconv_t cd = iconv_open("","");
+          iconv(cd,NULL,NULL,NULL,NULL);
+@@ -3077,7 +3077,7 @@
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
 -#include <iconv.h>
 +#include <giconv.h>
- EOF
+ extern
+ #ifdef __cplusplus
+ "C"
diff --git a/net/gnomeicu/files/patch-po::Makefile.in.in b/net/gnomeicu/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..eb27fe3afb48
--- /dev/null
+++ b/net/gnomeicu/files/patch-po::Makefile.in.in
@@ -0,0 +1,20 @@
+--- po/Makefile.in.in.orig	Sun Dec 23 17:47:08 2001
++++ po/Makefile.in.in	Fri Dec 28 15:46:57 2001
+@@ -23,7 +23,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed -E 's/\.g?mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/net/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/files/patch-src::kanji_conv.c
index 497b91d16c89..a6693363b918 100644
--- a/net/gnomeicu/files/patch-src::kanji_conv.c
+++ b/net/gnomeicu/files/patch-src::kanji_conv.c
@@ -1,7 +1,11 @@
---- src/kanji_conv.c.orig	Wed Jan  3 16:14:39 2001
-+++ src/kanji_conv.c	Thu Apr 19 15:51:21 2001
-@@ -32,3 +32,3 @@
+--- src/kanji_conv.c.orig	Mon Dec 24 12:51:08 2001
++++ src/kanji_conv.c	Mon Dec 24 12:51:21 2001
+@@ -30,7 +30,7 @@
+ #include <locale.h>
+ 
  #ifdef HAVE_ICONV
 -#include <iconv.h>
 +#include <giconv.h>
  #endif
+ 
+ #include "kanji_conv.h"