gnome.h declares gettext functions when ENABLE_NLS is not defined.

This conflicts with declarations in libintl.h on glibc systems when
compiled with g++>=3.2.  Add a workaround borrowed from Debian to
build this package on Linux.

7 files changed, 95 insertions, 1 deletions

diff --git a/archivers/cxunzip/distinfo b/archivers/cxunzip/distinfo
index e04364961e4..b56edab26ab 100644
--- a/archivers/cxunzip/distinfo
+++ b/archivers/cxunzip/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.3 2003/11/26 10:40:01 abs Exp $
+$NetBSD: distinfo,v 1.4 2004/12/17 20:49:40 minskim Exp $
 
 SHA1 (cxunzip-0.98.tar.gz) = 515721b5e016d0384deadbc61ba0cfe0d042d16f
 Size (cxunzip-0.98.tar.gz) = 188499 bytes
 SHA1 (patch-aa) = fa6c6d1817f43c2f373209cbae5a300189595857
+SHA1 (patch-ab) = 662364052af3e0afa067b5d91bff71b0a4638ebe
+SHA1 (patch-ac) = dc7bb857ba7a4d80ce391c3e90a5ccd3f37c7726
+SHA1 (patch-ad) = 99f54d296c59aebb59949bdf7d63f4daf0ab4eba
+SHA1 (patch-ae) = de99f621021f7b608261e810454e805e60185e91
+SHA1 (patch-af) = 2bf5b8c38db61f2d04d66c7c7775a1ee6bc6ba6d
+SHA1 (patch-ag) = 9bd8e0026659240914741065cf5b01667fb4cc81
diff --git a/archivers/cxunzip/patches/patch-ab b/archivers/cxunzip/patches/patch-ab
new file mode 100644
index 00000000000..8e1d6f60f43
--- /dev/null
+++ b/archivers/cxunzip/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.4 2004/12/17 20:49:40 minskim Exp $
+
+--- src/safe_gnome.h.orig	2004-12-17 14:24:16.000000000 -0600
++++ src/safe_gnome.h
+@@ -0,0 +1,18 @@
++#ifndef CXUNZIP_SAFE_GNOME_H
++#define CXUNZIP_SAFE_GNOME_H
++
++#undef gettext
++#undef dgettext
++#undef dcgettext
++#undef textdomain
++#undef bindtextdomain
++
++#include <gnome.h>
++
++#undef gettext
++#undef dgettext
++#undef dcgettext
++#undef textdomain
++#undef bindtextdomain
++
++#endif
diff --git a/archivers/cxunzip/patches/patch-ac b/archivers/cxunzip/patches/patch-ac
new file mode 100644
index 00000000000..3ae2ebe7c05
--- /dev/null
+++ b/archivers/cxunzip/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 2004/12/17 20:49:40 minskim Exp $
+
+--- src/main.cc.orig	2003-10-12 11:36:01.000000000 -0500
++++ src/main.cc
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ 
+ #include <gtk/gtk.h>
+-#include <gnome.h>
++#include <safe_gnome.h>
+ 
+ // #include <popt.h>
+ 
diff --git a/archivers/cxunzip/patches/patch-ad b/archivers/cxunzip/patches/patch-ad
new file mode 100644
index 00000000000..fbd82967718
--- /dev/null
+++ b/archivers/cxunzip/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/12/17 20:49:40 minskim Exp $
+
+--- src/app.cc.orig	2003-10-12 11:42:07.000000000 -0500
++++ src/app.cc
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ 
+-#include <gnome.h>
++#include <safe_gnome.h>
+ 
+ /* #include <list>
+ #include <string> */
diff --git a/archivers/cxunzip/patches/patch-ae b/archivers/cxunzip/patches/patch-ae
new file mode 100644
index 00000000000..f1dfa80c988
--- /dev/null
+++ b/archivers/cxunzip/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/12/17 20:49:40 minskim Exp $
+
+--- src/prefs.cc.orig	2003-10-12 11:36:01.000000000 -0500
++++ src/prefs.cc
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <config.h>
+ 
+-#include <gnome.h>
++#include <safe_gnome.h>
+ 
+ #include <string>
+ 
diff --git a/archivers/cxunzip/patches/patch-af b/archivers/cxunzip/patches/patch-af
new file mode 100644
index 00000000000..a95935e5ba2
--- /dev/null
+++ b/archivers/cxunzip/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/12/17 20:49:40 minskim Exp $
+
+--- src/prepareapp.cc.orig	2003-10-12 11:36:01.000000000 -0500
++++ src/prepareapp.cc
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <config.h>
+ 
+-#include <gnome.h>
++#include <safe_gnome.h>
+ 
+ #include <string>
+ 
diff --git a/archivers/cxunzip/patches/patch-ag b/archivers/cxunzip/patches/patch-ag
new file mode 100644
index 00000000000..9f58b0c2f53
--- /dev/null
+++ b/archivers/cxunzip/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/12/17 20:49:40 minskim Exp $
+
+--- src/uncompresswindow.cc.orig	2003-10-12 11:36:01.000000000 -0500
++++ src/uncompresswindow.cc
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <config.h>
+ 
+-#include <gnome.h>
++#include <safe_gnome.h>
+ 
+ #include <string>
+