Upgrade to 2.2.1.

Submitted by:		SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
(with slight modifications)

6 files changed, 23 insertions, 26 deletions

diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index 825333111235..e94cb79ca4aa 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde-i18n
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/misc/kde4-l10n-et/distinfo b/misc/kde4-l10n-et/distinfo
index 95601d1fbebd..9b1c1e80f6f3 100644
--- a/misc/kde4-l10n-et/distinfo
+++ b/misc/kde4-l10n-et/distinfo
@@ -1 +1 @@
-MD5 (KDE/kde-i18n-2.2.tar.bz2) = fb469278dfa0bff9711de994489b10dd
+MD5 (KDE/kde-i18n-2.2.1.tar.bz2) = b5556e11063dd0725a031dd01027864e
diff --git a/misc/kde4-l10n-et/files/patch-aa b/misc/kde4-l10n-et/files/patch-aa
deleted file mode 100644
index b644e83da809..000000000000
--- a/misc/kde4-l10n-et/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- da/docs/kdelibs/api/Makefile.in.orig	Sun Aug 19 20:25:45 2001
-+++ da/docs/kdelibs/api/Makefile.in	Sun Aug 19 20:25:57 2001
-@@ -459,7 +459,7 @@
- $(srcdir)/index.docbook: install-dep.entities
- 
- install-dep.entities:
--	$(LN_S) $(kde_htmldir)/en/api/install-dep.entities .
-+	$(LN_S) -f $(kde_htmldir)/en/api/install-dep.entities .
- 
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) install-dep.entities
- 	@-if test -n "$(MEINPROC)"; then \
diff --git a/misc/kde4-l10n-et/files/patch-ab b/misc/kde4-l10n-et/files/patch-ab
deleted file mode 100644
index bfb3f067d68f..000000000000
--- a/misc/kde4-l10n-et/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- pt/docs/kdelibs/api/Makefile.in.orig	Sun Aug 19 20:44:13 2001
-+++ pt/docs/kdelibs/api/Makefile.in	Sun Aug 19 20:44:22 2001
-@@ -459,7 +459,7 @@
- $(srcdir)/index.docbook: install-dep.entities
- 
- install-dep.entities:
--	$(LN_S) $(kde_htmldir)/en/api/install-dep.entities .
-+	$(LN_S) -f $(kde_htmldir)/en/api/install-dep.entities .
- 
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) install-dep.entities
- 	@-if test -n "$(MEINPROC)"; then \
diff --git a/misc/kde4-l10n-et/files/pkg-plist.sub b/misc/kde4-l10n-et/files/pkg-plist.sub
new file mode 100644
index 000000000000..ef7e2981b1bc
--- /dev/null
+++ b/misc/kde4-l10n-et/files/pkg-plist.sub
@@ -0,0 +1,3 @@
+@dirrm share/apps/ktuberling/sounds
+@dirrm share/apps/ktuberling
+@dirrm share/apps/amor
diff --git a/misc/kde4-l10n-et/scripts/Configure b/misc/kde4-l10n-et/scripts/Configure
index c8c2ea595ce7..55988c58cf5b 100644
--- a/misc/kde4-l10n-et/scripts/Configure
+++ b/misc/kde4-l10n-et/scripts/Configure
@@ -7,11 +7,12 @@ if [ "${LINGUAS}" ]; then
 	set `echo $LINGUAS`
 else
 if [ "${BATCH}" ]; then
-	set \"az\" \"bg\" \"cs\" \"da\" \"el\" \"en_GB\" \"eo\" \"es\" \"et\" \"fi\" \"he\" \"hu\" \"is\" \"it\" \"lt\" \"lv\" \"mt\" \"nl\" \"no_NY\" \"pl\" \"pt\" \"ro\" \"sk\" \"sl\" \"sr\" \"sv\" \"ta\" \"tr\"
+	set \"af\" \"az\" \"bg\" \"cs\" \"da\" \"el\" \"en_GB\" \"eo\" \"es\" \"et\" \"fi\" \"he\" \"hu\" \"is\" \"it\" \"lt\" \"lv\" \"mt\" \"nl\" \"no\" \"no_NY\" \"pl\" \"pt\" \"pt_BR\" \"ro\" \"sk\" \"sl\" \"sr\" \"sv\" \"ta\" \"th\" \"tr\" \"xh\" \"zh_TW.Big5\"
 else
 	/usr/bin/dialog --title "Select languages" --clear \
 		--checklist "\n\
 Please select desired languages:" -1 -1 16 \
+af		"Afrikaans" OFF \
 az		"Azerbaijani Turkish" OFF \
 bg		"Bulgarisch" OFF \
 cs		"Czech" OFF \
@@ -28,12 +29,15 @@ hu		"Hungarian" OFF \
 is		"Icelandic" OFF \
 it		"Italian" OFF \
 ja		"Japanese" ON \
+ko		"Korean" ON \
 lt		"Lithuanian" ON \
 lv		"Latvian" ON \
 mt		"Maltese" ON \
+no		"Norwegian" OFF \
 no_NY		"Norwegian (Nynorsk)" OFF \
 pl		"Polish" OFF \
 pt		"Portuguese" OFF \
+pt_BR		"Portuguese (Brazil)" OFF \
 ro		"Romanian" OFF \
 ru		"Russian" ON \
 sr		"Serbian" OFF \
@@ -42,9 +46,13 @@ sk		"Slovak" OFF \
 sl		"Slovenian" OFF \
 es		"Spanish" OFF \
 sv		"Swedish" OFF \
+ta		"Tamil" OFF \
+th		"Thai" OFF \
+zh_TW.Big5	"Traditional Chinese" ON \
 tr		"Turkish" OFF \
 en_GB		"UK English" OFF \
-uk		"Ukrainian" OFF \
+uk		"Ukrainian" ON \
+xh		"Xhosa" OFF \
 2> /tmp/chklist.tmp.$$
 
 	retval=$?
@@ -76,7 +84,15 @@ while [ "$1" ]; do
 	/usr/bin/grep "^[^@].*/$a/.*" ${CURDIR}/pkg-plist >> ${PLIST}
 	/usr/bin/grep "^[^@].*-$a\$" ${CURDIR}/pkg-plist >> ${PLIST}
 	/usr/bin/grep "^@.*/$a/.*" ${CURDIR}/pkg-plist >> ${PLIST}.dirs
+	/usr/bin/grep "^@.*/$a$" ${CURDIR}/pkg-plist >> ${PLIST}.dirs
+	if [ x$a = xzh_TW.Big5 ]; then
+	    /usr/bin/grep "^[^@].*/zh_TW/.*" ${CURDIR}/pkg-plist >> ${PLIST}
+	    /usr/bin/grep "^[^@].*-zh_TW\$" ${CURDIR}/pkg-plist >> ${PLIST}
+	    /usr/bin/grep "^@.*/zh_TW/.*" ${CURDIR}/pkg-plist >> ${PLIST}.dirs
+	    /usr/bin/grep "^@.*/zh_TW$" ${CURDIR}/pkg-plist >> ${PLIST}.dirs
+	fi
 	shift
 done
 
 /bin/cat ${PLIST}.dirs >> ${PLIST}
+/bin/cat ${FILESDIR}/pkg-plist.sub >> ${PLIST}