Remove msgfmtstrip scripts and targets using them, now that the

infrastructure supports this properly (thanks joerg!).

3 files changed, 3 insertions, 40 deletions

diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index fe0f6b256e7..9653e0236eb 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/17 16:39:12 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2009/03/22 19:01:41 wiz Exp $
 
 DISTNAME=	seahorse-plugins-2.26.0
 CATEGORIES=	security
@@ -22,16 +22,6 @@ USE_PKGLOCALEDIR=	yes
 GCONF_SCHEMAS=		seahorse-gedit.schemas
 GCONF_SCHEMAS+=		seahorse-plugins.schemas
 
-# In pkgsrc, the shipped gettext cannot handle the .po files,
-# so we strip out usage of the newer features (context and fuzzy matches)
-SHFILESDIR=	${FILESDIR:S/-plugins//}
-post-patch:
-	for f in ${WRKSRC}/po/*.po ${WRKSRC}/help/*/*.po \
-	    ${WRKSRC}/plugins/applet/docs/*/*.po ; do \
-		mv $$f $$f.original ; \
-		${AWK} -f ${SHFILESDIR}/msgfmtstrip $$f.original > $$f ; \
-	done
-
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index e10e90aea8d..76d3ed6a5a8 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2009/03/19 12:14:01 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2009/03/22 19:01:40 wiz Exp $
 
 DISTNAME=	seahorse-2.26.0
 CATEGORIES=	security
@@ -39,16 +39,6 @@ CONFIGURE_ENV+=		SSH_KEYGEN_PATH=${SSH_KEYGEN_PATH:Q}
 PKGCONFIG_OVERRIDE+=	libcryptui/cryptui.pc.in
 GCONF_SCHEMAS= 	seahorse.schemas
 
-BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
-
-# In pkgsrc, the shipped gettext 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
-
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
@@ -56,6 +46,7 @@ post-patch:
 .include "../../net/avahi/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
diff --git a/security/seahorse/files/msgfmtstrip b/security/seahorse/files/msgfmtstrip
deleted file mode 100644
index 6a79f7cff94..00000000000
--- a/security/seahorse/files/msgfmtstrip
+++ /dev/null
@@ -1,18 +0,0 @@
-# $Id: msgfmtstrip,v 1.1 2008/11/03 06:52:04 wiz 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;
-}