Remove msgfmtstrip scripts and targets using them, now that the

infrastructure supports this properly (thanks joerg!).

4 files changed, 5 insertions, 58 deletions

diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 491a3021a4c..1c92fe14d21 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/03/18 02:14:42 jmcneill Exp $
+# $NetBSD: Makefile,v 1.62 2009/03/22 19:01:39 wiz Exp $
 #
 
 DISTNAME=		gok-2.26.0
@@ -22,18 +22,6 @@ PKGCONFIG_OVERRIDE+=	gok-1.0.pc.in
 
 GCONF_SCHEMAS=		gok.schemas
 
-# The gettext version in pkgsrc cannot handle the .po files, so
-# we strip out usage of the newer features (context and fuzzy matches)
-post-patch:
-	for f in ${WRKSRC}/po/*.po ; do \
-		mv $$f $$f.original ; \
-		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
-	done
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.11.0
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
 .include "../../audio/esound/buildlink3.mk"
 .include "../../audio/gnome-speech/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
@@ -48,9 +36,12 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.11.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.14.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXevie/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gok/files/msgfmtstrip b/misc/gok/files/msgfmtstrip
deleted file mode 100644
index af374e7954a..00000000000
--- a/misc/gok/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1 2009/03/18 02:14:43 jmcneill Exp $
-# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
-# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
-{
-if (/^$/) { entry_end(); }
-else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
-else if ($1 == "#~|") { skip = 1; }
-else { entry = entry $0 "\n" }
-}
-
-END { entry_end(); }
-
-function entry_end() {
-    if (!skip)
-	print entry;
-    entry = "";
-    skip = 0;
-}
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index c9a94baca00..7c099a78b07 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/03/16 09:12:25 jmcneill Exp $
+# $NetBSD: Makefile,v 1.14 2009/03/22 19:01:40 wiz Exp $
 #
 
 DISTNAME=	orca-2.26.0
@@ -21,14 +21,6 @@ PYTHON_VERSIONS_ACCEPTED= 25 24
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=	yes
 
-# The gettext version in pkgsrc cannot handle the .po files, so
-# we strip out usage of the newer features (context and fuzzy matches)
-post-patch:
-	for f in ${WRKSRC}/po/*.po; do \
-		mv $$f $$f.original ; \
-		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
-	done
-
 BUILDLINK_API_DEPENDS.gnome-speech+=	gnome-speech>=0.3.10
 .include "../../audio/gnome-speech/buildlink3.mk"
 #BUILDLINK_API_DEPENDS.at-spi+=	at-spi>=1.7.6
diff --git a/misc/orca/files/msgfmtstrip b/misc/orca/files/msgfmtstrip
deleted file mode 100644
index 3b195214387..00000000000
--- a/misc/orca/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1 2009/03/16 09:12:25 jmcneill Exp $
-# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
-# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
-{
-if (/^$/) { entry_end(); }
-else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
-else if ($1 == "#~|") { skip = 1; }
-else { entry = entry $0 "\n" }
-}
-
-END { entry_end(); }
-
-function entry_end() {
-    if (!skip)
-	print entry;
-    entry = "";
-    skip = 0;
-}