Deal with crappy gettext.h wanting to redefine libintl.h.

6 files changed, 88 insertions, 1 deletions

diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index 62cef5c86be..c4e892751f7 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.21 2015/04/10 01:32:16 hiramatsu Exp $
+$NetBSD: distinfo,v 1.22 2015/06/08 23:13:52 joerg Exp $
 
 SHA1 (sharutils-4.15.tar.gz) = a073d1912e537a53cabab210ca869adfd907f6f6
 RMD160 (sharutils-4.15.tar.gz) = fd8b1ebe41b1df398eef53513e2e5b5b53e8bbac
 Size (sharutils-4.15.tar.gz) = 2196398 bytes
 SHA1 (patch-lib_fseeko.c) = 9308258bebbabc60a0203fd3baa054758ce60b02
+SHA1 (patch-libopts_libopts.c) = da5b86c5ba4dfdae5108476e46c1ed5e47a4254e
+SHA1 (patch-src_shar-opts.c) = eabc6a22adb102fc88b42c4479ee4030435d07dd
+SHA1 (patch-src_unshar-opts.c) = 7c34db513400d5f818be396a6bdbd2ff8d8bb77b
+SHA1 (patch-src_uudecode-opts.c) = d560a91b977d3c02627be22073b1dc1810a9b3cb
+SHA1 (patch-src_uuencode-opts.c) = 0906d8b3d9ac10d529b2a35aadce1fb09d3c60b7
diff --git a/archivers/gsharutils/patches/patch-libopts_libopts.c b/archivers/gsharutils/patches/patch-libopts_libopts.c
new file mode 100644
index 00000000000..33ce05805b6
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-libopts_libopts.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-libopts_libopts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- libopts/libopts.c.orig	2015-06-08 20:10:35.000000000 +0000
++++ libopts/libopts.c
+@@ -1,3 +1,9 @@
++#include "config.h"
++#if ENABLE_NLS
++#ifdef HAVE_DCGETTEXT
++# include <gettext.h>
++#endif
++#endif
+ #define  AUTOOPTS_INTERNAL 1
+ #include "autoopts/project.h"
+ #define  LOCAL static
diff --git a/archivers/gsharutils/patches/patch-src_shar-opts.c b/archivers/gsharutils/patches/patch-src_shar-opts.c
new file mode 100644
index 00000000000..8a5a2a67308
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-src_shar-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_shar-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/shar-opts.c.orig	2015-06-08 20:10:51.000000000 +0000
++++ src/shar-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include "config.h"
++#if ENABLE_NLS
++#ifdef HAVE_DCGETTEXT
++# include <gettext.h>
++#endif
++#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
diff --git a/archivers/gsharutils/patches/patch-src_unshar-opts.c b/archivers/gsharutils/patches/patch-src_unshar-opts.c
new file mode 100644
index 00000000000..062de86663f
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-src_unshar-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_unshar-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/unshar-opts.c.orig	2015-06-08 20:11:05.000000000 +0000
++++ src/unshar-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include "config.h"
++#if ENABLE_NLS
++#ifdef HAVE_DCGETTEXT
++# include <gettext.h>
++#endif
++#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
diff --git a/archivers/gsharutils/patches/patch-src_uudecode-opts.c b/archivers/gsharutils/patches/patch-src_uudecode-opts.c
new file mode 100644
index 00000000000..4f1883fd2f2
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-src_uudecode-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_uudecode-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/uudecode-opts.c.orig	2015-06-08 20:12:04.000000000 +0000
++++ src/uudecode-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include "config.h"
++#if ENABLE_NLS
++#ifdef HAVE_DCGETTEXT
++# include <gettext.h>
++#endif
++#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1
diff --git a/archivers/gsharutils/patches/patch-src_uuencode-opts.c b/archivers/gsharutils/patches/patch-src_uuencode-opts.c
new file mode 100644
index 00000000000..6b655d4399e
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-src_uuencode-opts.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_uuencode-opts.c,v 1.1 2015/06/08 23:13:52 joerg Exp $
+
+--- src/uuencode-opts.c.orig	2015-06-08 20:12:11.000000000 +0000
++++ src/uuencode-opts.c
+@@ -37,6 +37,12 @@
+  *  You should have received a copy of the GNU General Public License along
+  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
++#include "config.h"
++#if ENABLE_NLS
++#ifdef HAVE_DCGETTEXT
++# include <gettext.h>
++#endif
++#endif
+ 
+ #ifndef __doxygen__
+ #define OPTION_CODE_COMPILE 1