diff options
44 files changed, 47 insertions, 629 deletions
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile index 9712f8415b7..a2c3eefa1a8 100644 --- a/chat/empathy/Makefile +++ b/chat/empathy/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2009/02/09 22:56:21 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2009/03/22 19:01:37 wiz Exp $ DISTNAME= empathy-2.24.1 -PKGREVISION= 2 +PKGREVISION= 1 CATEGORIES= chat gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/empathy/2.24/} @@ -23,14 +23,6 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS+= GNOME_Megaphone_Applet.schemas GCONF_SCHEMAS+= empathy.schemas -# 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 - pre-configure: cd ${WRKSRC} && autoconf -f diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo index 0b17532d9a7..b99cd04d176 100644 --- a/chat/empathy/distinfo +++ b/chat/empathy/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2008/12/24 12:39:59 jmcneill Exp $ +$NetBSD: distinfo,v 1.3 2009/03/22 19:01:37 wiz Exp $ SHA1 (empathy-2.24.1.tar.gz) = c2962c01b12e946bca4f2ee4585e8a98a29689e4 RMD160 (empathy-2.24.1.tar.gz) = 20e16355c7e9df02f7692d3ae7511d91f9f0c5e7 Size (empathy-2.24.1.tar.gz) = 2475921 bytes -SHA1 (patch-aa) = 764e4d75441e75de4053dcdf3e18628feebe05ac diff --git a/chat/empathy/files/msgfmtstrip b/chat/empathy/files/msgfmtstrip deleted file mode 100644 index db32d55e7d6..00000000000 --- a/chat/empathy/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1.1.1 2008/11/14 23:01:45 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; -} 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; -} diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index ca2462934d8..06c48c775a6 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2009/03/19 12:14:37 drochner Exp $ +# $NetBSD: Makefile,v 1.93 2009/03/22 19:01:38 wiz Exp $ # DISTNAME= gedit-2.26.0 @@ -22,14 +22,6 @@ PKGCONFIG_OVERRIDE+= data/gedit.pc.in GCONF_SCHEMAS= gedit.schemas gedit-file-browser.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 ${WRKSRC}/help/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - .include "options.mk" .include "../../devel/GConf/schemas.mk" diff --git a/editors/gedit/files/msgfmtstrip b/editors/gedit/files/msgfmtstrip deleted file mode 100644 index d32a547cde8..00000000000 --- a/editors/gedit/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/15 20:13:11 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/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; -} diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 2529d3855c4..9e4b4550afc 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2009/03/19 18:39:14 drochner Exp $ +# $NetBSD: Makefile,v 1.44 2009/03/22 19:01:38 wiz Exp $ # DISTNAME= eog-2.26.0 @@ -20,14 +20,6 @@ USE_LIBTOOL= yes GCONF_SCHEMAS= eog.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 ${WRKSRC}/help/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - .include "../../devel/GConf/schemas.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.3 .include "../../devel/glib2/buildlink3.mk" diff --git a/graphics/eog/files/msgfmtstrip b/graphics/eog/files/msgfmtstrip deleted file mode 100644 index 34550792cd1..00000000000 --- a/graphics/eog/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/16 23:09:18 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/graphics/gimp/Makefile b/graphics/gimp/Makefile index af1fbf91776..823891a90c7 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.180 2009/03/17 15:41:41 adam Exp $ +# $NetBSD: Makefile,v 1.181 2009/03/22 19:01:39 wiz Exp $ DISTNAME= gimp-2.6.6 CATEGORIES= graphics @@ -55,14 +55,6 @@ PLIST.twain= yes .include "options.mk" -# 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-libgimp/*.po ${WRKSRC}/po-plug-ins/*.po; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/gimp/files/msgfmtstrip b/graphics/gimp/files/msgfmtstrip deleted file mode 100644 index 807dab33485..00000000000 --- a/graphics/gimp/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/01/24 20:55:06 adam 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/mail/evolution/Makefile b/mail/evolution/Makefile index 4f05c7ba86d..0180858aade 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2009/03/19 12:05:04 drochner Exp $ +# $NetBSD: Makefile,v 1.148 2009/03/22 19:01:39 wiz Exp $ DISTNAME= evolution-2.26.0 CATEGORIES= mail time gnome @@ -50,14 +50,6 @@ GCONF_SCHEMAS+= evolution-mail.schemas BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED -# 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 - .if !exists(/usr/include/semaphore.h) LDFLAGS+= -lsemaphore .include "../../devel/pthread-sem/buildlink3.mk" diff --git a/mail/evolution/files/msgfmtstrip b/mail/evolution/files/msgfmtstrip deleted file mode 100644 index bc1a20b6a48..00000000000 --- a/mail/evolution/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2008/10/26 23:17:21 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; -} diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index 223cbbf2e63..8e314d48e1b 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2009/03/18 00:32:45 jmcneill Exp $ +# $NetBSD: Makefile,v 1.79 2009/03/22 19:01:39 wiz Exp $ # DISTNAME= gcalctool-5.26.0 @@ -22,16 +22,6 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS= gcalctool.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 ${WRKSRC}/help/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 - .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../devel/GConf/schemas.mk" .include "../../devel/atk/buildlink3.mk" @@ -41,5 +31,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/gcalctool/files/msgfmtstrip b/math/gcalctool/files/msgfmtstrip deleted file mode 100644 index 056975f4d07..00000000000 --- a/math/gcalctool/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/18 00:32:45 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/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; -} diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile index fec4f9d26e6..06b20eedf9f 100644 --- a/multimedia/gnome-media/Makefile +++ b/multimedia/gnome-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/03/16 22:09:28 jmcneill Exp $ +# $NetBSD: Makefile,v 1.20 2009/03/22 19:01:40 wiz Exp $ DISTNAME= gnome-media-2.26.0 CATEGORIES= multimedia gnome @@ -40,20 +40,6 @@ CONFIGURE_ARGS+= --disable-ipv6 GCONF_SCHEMAS+= gnome-audio-profiles.schemas GCONF_SCHEMAS+= gnome-sound-recorder.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 ${WRKSRC}/*/doc/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - -BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.3 -BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.3 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 -BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7 -BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2 - .include "../../audio/libcanberra/buildlink3.mk" .include "../../audio/pulseaudio/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" @@ -62,18 +48,23 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" +BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7 .include "../../devel/libgnome/buildlink3.mk" +BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.3 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk" +BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.3 .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/nautilus-cd-burner/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libunique/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" diff --git a/multimedia/gnome-media/files/msgfmtstrip b/multimedia/gnome-media/files/msgfmtstrip deleted file mode 100644 index 2309639b8cc..00000000000 --- a/multimedia/gnome-media/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/16 22:09:28 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/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common index 52d261349f2..0fa07e02692 100644 --- a/multimedia/totem/Makefile.common +++ b/multimedia/totem/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2009/03/16 12:13:31 jmcneill Exp $ +# $NetBSD: Makefile.common,v 1.45 2009/03/22 19:01:40 wiz Exp $ # # used by multimedia/totem-nautilus/Makefile # used by multimedia/totem-xine/Makefile @@ -27,31 +27,21 @@ GCONF_SCHEMAS= totem.schemas GCONF_SCHEMAS+= totem-handlers.schemas GCONF_SCHEMAS+= totem-video-thumbnail.schemas -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 -BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0 -BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.2 -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.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}/help/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - .include "../../lang/python/application.mk" .include "../../x11/py-gtk2/buildlink3.mk" .include "../../www/py-gdata/buildlink3.mk" .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0 .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.2 .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" @@ -61,5 +51,6 @@ post-patch: .include "../../mk/omf-scrollkeeper.mk" .include "../../x11/libXxf86vm/buildlink3.mk" .include "../../x11/libXtst/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 .include "../../x11/gtk2/buildlink3.mk" .include "../../multimedia/totem-pl-parser/buildlink3.mk" diff --git a/multimedia/totem/files/msgfmtstrip b/multimedia/totem/files/msgfmtstrip deleted file mode 100644 index 660f4a7bb36..00000000000 --- a/multimedia/totem/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/16 12:13:31 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/net/ekiga/Makefile b/net/ekiga/Makefile index e3895f41928..a85562d12e5 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/03/22 08:51:24 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2009/03/22 19:01:40 wiz Exp $ # DISTNAME= ekiga-3.2.0 @@ -29,14 +29,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ -# 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}/help/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - pre-configure: cd ${WRKSRC} && autoconf diff --git a/net/ekiga/files/msgfmtstrip b/net/ekiga/files/msgfmtstrip deleted file mode 100644 index 9f1880d4945..00000000000 --- a/net/ekiga/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/18 13:08:07 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/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; -} diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index ae6a236ef8d..f766bef756c 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/03/22 09:30:38 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2009/03/22 19:01:41 wiz Exp $ # DISTNAME= brasero-2.26.0 @@ -28,14 +28,6 @@ PKGCONFIG_OVERRIDE+= libbrasero-media.pc.in post-extract: cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/ -# 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 - pre-configure: cd ${WRKSRC} && automake && autoconf diff --git a/sysutils/brasero/files/msgfmtstrip b/sysutils/brasero/files/msgfmtstrip deleted file mode 100644 index ebf348d929f..00000000000 --- a/sysutils/brasero/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1.1.1 2009/03/16 10:49:06 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/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index 20b2c8450df..17097568c90 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2009/03/16 14:05:04 jmcneill Exp $ +# $NetBSD: Makefile,v 1.97 2009/03/22 19:01:41 wiz Exp $ # DISTNAME= nautilus-2.26.0 @@ -23,14 +23,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} GCONF_SCHEMAS= apps_nautilus_preferences.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 - post-install: # for nautilus-cd-burner, remove when it's no longer needed ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/nautilus/extensions-1.0 diff --git a/sysutils/nautilus/files/msgfmtstrip b/sysutils/nautilus/files/msgfmtstrip deleted file mode 100644 index aefb932ed7f..00000000000 --- a/sysutils/nautilus/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/16 14:05:04 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/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile index e86af5f7f0f..8288e31aabf 100644 --- a/www/gtkhtml314/Makefile +++ b/www/gtkhtml314/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2009/03/16 11:36:03 jmcneill Exp $ +# $NetBSD: Makefile,v 1.24 2009/03/22 19:01:41 wiz Exp $ # # PKGNAME derives from the supported API (still from # release 3.14). See also PLIST. @@ -24,14 +24,6 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config PKGCONFIG_OVERRIDE+= components/editor/gtkhtml-editor.pc.in PKGCONFIG_OVERRIDE+= gtkhtml/libgtkhtml.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 - .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" diff --git a/www/gtkhtml314/files/msgfmtstrip b/www/gtkhtml314/files/msgfmtstrip deleted file mode 100644 index c61056b92a8..00000000000 --- a/www/gtkhtml314/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2008/10/24 19:27:18 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; -} diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile index 2f02142301d..690c39f01b4 100644 --- a/x11/gnome-control-center/Makefile +++ b/x11/gnome-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2009/03/17 00:27:37 jmcneill Exp $ +# $NetBSD: Makefile,v 1.23 2009/03/22 19:01:41 wiz Exp $ # DISTNAME= gnome-control-center-2.26.0 @@ -58,14 +58,6 @@ PLIST.evolution= yes _TOOLS_USE_MSGFMT_SH= 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 - .include "../../audio/libcanberra/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/GConf/schemas.mk" diff --git a/x11/gnome-control-center/files/msgfmtstrip b/x11/gnome-control-center/files/msgfmtstrip deleted file mode 100644 index bf06cccf550..00000000000 --- a/x11/gnome-control-center/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2008/10/24 23:45:34 jnemeth 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/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 503e45c9e08..edb66463816 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2009/03/16 23:49:20 jmcneill Exp $ +# $NetBSD: Makefile,v 1.108 2009/03/22 19:01:42 wiz Exp $ # DISTNAME= gnome-panel-2.26.0 @@ -46,16 +46,6 @@ PKG_SUGGESTED_OPTIONS= evolution .include "../../mk/bsd.options.mk" -# 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}/help/*/*/*.po ; do \ - mv $$f $$f.original ; \ - ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \ - done - -BUILDLINK_DEPMETHOD.libXt?= build - .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" @@ -85,5 +75,6 @@ BUILDLINK_API_DEPENDS.libgweather+= libgweather>=2.24.1 .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/x11/gnome-panel/files/msgfmtstrip b/x11/gnome-panel/files/msgfmtstrip deleted file mode 100644 index 950ff7540cb..00000000000 --- a/x11/gnome-panel/files/msgfmtstrip +++ /dev/null @@ -1,18 +0,0 @@ -# $Id: msgfmtstrip,v 1.1 2009/03/16 23:49:20 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; -} |