Remove msgfmtstrip scripts and targets using them, now that the

infrastructure supports this properly (thanks joerg!).

4 files changed, 4 insertions, 58 deletions

diff --git a/devel/libgweather/Makefile b/devel/libgweather/Makefile
index 032b7e116eb..eede8980bb8 100644
--- a/devel/libgweather/Makefile
+++ b/devel/libgweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/03/17 21:49:02 jmcneill Exp $
+# $NetBSD: Makefile,v 1.12 2009/03/22 19:01:37 wiz Exp $
 #
 
 DISTNAME=	libgweather-2.26.0
@@ -21,14 +21,6 @@ PKGCONFIG_OVERRIDE+=	libgweather/gweather.pc.in
 
 CONFLICTS+=	gnome-applets<2.22.0
 
-# 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 ${WRKSRC}/po-locations/*.po ; do \
-		mv $$f $$f.original ; \
-		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
-	done
-
 .include "../../devel/GConf/schemas.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/devel/libgweather/files/msgfmtstrip b/devel/libgweather/files/msgfmtstrip
deleted file mode 100644
index 9e690daf337..00000000000
--- a/devel/libgweather/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1 2009/03/17 21:49:02 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/devel/libwnck/Makefile b/devel/libwnck/Makefile
index d24124cf60a..dd28f896dff 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2009/03/17 21:10:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.63 2009/03/22 19:01:37 wiz Exp $
 #
 
 DISTNAME=	libwnck-2.26.0
@@ -19,24 +19,14 @@ USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	libwnck-1.0.pc.in
 
-# 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.gtk2+=	gtk2+>=2.6.0
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.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 "../../mk/bsd.pkg.mk"
diff --git a/devel/libwnck/files/msgfmtstrip b/devel/libwnck/files/msgfmtstrip
deleted file mode 100644
index 28cfe12e5e5..00000000000
--- a/devel/libwnck/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1 2009/03/17 21:10:27 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;
-}