Fix NLS catalogue installation. Both building and installing

the catalogue files is handled by the upstream Makefile.

Fixes PR pkg/48704 as well.

4 files changed, 134 insertions, 64 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index afa2241b05e..dbdc20c68a3 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,24 +1,19 @@
-# $NetBSD: Makefile,v 1.76 2013/05/11 16:43:50 riastradh Exp $
+# $NetBSD: Makefile,v 1.77 2014/04/04 12:00:37 kim Exp $
 
 DISTNAME=	tcsh-6.18.01
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
 
-MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.tcsh.org/Welcome
+MAINTAINER=	kim@netbsd.org
+HOMEPAGE=	http://www.tcsh.org/
 COMMENT=	Extended C-shell with many useful features
 LICENSE=	original-bsd
 
 CONFLICTS?=	static-tcsh-[0-9]*
 
 GNU_CONFIGURE=	yes
-BUILD_TARGET=	all catalogs
-INSTALL_TARGET=	install install.man
-
-NLSDIR=		share/nls
-PLIST_SRC=	${WRKDIR}/PLIST-src
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,58 +31,5 @@ PKG_SHELL?=	bin/tcsh
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-post-install:
-	@${ECHO} "Installing message catalogues"
-	cp ${PKGDIR}/PLIST ${PLIST_SRC}
-	set -e;							\
-	if [ -f ${WRKSRC}/tcsh.C.cat ];				\
-	then							\
-	    [ -d ${DESTDIR}${PREFIX}/${NLSDIR}/C ] ||		\
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${NLSDIR}/C;	\
-	    ${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat 			\
-		${DESTDIR}${PREFIX}/${NLSDIR}/C/tcsh.cat;		\
-	    ${ECHO} ${NLSDIR}/C/tcsh.cat >> ${PLIST_SRC};		\
-	    for i in 							\
-		et:ISO_8859-15:et:EE					\
-		finnish:ISO_8859-1:fi:FI				\
-		french:ISO_8859-1:fr:BE:CA:CH:FR			\
-		german:ISO_8859-1:de:AT:CH:DE				\
-		greek:ISO_8859-7:el:GR					\
-		italian:ISO_8859-1:it:CH:IT				\
-		ja:eucJP:ja:JP						\
-		pl:ISO_8859-2:pl:PL					\
-		russian:KOI8-R:ru:RU:SU					\
-		spanish:ISO_8859-1:es:ES				\
-		ukrainian:KOI8-U:uk:UA					\
-		;							\
-	    do								\
-		OIFS="$${IFS}";						\
-		IFS=":$${IFS}";						\
-		set -- $$i;						\
-		IFS="$${OIFS}";						\
-		l=$$1; shift;						\
-		s=$$1; shift;						\
-		c=$$1; shift;						\
-		o=;							\
-		while [ $$# -gt 0 ];					\
-		do							\
-		    d=${NLSDIR}/$${c}_$$1.$${s};			\
-		    [ -d ${DESTDIR}${PREFIX}/$$d ] ||			\
-			${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$$d;	\
-		    if [ -z "$$o" ];					\
-		    then						\
-			o="$$d";					\
-			${INSTALL_DATA} ${WRKSRC}/tcsh.$${l}.cat	\
-			    ${DESTDIR}${PREFIX}/$${d}/tcsh.cat;		\
-		    else						\
-			${LN} -f ${DESTDIR}${PREFIX}/$${o}/tcsh.cat	\
-			    ${DESTDIR}${PREFIX}/$${d};			\
-		    fi;							\
-		    ${ECHO} $${d}/tcsh.cat >> ${PLIST_SRC};		\
-		    shift 1;						\
-		done;							\
-	    done;							\
-	fi
-
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/PLIST b/shells/tcsh/PLIST
index 3142a370ac3..0f1ea97e1ee 100644
--- a/shells/tcsh/PLIST
+++ b/shells/tcsh/PLIST
@@ -1,3 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:02 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/04/04 12:00:37 kim Exp $
 bin/tcsh
 man/man1/tcsh.1
+share/locale/C/LC_MESSAGES/tcsh.cat
+share/locale/de/LC_MESSAGES/tcsh.cat
+share/locale/es/LC_MESSAGES/tcsh.cat
+share/locale/et/LC_MESSAGES/tcsh.cat
+share/locale/fi/LC_MESSAGES/tcsh.cat
+share/locale/fr/LC_MESSAGES/tcsh.cat
+share/locale/gr/LC_MESSAGES/tcsh.cat
+share/locale/it/LC_MESSAGES/tcsh.cat
+share/locale/ja/LC_MESSAGES/tcsh.cat
+share/locale/pl/LC_MESSAGES/tcsh.cat
+share/locale/ru/LC_MESSAGES/tcsh.cat
+share/locale/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 2f679e3c176..808378ea54d 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2013/04/02 20:37:55 bsiegert Exp $
+$NetBSD: distinfo,v 1.32 2014/04/04 12:00:37 kim Exp $
 
 SHA1 (tcsh-6.18.01.tar.gz) = eee2035645737197ff8059c84933a75d23cd76f9
 RMD160 (tcsh-6.18.01.tar.gz) = ea18bb6d4d6dca2700d74daa2940f67d45a18cb9
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = eadb2c1f4ad8bab7826c8e07c8edfc68569c74d4
 SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
 SHA1 (patch-ac) = c2a944f9c6857cdd8ba9753e3ce7c496749f8f87
 SHA1 (patch-configure) = 91c2019da8c074bd6f24b84bf798ccd497110727
+SHA1 (patch-nls_Makefile.in) = 50c6d7a038799db60393a4daf3a491961a40fdc7
 SHA1 (patch-sh.c) = 9f7a1449a0ff0da5a3af886fcf86bdc551e10732
diff --git a/shells/tcsh/patches/patch-nls_Makefile.in b/shells/tcsh/patches/patch-nls_Makefile.in
new file mode 100644
index 00000000000..e1f72a5fd40
--- /dev/null
+++ b/shells/tcsh/patches/patch-nls_Makefile.in
@@ -0,0 +1,115 @@
+$NetBSD: patch-nls_Makefile.in,v 1.1 2014/04/04 12:00:37 kim Exp $
+
+Use allsrc as impsrc is not set for non-suffix rules.
+This is fine because there is only one source per rule.
+
+--- nls/Makefile.in.orig	2012-01-05 11:54:25.000000000 -0500
++++ nls/Makefile.in	2014-04-04 07:47:28.000000000 -0400
+@@ -19,7 +19,7 @@
+ INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
+ ${localedir}/C/LC_MESSAGES/tcsh.cat:	C.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -27,7 +27,7 @@
+ INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
+ ${localedir}/et/LC_MESSAGES/tcsh.cat:	et.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -35,7 +35,7 @@
+ INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
+ ${localedir}/fi/LC_MESSAGES/tcsh.cat:	finnish.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -43,7 +43,7 @@
+ INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
+ ${localedir}/fr/LC_MESSAGES/tcsh.cat:	french.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -51,7 +51,7 @@
+ INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
+ ${localedir}/de/LC_MESSAGES/tcsh.cat:	german.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -59,7 +59,7 @@
+ INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
+ ${localedir}/gr/LC_MESSAGES/tcsh.cat:	greek.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -67,7 +67,7 @@
+ INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
+ ${localedir}/it/LC_MESSAGES/tcsh.cat:	italian.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -75,7 +75,7 @@
+ INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
+ ${localedir}/ja/LC_MESSAGES/tcsh.cat:	ja.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -83,7 +83,7 @@
+ INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
+ ${localedir}/pl/LC_MESSAGES/tcsh.cat:	pl.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -91,7 +91,7 @@
+ INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
+ ${localedir}/ru/LC_MESSAGES/tcsh.cat:	russian.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -99,7 +99,7 @@
+ INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
+ ${localedir}/es/LC_MESSAGES/tcsh.cat:	spanish.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ spanish.cat: ${srcdir}/spanish/charset ${srcdir}/spanish/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>
+@@ -107,7 +107,7 @@
+ INSTALLED+=${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat
+ ${localedir}/ru_UA.koi8u/LC_MESSAGES/tcsh.cat:	ukrainian.cat
+ 	mkdir -p $(@D)
+-	$(INSTALL) $< $@
++	$(INSTALL) $> $@
+ 
+ ukrainian.cat: ${srcdir}/ukrainian/charset ${srcdir}/ukrainian/*set[0-9]*
+ 	@${CATGEN} $(GENCAT) $@ $^ $>