pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Remove msgfmtstrip scripts and targets using them, now...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e1b463686c5
branches:  trunk
changeset: 556555:7e1b463686c5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 22 19:01:37 2009 +0000

description:
Remove msgfmtstrip scripts and targets using them, now that the
infrastructure supports this properly (thanks joerg!).

diffstat:

 chat/empathy/Makefile                      |  12 +--------
 chat/empathy/distinfo                      |   3 +-
 chat/empathy/files/msgfmtstrip             |  18 --------------
 devel/libgweather/Makefile                 |  10 +-------
 devel/libgweather/files/msgfmtstrip        |  18 --------------
 devel/libwnck/Makefile                     |  16 ++----------
 devel/libwnck/files/msgfmtstrip            |  18 --------------
 editors/gedit/Makefile                     |  10 +-------
 editors/gedit/files/msgfmtstrip            |  18 --------------
 games/gnome-games/Makefile                 |  37 ++++-------------------------
 games/gnome-games/files/msgfmtstrip        |  18 --------------
 games/warzone2100/Makefile                 |  12 ++-------
 games/warzone2100/files/msgfmtstrip        |  18 --------------
 graphics/eog/Makefile                      |  10 +-------
 graphics/eog/files/msgfmtstrip             |  18 --------------
 graphics/gimp/Makefile                     |  10 +-------
 graphics/gimp/files/msgfmtstrip            |  18 --------------
 mail/evolution/Makefile                    |  10 +-------
 mail/evolution/files/msgfmtstrip           |  18 --------------
 math/gcalctool/Makefile                    |  13 +--------
 math/gcalctool/files/msgfmtstrip           |  18 --------------
 misc/gok/Makefile                          |  17 +++----------
 misc/gok/files/msgfmtstrip                 |  18 --------------
 misc/orca/Makefile                         |  10 +-------
 misc/orca/files/msgfmtstrip                |  18 --------------
 multimedia/gnome-media/Makefile            |  21 ++++------------
 multimedia/gnome-media/files/msgfmtstrip   |  18 --------------
 multimedia/totem/Makefile.common           |  19 ++++-----------
 multimedia/totem/files/msgfmtstrip         |  18 --------------
 net/ekiga/Makefile                         |  10 +-------
 net/ekiga/files/msgfmtstrip                |  18 --------------
 security/seahorse-plugins/Makefile         |  12 +--------
 security/seahorse/Makefile                 |  13 +--------
 security/seahorse/files/msgfmtstrip        |  18 --------------
 sysutils/brasero/Makefile                  |  10 +-------
 sysutils/brasero/files/msgfmtstrip         |  18 --------------
 sysutils/nautilus/Makefile                 |  10 +-------
 sysutils/nautilus/files/msgfmtstrip        |  18 --------------
 www/gtkhtml314/Makefile                    |  10 +-------
 www/gtkhtml314/files/msgfmtstrip           |  18 --------------
 x11/gnome-control-center/Makefile          |  10 +-------
 x11/gnome-control-center/files/msgfmtstrip |  18 --------------
 x11/gnome-panel/Makefile                   |  13 +--------
 x11/gnome-panel/files/msgfmtstrip          |  18 --------------
 44 files changed, 47 insertions(+), 629 deletions(-)

diffs (truncated from 1172 to 300 lines):

diff -r 07ec58851817 -r 7e1b463686c5 chat/empathy/Makefile
--- a/chat/empathy/Makefile     Sun Mar 22 18:57:06 2009 +0000
+++ b/chat/empathy/Makefile     Sun Mar 22 19:01:37 2009 +0000
@@ -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 @@
 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 -r 07ec58851817 -r 7e1b463686c5 chat/empathy/distinfo
--- a/chat/empathy/distinfo     Sun Mar 22 18:57:06 2009 +0000
+++ b/chat/empathy/distinfo     Sun Mar 22 19:01:37 2009 +0000
@@ -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 -r 07ec58851817 -r 7e1b463686c5 chat/empathy/files/msgfmtstrip
--- a/chat/empathy/files/msgfmtstrip    Sun Mar 22 18:57:06 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 07ec58851817 -r 7e1b463686c5 devel/libgweather/Makefile
--- a/devel/libgweather/Makefile        Sun Mar 22 18:57:06 2009 +0000
+++ b/devel/libgweather/Makefile        Sun Mar 22 19:01:37 2009 +0000
@@ -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 @@
 
 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 -r 07ec58851817 -r 7e1b463686c5 devel/libgweather/files/msgfmtstrip
--- a/devel/libgweather/files/msgfmtstrip       Sun Mar 22 18:57:06 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 07ec58851817 -r 7e1b463686c5 devel/libwnck/Makefile
--- a/devel/libwnck/Makefile    Sun Mar 22 18:57:06 2009 +0000
+++ b/devel/libwnck/Makefile    Sun Mar 22 19:01:37 2009 +0000
@@ -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 @@
 
 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 -r 07ec58851817 -r 7e1b463686c5 devel/libwnck/files/msgfmtstrip
--- a/devel/libwnck/files/msgfmtstrip   Sun Mar 22 18:57:06 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 07ec58851817 -r 7e1b463686c5 editors/gedit/Makefile
--- a/editors/gedit/Makefile    Sun Mar 22 18:57:06 2009 +0000
+++ b/editors/gedit/Makefile    Sun Mar 22 19:01:37 2009 +0000
@@ -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 @@
 
 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 -r 07ec58851817 -r 7e1b463686c5 editors/gedit/files/msgfmtstrip
--- a/editors/gedit/files/msgfmtstrip   Sun Mar 22 18:57:06 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 07ec58851817 -r 7e1b463686c5 games/gnome-games/Makefile
--- a/games/gnome-games/Makefile        Sun Mar 22 18:57:06 2009 +0000
+++ b/games/gnome-games/Makefile        Sun Mar 22 19:01:37 2009 +0000
@@ -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+= 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 -r 07ec58851817 -r 7e1b463686c5 games/gnome-games/files/msgfmtstrip
--- a/games/gnome-games/files/msgfmtstrip       Sun Mar 22 18:57:06 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 07ec58851817 -r 7e1b463686c5 games/warzone2100/Makefile



Home | Main Index | Thread Index | Old Index