Remove INCOMPAT_GETTEXT and the automatic rebuilding of the PO files.

This fixes the build on older NetBSD systems in a clean way.

4 files changed, 34 insertions, 4 deletions

diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 4f5137f216c..f7597452d96 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/10/29 11:36:07 minskim Exp $
+# $NetBSD: Makefile,v 1.31 2007/11/03 16:37:42 joerg Exp $
 #
 
 DISTNAME=	shared-mime-info-0.22
@@ -21,8 +21,6 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config xgettext
 
 CONFIGURE_ARGS+=	--disable-update-mimedb
 
-INCOMPAT_GETTEXT+=	NetBSD-[123].*
-
 .include "../../mk/bsd.prefs.mk"
 
 CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
diff --git a/databases/shared-mime-info/distinfo b/databases/shared-mime-info/distinfo
index dbcda8a20fe..413ac893376 100644
--- a/databases/shared-mime-info/distinfo
+++ b/databases/shared-mime-info/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2007/10/11 18:56:16 drochner Exp $
+$NetBSD: distinfo,v 1.10 2007/11/03 16:37:43 joerg Exp $
 
 SHA1 (shared-mime-info-0.22.tar.bz2) = d06e59157bec1b3315e35bc926b56f71253282a4
 RMD160 (shared-mime-info-0.22.tar.bz2) = fdf2c0d17e44f4b5d189c68a6893a88eab60778c
 Size (shared-mime-info-0.22.tar.bz2) = 417120 bytes
 SHA1 (patch-aa) = e6fbe84b742034d26ef9d3ae89d271d819656ac2
+SHA1 (patch-ab) = cf729795e385ea65fd1694deafdd8c0a386e0a70
+SHA1 (patch-ac) = a269effaca7196a89a834207f235f85f251ad106
diff --git a/databases/shared-mime-info/patches/patch-ab b/databases/shared-mime-info/patches/patch-ab
new file mode 100644
index 00000000000..32420022381
--- /dev/null
+++ b/databases/shared-mime-info/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2007/11/03 16:37:43 joerg Exp $
+
+Don't force a build of the PO files, they need newer gettext versions.
+
+--- Makefile.am.orig	2007-11-03 17:18:35.000000000 +0100
++++ Makefile.am
+@@ -54,8 +54,6 @@ uninstall-hook:
+ 	rm -f "$(DESTDIR)$(datadir)/mime/mime-cache"
+ 	rm -f "$(DESTDIR)$(datadir)/mime/XMLnamespaces"
+ 
+-all: check
+-
+ check:
+ 	if [ -d CVS/ ]; then						\
+ 		xmllint --noout --valid $(srcdir)/freedesktop.org.xml;	\
diff --git a/databases/shared-mime-info/patches/patch-ac b/databases/shared-mime-info/patches/patch-ac
new file mode 100644
index 00000000000..b59e21ae703
--- /dev/null
+++ b/databases/shared-mime-info/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2007/11/03 16:37:44 joerg Exp $
+
+Don't force a build of the PO files, they need newer gettext versions.
+
+--- Makefile.in.orig	2007-11-03 17:19:05.000000000 +0100
++++ Makefile.in
+@@ -914,8 +914,6 @@ uninstall-hook:
+ 	rm -f "$(DESTDIR)$(datadir)/mime/mime-cache"
+ 	rm -f "$(DESTDIR)$(datadir)/mime/XMLnamespaces"
+ 
+-all: check
+-
+ check:
+ 	if [ -d CVS/ ]; then						\
+ 		xmllint --noout --valid $(srcdir)/freedesktop.org.xml;	\