Update linux-locale to 2.1.1.

These RPM files are supplementary locales for Linux.
Many languages are not supproted by default by GNU libc.
  af ar bg br ca cs cy da de el en eo es et eu fi fo fr ga gl
  he hr hu hy id is it ja ka kl ko lo lt lv nl no oc pl pt ro
  ru sk sl sr sv th tr uk vi wa zh

5 files changed, 98 insertions, 58 deletions

diff --git a/emulators/linux-locale/Makefile b/emulators/linux-locale/Makefile
index e27fd88b5c9..98e16f23ea1 100644
--- a/emulators/linux-locale/Makefile
+++ b/emulators/linux-locale/Makefile
@@ -1,70 +1,63 @@
-# $NetBSD: Makefile,v 1.5 2000/03/16 12:32:27 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/04/28 10:23:43 sakamoto Exp $
 #
 
-DISTNAME=	libwcsmbs-0.0.4-4jrpm
-PKGNAME=	linux-locale-0.4.11
+DISTNAME=	locales-2.1-1mdk
+PKGNAME=	linux-locale-2.1.1
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.linux.or.jp/pub/RPM/RPMS/i386-glibc/ \
-		ftp://mirror.nucba.ac.jp/pub/JRPM/RPMS/i386-glibc/ \
-		ftp://ftp.lab.kdd.co.jp/Linux/jrpm/RPMS/i386-glibc/ \
-		ftp://ftp.cc.miyazaki-u.ac.jp/pub/OS/Linux/JRPM/RPMS/i386-glibc/
-EXTRACT_SUFX=	.i386.rpm
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		wcsmbs-locale-0.4.11-1jrpm${EXTRACT_SUFX}
-
-BROKEN=	linux-locale does not work correctly with glibc-2.1.2 (suse_linux-6.3)
+MASTER_SITES=	http://www.linuxi18n.org/locales/
+EXTRACT_SUFX=	.noarch.rpm
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sakamoto@netbsd.org
+HOMEPAGE=	http://www.linuxi18n.org/locales/
 
-ONLY_FOR_PLATFORM=	*-*-i386
+BUILD_DEPENDS+=	rpm2cpio:../../misc/rpm
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-DEPENDS=	suse_linux-6.1p1:../../emulators/suse_linux
+.if !defined(LINUX_LOCALES)
+LINUX_LOCALES= \
+	af ar bg br ca cs cy da de el en eo es et eu fi fo fr ga gl \
+	he hr hu hy id is it ja ka kl ko lo lt lv nl no oc pl pt ro \
+	ru sk sl sr sv th tr uk vi wa zh
+#	fa gd gv iu kw ml ms pd
 .endif
 
+.for locale in ${LINUX_LOCALES}
+DISTFILES+=	locales-${locale}-2.1-1mdk${EXTRACT_SUFX}
+.endfor
+
+DIST_SUBDIR=	linux-locale
+
+ONLY_FOR_PLATFORM=NetBSD-*-i386
+DEPENDS=	suse_linux-6.3:../../emulators/suse_linux
+
 EXTRACT_ONLY=	# empty
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
-DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
-DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 
 EMULSUBDIR=	emul/linux
 EMULDIR=	${PREFIX}/${EMULSUBDIR}
-EMULPRELOAD=	${EMULDIR}/etc/ld.so.preload
-
-RPM2PKG=	${PREFIX}/sbin/rpm2pkg
-RPM2PKGARGS=	-d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
-.for TEMP in ${DISTFILES}
-RPM2PKGARGS+=	${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
+PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+CPIOLIST=	${WRKDIR}/CPIOLIST
 
 do-install:
-	@if [ -f ${PKGDIR}/PLIST ]; then \
-	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
-	else \
-	  ${RM} -f ${PLIST_SRC}; \
-	fi
-	${RPM2PKG} ${RPM2PKGARGS}
-	@if ${GREP} -q 'lib.*\.so' ${PLIST_SRC}; then \
-	  ${ECHO_MSG} "===>   [Automatic Linux shared object handling]"; \
-	  ${EMULDIR}/sbin/ldconfig -r ${EMULDIR}; \
-	  ${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}; \
-	  ${ECHO} "@unexec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR} 2>/dev/null" >>${PLIST_SRC}; \
-	fi
+	@${MV} ${EMULDIR}/usr/share/locale ${EMULDIR}/usr/share/locale.orig
+	@${RM} -f ${CPIOLIST}
+.for f in ${DISTFILES}
+	@rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${f}|cpio -t -v >> ${CPIOLIST}
+	@(cd ${EMULDIR}; rpm2cpio ${DISTDIR}/${DIST_SUBDIR}/${f}|cpio -i -d)
+.endfor
+	@${CHMOD} 755 ${EMULDIR}/usr/share/locale
 
 post-install:
-	@${ECHO_MSG} "===>   [Automatic Linux shared object preload handling]"
-	@${GREP} -v 'libwcsmbs\.so' ${EMULPRELOAD} \
-		> ${WRKDIR}/preload 2> /dev/null || ${TRUE}
-	@${MV} ${WRKDIR}/preload ${EMULPRELOAD}
-	@${ECHO} "libwcsmbs.so.0" >> ${EMULPRELOAD}
-	@${SED} -e 's|$${EMULPRELOAD}|${EMULPRELOAD}|g' \
-		${DEINSTALL_SRC} > ${DEINSTALL_FILE}
-
-show-shlib-type:
-	@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} "@exec ${MV} ${EMULDIR}/usr/share/locale ${EMULDIR}/usr/share/locale.orig" > ${PLIST_SRC}
+	@${CAT} ${CPIOLIST}|${GREP} "^d"|${SED} -e "s|.* \(usr\/.*\)|@exec ${MKDIR} ${EMULDIR}/\1|"|sort >> ${PLIST_SRC}
+	@${CAT} ${CPIOLIST}|${GREP} "^-"|${SED} -e "s|.* \(usr\/.*\)|${EMULSUBDIR}/\1|"|sort >> ${PLIST_SRC}
+	@${CAT} ${CPIOLIST}|${GREP} "^l"|${SED} -e "s|.* \(usr\/.*\) -> \(.*\)|@exec ln -s \2 %D/${EMULSUBDIR}/\1|"|sort >> ${PLIST_SRC}
+	@${CAT} ${CPIOLIST}|${GREP} "^l"|${SED} -e "s|.* \(usr\/.*\) -> .*|@unexec rm -f %D/${EMULSUBDIR}/\1|"|sort >> ${PLIST_SRC}
+	@${CAT} ${CPIOLIST}|${GREP} "^d"|${SED} -e "s|.* \(usr\/.*\)|@dirrm ${EMULSUBDIR}/\1|"|sort -r >> ${PLIST_SRC}
+	@${ECHO} "@dirrm ${EMULSUBDIR}/usr/share/locale" >> ${PLIST_SRC}
+	@${ECHO} "@unexec ${MV} ${EMULDIR}/usr/share/locale.orig ${EMULDIR}/usr/share/locale" >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/linux-locale/files/md5 b/emulators/linux-locale/files/md5
index cb23039e759..269295261fc 100644
--- a/emulators/linux-locale/files/md5
+++ b/emulators/linux-locale/files/md5
@@ -1,4 +1,54 @@
-$NetBSD: md5,v 1.1.1.1 2000/01/07 05:23:30 sakamoto Exp $
+$NetBSD: md5,v 1.2 2000/04/28 10:23:44 sakamoto Exp $
 
-MD5 (libwcsmbs-0.0.4-4jrpm.i386.rpm) = 339d01d9dceba375bfd9eb54915f08ee
-MD5 (wcsmbs-locale-0.4.11-1jrpm.i386.rpm) = a987271fa9b462c654d5856b47da191e
+MD5 (linux-locale/locales-2.1-1mdk.noarch.rpm) = 208967e58ec29e1673f80eca86636b2a
+MD5 (linux-locale/locales-af-2.1-1mdk.noarch.rpm) = 7fd241bd03403de66c3fe0c6f0039240
+MD5 (linux-locale/locales-ar-2.1-1mdk.noarch.rpm) = 9c05ffab3bfcae08bb0b6249647323cb
+MD5 (linux-locale/locales-bg-2.1-1mdk.noarch.rpm) = 4c1804d6a5c457be616bf12861436e0c
+MD5 (linux-locale/locales-br-2.1-1mdk.noarch.rpm) = f92ad7f493ad7e73584c489c2f1eadc6
+MD5 (linux-locale/locales-ca-2.1-1mdk.noarch.rpm) = 2dd164a5b8aa83e27967690ecc074459
+MD5 (linux-locale/locales-cs-2.1-1mdk.noarch.rpm) = a787b0320eb322e50adc1ec94a03cfc5
+MD5 (linux-locale/locales-cy-2.1-1mdk.noarch.rpm) = 6105f3917ad90ae0c4b36116b9fb1b9f
+MD5 (linux-locale/locales-da-2.1-1mdk.noarch.rpm) = 31a706d778e45a3aee1c5951daf2bfaa
+MD5 (linux-locale/locales-de-2.1-1mdk.noarch.rpm) = 746145bd6daa0a863aa9cbf9d3536c36
+MD5 (linux-locale/locales-el-2.1-1mdk.noarch.rpm) = d5e3b1b519811eb343c7c75e038ff940
+MD5 (linux-locale/locales-en-2.1-1mdk.noarch.rpm) = cc195aab31df9430f5ba4828592a0d1b
+MD5 (linux-locale/locales-eo-2.1-1mdk.noarch.rpm) = 79fe707e63bfb7a6ad0287abe10eca82
+MD5 (linux-locale/locales-es-2.1-1mdk.noarch.rpm) = ef6ba402fd164b5dd272c3ffcbafc452
+MD5 (linux-locale/locales-et-2.1-1mdk.noarch.rpm) = 7d586d0dbbcee848d5e79523cac6cb92
+MD5 (linux-locale/locales-eu-2.1-1mdk.noarch.rpm) = 3427e70b9b10002bad95023f1b98d426
+MD5 (linux-locale/locales-fi-2.1-1mdk.noarch.rpm) = 218879eeb9e0e511cc1161f588fbba93
+MD5 (linux-locale/locales-fo-2.1-1mdk.noarch.rpm) = 81da2101455e69fb3e65996d365c64cc
+MD5 (linux-locale/locales-fr-2.1-1mdk.noarch.rpm) = d46de3d90ef6d33ce7ab769995fb308b
+MD5 (linux-locale/locales-ga-2.1-1mdk.noarch.rpm) = 84e8e6ed53d269e46afa7be423b084fe
+MD5 (linux-locale/locales-gl-2.1-1mdk.noarch.rpm) = 14fb30bed5c7851e0034bcdf711d5697
+MD5 (linux-locale/locales-he-2.1-1mdk.noarch.rpm) = 7053d8fb6b6708d5b29bc92ef9ac2b3f
+MD5 (linux-locale/locales-hr-2.1-1mdk.noarch.rpm) = e8f30eb4a90fa1fa0c84818cf99a5074
+MD5 (linux-locale/locales-hu-2.1-1mdk.noarch.rpm) = 654fde899c33dc2e9c1953a5f8f03736
+MD5 (linux-locale/locales-hy-2.1-1mdk.noarch.rpm) = b11497532e3f4e65441f98ae05c20e2e
+MD5 (linux-locale/locales-id-2.1-1mdk.noarch.rpm) = e940fe3481dca4fbe502e3a7e65ff47b
+MD5 (linux-locale/locales-is-2.1-1mdk.noarch.rpm) = 46a73f66ddb6b7ba51b9f454590523c8
+MD5 (linux-locale/locales-it-2.1-1mdk.noarch.rpm) = b5f57fab4b5277258421f76e98f30f57
+MD5 (linux-locale/locales-ja-2.1-1mdk.noarch.rpm) = 4583d162848abcea4555fad7da044ff8
+MD5 (linux-locale/locales-ka-2.1-1mdk.noarch.rpm) = d49b6ac364ce51e01b46095ffa9b6012
+MD5 (linux-locale/locales-kl-2.1-1mdk.noarch.rpm) = 531064c6077b85f581dff9f6ab5cdb93
+MD5 (linux-locale/locales-ko-2.1-1mdk.noarch.rpm) = e587c896f65019647498d3f35b942af4
+MD5 (linux-locale/locales-lo-2.1-1mdk.noarch.rpm) = 4c78cbde81682039204059eaf3821405
+MD5 (linux-locale/locales-lt-2.1-1mdk.noarch.rpm) = 3f829be02f01502b0f5f40fd32158066
+MD5 (linux-locale/locales-lv-2.1-1mdk.noarch.rpm) = 0781a98b7bd0f564a43310a3b3554ad1
+MD5 (linux-locale/locales-nl-2.1-1mdk.noarch.rpm) = f7af7f035df9b83a90101b66216df2f0
+MD5 (linux-locale/locales-no-2.1-1mdk.noarch.rpm) = 058e61f367e9f4c750381c48e15eaf66
+MD5 (linux-locale/locales-oc-2.1-1mdk.noarch.rpm) = 1a50282a4a20ae9244448aa022bacbfd
+MD5 (linux-locale/locales-pl-2.1-1mdk.noarch.rpm) = 8477dac02189bbbf465a10a62a5cd487
+MD5 (linux-locale/locales-pt-2.1-1mdk.noarch.rpm) = 8630e402ee3150a2563d692b0e56584b
+MD5 (linux-locale/locales-ro-2.1-1mdk.noarch.rpm) = 0f37637d7fc131fa4d566907f2ce2009
+MD5 (linux-locale/locales-ru-2.1-1mdk.noarch.rpm) = 6ff83cdad9c9abc6f2d3a518be41399e
+MD5 (linux-locale/locales-sk-2.1-1mdk.noarch.rpm) = 7f3cf4edbb546174faf1cdaec922575e
+MD5 (linux-locale/locales-sl-2.1-1mdk.noarch.rpm) = 04bf0c38c4bb14ee63c363d048ebdd84
+MD5 (linux-locale/locales-sr-2.1-1mdk.noarch.rpm) = 31202fd0a671826c74a0477310db1332
+MD5 (linux-locale/locales-sv-2.1-1mdk.noarch.rpm) = 081c054ee245d94dd7b2f6906aaf2d91
+MD5 (linux-locale/locales-th-2.1-1mdk.noarch.rpm) = 066a21385a93658aa6aea9de1312701d
+MD5 (linux-locale/locales-tr-2.1-1mdk.noarch.rpm) = 100be0340fe43e77c0abe8ce0a43a0cb
+MD5 (linux-locale/locales-uk-2.1-1mdk.noarch.rpm) = c3f2bde360474f5f163281ece37bc264
+MD5 (linux-locale/locales-vi-2.1-1mdk.noarch.rpm) = 2a42baa3f08bdd699e93d9f182381f63
+MD5 (linux-locale/locales-wa-2.1-1mdk.noarch.rpm) = ec7950de1464cb20c50776bbb64a5268
+MD5 (linux-locale/locales-zh-2.1-1mdk.noarch.rpm) = 4b5da22f7ba966b34f304a7bbd0ab368
diff --git a/emulators/linux-locale/pkg/COMMENT b/emulators/linux-locale/pkg/COMMENT
index 6d091bbb264..1b5404b041d 100644
--- a/emulators/linux-locale/pkg/COMMENT
+++ b/emulators/linux-locale/pkg/COMMENT
@@ -1 +1 @@
-Linux wcsmbs preload libraries and locales
+Locales for Linux
diff --git a/emulators/linux-locale/pkg/DEINSTALL b/emulators/linux-locale/pkg/DEINSTALL
deleted file mode 100644
index d0ce5fc559c..00000000000
--- a/emulators/linux-locale/pkg/DEINSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2000/01/07 05:23:30 sakamoto Exp $
-grep -v 'libwcsmbs\.so' ${EMULPRELOAD} > /tmp/.ld.so.preload.save 2> /dev/null
-mv /tmp/.ld.so.preload.save ${EMULPRELOAD}
-if [ ! -s ${EMULPRELOAD} ]; then
-	rm -f ${EMULPRELOAD}
-fi
diff --git a/emulators/linux-locale/pkg/DESCR b/emulators/linux-locale/pkg/DESCR
index 6d091bbb264..87006c280c5 100644
--- a/emulators/linux-locale/pkg/DESCR
+++ b/emulators/linux-locale/pkg/DESCR
@@ -1 +1,4 @@
-Linux wcsmbs preload libraries and locales
+Locales for Linux
+
+These RPM files are supplementary locales for Linux.
+Many languages are not supproted by default by GNU libc.