pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/archivers/gsharutils Apply fix from Kouichirou Hiratsu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf312ba56b82
branches:  trunk
changeset: 462953:bf312ba56b82
user:      agc <agc%pkgsrc.org@localhost>
date:      Mon Oct 20 09:35:06 2003 +0000

description:
Apply fix from Kouichirou Hiratsuka in PR 22348:

+ don't create spurious ${PREFIX}/share/locale/<lang>. directories
+ don't populate said directories with .gmo files
+ only install .gmo files if necessary

diffstat:

 archivers/gsharutils/distinfo         |   3 +-
 archivers/gsharutils/patches/patch-ag |  41 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r f24d84e6b84f -r bf312ba56b82 archivers/gsharutils/distinfo
--- a/archivers/gsharutils/distinfo     Mon Oct 20 08:20:58 2003 +0000
+++ b/archivers/gsharutils/distinfo     Mon Oct 20 09:35:06 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/12/22 01:49:13 wiz Exp $
+$NetBSD: distinfo,v 1.8 2003/10/20 09:35:06 agc Exp $
 
 SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
 Size (sharutils-4.2.1.tar.gz) = 306022 bytes
@@ -8,3 +8,4 @@
 SHA1 (patch-ad) = fe6ba534c9830294c97dd37586aaa2c63d385a4c
 SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
+SHA1 (patch-ag) = 3660e8e809512208f16df1e81d7d0c40e6169e37
diff -r f24d84e6b84f -r bf312ba56b82 archivers/gsharutils/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/gsharutils/patches/patch-ag     Mon Oct 20 09:35:06 2003 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ag,v 1.6 2003/10/20 09:35:06 agc Exp $
+
+Apply fix from Kouichirou Hiratsuka in PR 22348
+
+--- po/Makefile.in.in  2003/10/20 09:29:50     1.1
++++ po/Makefile.in.in  2003/10/20 09:29:57
+@@ -120,11 +120,15 @@
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         if test "`echo $$cat | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \
++          if test $(gnulocaledir) = $(localedir) -a \
++                  $(CATOBJEXT) != ".gmo"; then \
++            continue; \
++          fi; \
+           destdir=$(gnulocaledir); \
+         else \
+           destdir=$(localedir); \
+         fi; \
+-        lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
++        lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
+         dir=$$destdir/$$lang/LC_MESSAGES; \
+         $(top_srcdir)/mkinstalldirs $$dir; \
+         if test -r $$cat; then \
+@@ -144,7 +148,7 @@
+ uninstall:
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+-        lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
++        lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
+         rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+         rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+       done
+@@ -180,7 +184,7 @@
+       cd $(srcdir); \
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+-        lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
++        lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
+         mv $$lang.po $$lang.old.po; \
+         if $(TUPDATE) $(PACKAGE).pot $$lang.old.po > $$lang.po; then \
+           rm -f $$lang.old.po; \



Home | Main Index | Thread Index | Old Index