Remove msgfmtstrip scripts and targets using them, now that the

infrastructure supports this properly (thanks joerg!).

4 files changed, 8 insertions, 77 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 3595e5b78de..6af68b4354e 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2009/03/18 01:03:36 jmcneill Exp $
+# $NetBSD: Makefile,v 1.91 2009/03/22 19:01:38 wiz Exp $
 
 DISTNAME=		gnome-games-2.26.0
 CATEGORIES=		games gnome
@@ -47,52 +47,25 @@ PYTHON_PATCH_SCRIPTS+=	glchess/src/glchess.in.in
 PYTHON_PATCH_SCRIPTS+=	gnome-sudoku/src/gnome-sudoku.in.in
 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}/aisleriot/help/*/*.po \
-	    ${WRKSRC}/blackjack/help/*/*.po \
-	    ${WRKSRC}/glchess/help/*/*.po \
-	    ${WRKSRC}/glines/help/*/*.po \
-	    ${WRKSRC}/gnect/help/*/*.po \
-	    ${WRKSRC}/gnibbles/help/*/*.po \
-	    ${WRKSRC}/gnome-sudoku/help/*/*.po \
-	    ${WRKSRC}/gnometris/help/*/*.po \
-	    ${WRKSRC}/gnomine/help/*/*.po \
-	    ${WRKSRC}/gnobots2/help/*/*.po \
-	    ${WRKSRC}/gnotravex/help/*/*.po \
-	    ${WRKSRC}/gnotski/help/*/*.po \
-	    ${WRKSRC}/gtali/help/*/*.po \
-	    ${WRKSRC}/iagno/help/*/*.po \
-	    ${WRKSRC}/mahjongg/help/*/*.po \
-	    ${WRKSRC}/same-gnome/help/*/*.po \
-	    ${WRKSRC}/po/*.po \
-	    ; do \
-		mv $$f $$f.original ; \
-		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
-	done
-
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
-BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.10.0
-BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.12.6
-
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/GConf-ui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.10.0
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../games/ggz-client-libs/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.12.6
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/games/gnome-games/files/msgfmtstrip b/games/gnome-games/files/msgfmtstrip
deleted file mode 100644
index 55f31e7be91..00000000000
--- a/games/gnome-games/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1 2009/03/18 01:03:36 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/games/warzone2100/Makefile b/games/warzone2100/Makefile
index ecf360cfe91..bea35dfb134 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/04 12:00:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2009/03/22 19:01:38 wiz Exp $
 #
 
 DISTNAME=	warzone2100-2.1.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://wz2100.net/
 COMMENT=	Real-time strategy and real-time tactics hybrid computer game
 
+DEPENDS+=	dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
@@ -22,14 +24,6 @@ CONFIGURE_ARGS+=	--with-distributor=pkgsrc
 
 CHECK_WRKREF_SKIP=	share/warzone2100/mods/global/aivolution.wz
 
-post-patch:
-	for f in ${WRKSRC}/po/*.po; do \
-		mv $$f $$f.original ; \
-		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
-	done
-
-DEPENDS+=	dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
-
 .include "../../audio/openal/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/games/warzone2100/files/msgfmtstrip b/games/warzone2100/files/msgfmtstrip
deleted file mode 100644
index 74d0f5640a0..00000000000
--- a/games/warzone2100/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1.1.1 2009/02/15 16:05: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;
-}