diff options
| author | agc <agc@pkgsrc.org> | 2003-10-20 09:35:06 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-10-20 09:35:06 +0000 |
| commit | e067c25c9404e114bbad254c47d297cf15280485 (patch) | |
| tree | 85be27f736b950b655e309ae6ff4723673006805 /archivers | |
| parent | bc22e2d5673d334f294bef530db4e9b7fe5be209 (diff) | |
| download | pkgsrc-e067c25c9404e114bbad254c47d297cf15280485.tar.gz | |
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 (limited to 'archivers')
| -rw-r--r-- | archivers/gsharutils/distinfo | 3 | ||||
| -rw-r--r-- | archivers/gsharutils/patches/patch-ag | 41 |
2 files changed, 43 insertions, 1 deletions
diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo index fcc6f038e30..f18e0d97959 100644 --- a/archivers/gsharutils/distinfo +++ b/archivers/gsharutils/distinfo @@ -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-ac) = 76bf1dedc34a462dd05a55511d9caf578cae78d0 SHA1 (patch-ad) = fe6ba534c9830294c97dd37586aaa2c63d385a4c SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9 +SHA1 (patch-ag) = 3660e8e809512208f16df1e81d7d0c40e6169e37 diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag new file mode 100644 index 00000000000..6a39a3f7207 --- /dev/null +++ b/archivers/gsharutils/patches/patch-ag @@ -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; \ |