4 files changed, 17 insertions, 50 deletions

diff --git a/misc/utf8locale/Makefile b/misc/utf8locale/Makefile
index 3fac1d08bb93..7adc529ce5e6 100644
--- a/misc/utf8locale/Makefile
+++ b/misc/utf8locale/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	utf8locale
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	misc
 MASTER_SITES= 	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~perky/distfiles/
@@ -14,10 +14,14 @@ MASTER_SITE_SUBDIR=	perky
 
 MAINTAINER=	perky@FreeBSD.org
 
-LANGS=		en_US ko_KR ja_JP ru_RU zh_CN zh_TW
+LANGS=		af_ZA bg_BG cs_CZ da_DK de_AT de_CH de_DE el_GR en_AU en_CA \
+		en_GB en_NZ en_US es_ES et_EE fi_FI fr_BE fr_CA fr_FR hr_HR \
+		hu_HU is_IS it_IT ja_JP ko_KR nl_BE nl_NL no_NO pl_PL pt_BR \
+		pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE tr_TR uk_UA zh_CN zh_TW
 BASELOCALEDIR=	${DESTDIR}/usr/share/locale
 PLIST_SUB=	BASELOCALEDIR=${BASELOCALEDIR} \
 		LANGS="${LANGS}"
+PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
 
@@ -27,6 +31,16 @@ _HAVE_SWIDTH!=	${GREP} _CTYPE_SW ${DESTDIR}/usr/include/ctype.h 2>/dev/null \
 PKGNAMESUFFIX=	-without-swidth
 .endif
 
+pre-install:
+	-@${RM} -f ${PLIST}
+.for lang in ${LANGS}
+.for cate in LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+	@${ECHO} "share/locale/${lang}.UTF-8/${cate}" >> ${PLIST}
+.endfor
+	@${ECHO} "@dirrm share/locale/${lang}.UTF-8" >> ${PLIST}
+.endfor
+	@${CAT} ${.CURDIR}/pkg-plist >> ${PLIST}
+
 post-install:
 .for lang in ${LANGS}
 	-${LN} -sf ${PREFIX}/share/locale/${lang}.UTF-8 \
diff --git a/misc/utf8locale/distinfo b/misc/utf8locale/distinfo
index 7cd935057731..8cf7e99782e8 100644
--- a/misc/utf8locale/distinfo
+++ b/misc/utf8locale/distinfo
@@ -1 +1 @@
-MD5 (utf8locale-1.1.tar.gz) = 7470325ca04d7479f9c4647ad4d3a54c
+MD5 (utf8locale-1.2.tar.gz) = fad5a1d31b97c9ea3b89c046ae435a97
diff --git a/misc/utf8locale/pkg-descr b/misc/utf8locale/pkg-descr
index e45d3835ec78..8014e036f8c8 100644
--- a/misc/utf8locale/pkg-descr
+++ b/misc/utf8locale/pkg-descr
@@ -1,9 +1 @@
 This package offers UTF-8 locales for several languages.
-
-Currently supported locales are:
- o en_US.UTF-8
- o ko_KR.UTF-8
- o ja_JP.UTF-8
- o ru_RU.UTF-8
- o zh_CN.UTF-8
- o zh_TW.UTF-8
diff --git a/misc/utf8locale/pkg-plist b/misc/utf8locale/pkg-plist
index 490afaf386e7..870e3cc70185 100644
--- a/misc/utf8locale/pkg-plist
+++ b/misc/utf8locale/pkg-plist
@@ -1,45 +1,6 @@
-share/locale/en_US.UTF-8/LC_COLLATE
-share/locale/en_US.UTF-8/LC_CTYPE
-share/locale/en_US.UTF-8/LC_MESSAGES
-share/locale/en_US.UTF-8/LC_MONETARY
-share/locale/en_US.UTF-8/LC_NUMERIC
-share/locale/en_US.UTF-8/LC_TIME
-share/locale/ja_JP.UTF-8/LC_COLLATE
-share/locale/ja_JP.UTF-8/LC_CTYPE
-share/locale/ja_JP.UTF-8/LC_MESSAGES
-share/locale/ja_JP.UTF-8/LC_MONETARY
-share/locale/ja_JP.UTF-8/LC_NUMERIC
-share/locale/ja_JP.UTF-8/LC_TIME
-share/locale/ko_KR.UTF-8/LC_COLLATE
-share/locale/ko_KR.UTF-8/LC_CTYPE
-share/locale/ko_KR.UTF-8/LC_MESSAGES
-share/locale/ko_KR.UTF-8/LC_MONETARY
-share/locale/ko_KR.UTF-8/LC_NUMERIC
-share/locale/ko_KR.UTF-8/LC_TIME
-share/locale/ru_RU.UTF-8/LC_COLLATE
-share/locale/ru_RU.UTF-8/LC_CTYPE
-share/locale/ru_RU.UTF-8/LC_MONETARY
-share/locale/ru_RU.UTF-8/LC_MESSAGES
-share/locale/ru_RU.UTF-8/LC_TIME
-share/locale/zh_CN.UTF-8/LC_COLLATE
-share/locale/zh_CN.UTF-8/LC_CTYPE
-share/locale/zh_CN.UTF-8/LC_MONETARY
-share/locale/zh_CN.UTF-8/LC_MESSAGES
-share/locale/zh_CN.UTF-8/LC_TIME
-share/locale/zh_TW.UTF-8/LC_COLLATE
-share/locale/zh_TW.UTF-8/LC_CTYPE
-share/locale/zh_TW.UTF-8/LC_MONETARY
-share/locale/zh_TW.UTF-8/LC_MESSAGES
-share/locale/zh_TW.UTF-8/LC_TIME
 share/locale/la_LN.UTF-8/LC_COLLATE
 share/locale/la_LN.UTF-8/LC_CTYPE
 @dirrm share/locale/la_LN.UTF-8
-@dirrm share/locale/zh_TW.UTF-8
-@dirrm share/locale/zh_CN.UTF-8
-@dirrm share/locale/ru_RU.UTF-8
-@dirrm share/locale/ko_KR.UTF-8
-@dirrm share/locale/ja_JP.UTF-8
-@dirrm share/locale/en_US.UTF-8
 @unexec rmdir %D/share/locale 2>/dev/null || true
 @exec for lang in %%LANGS%%; do ln -sf %D/share/locale/$lang.UTF-8 %%BASELOCALEDIR%%/; done
 @unexec for lang in %%LANGS%%; do rm -f %%BASELOCALEDIR%%/$lang.UTF-8; done