Upgrade to 2.2.

5 files changed, 31 insertions, 8 deletions

diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 71c90dabfb3a..cbcce4f3ed7e 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	kde-i18n
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
 MAINTAINER?=	demon@FreeBSD.org
 
@@ -25,6 +25,6 @@ PLIST=		${WRKDIR}/PLIST
 SCRIPTS_ENV+=	PLIST=${PLIST}
 
 pre-configure:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/Configure
+#	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/Configure
 
 .include <bsd.port.mk>
diff --git a/misc/kde4-l10n/distinfo b/misc/kde4-l10n/distinfo
index c1f53a9b3791..61fed09b8597 100644
--- a/misc/kde4-l10n/distinfo
+++ b/misc/kde4-l10n/distinfo
@@ -1 +1 @@
-MD5 (kde-i18n-2.1.1.tar.bz2) = f87d7a822c5205a0d3f1f5cad8c73d3b
+MD5 (kde-i18n-2.2.tar.bz2) = fb469278dfa0bff9711de994489b10dd
diff --git a/misc/kde4-l10n/files/patch-aa b/misc/kde4-l10n/files/patch-aa
new file mode 100644
index 000000000000..e1d2ca583b80
--- /dev/null
+++ b/misc/kde4-l10n/files/patch-aa
@@ -0,0 +1,10 @@
+--- da/docs/kdelibs/api/Makefile.in.orig	Thu Aug 16 18:21:25 2001
++++ da/docs/kdelibs/api/Makefile.in	Thu Aug 16 18:21:34 2001
+@@ -459,7 +459,6 @@
+ $(srcdir)/index.docbook: install-dep.entities
+ 
+ install-dep.entities:
+-	$(LN_S) $(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/files/patch-ab b/misc/kde4-l10n/files/patch-ab
new file mode 100644
index 000000000000..610599b69a7c
--- /dev/null
+++ b/misc/kde4-l10n/files/patch-ab
@@ -0,0 +1,10 @@
+--- pt/docs/kdelibs/api/Makefile.in.orig	Thu Aug 16 18:21:25 2001
++++ pt/docs/kdelibs/api/Makefile.in	Thu Aug 16 18:21:34 2001
+@@ -459,7 +459,6 @@
+ $(srcdir)/index.docbook: install-dep.entities
+ 
+ install-dep.entities:
+-	$(LN_S) $(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/scripts/Configure b/misc/kde4-l10n/scripts/Configure
index 7186d3a70434..18451134a7e5 100644
--- a/misc/kde4-l10n/scripts/Configure
+++ b/misc/kde4-l10n/scripts/Configure
@@ -7,14 +7,14 @@ if [ "${LINGUAS}" ]; then
 	set `echo $LINGUAS`
 else
 if [ "${BATCH}" ]; then
-	set \"ca\" \"cs\" \"da\" \"el\" \"eo\" \"es\" \"et\" \"fi\" \"he\" \"hu\" \"is\" \"it\" \"nl\" \"no\" \"no_NY\" \"pl\" \"pt\" \"pt_BR\" \"ro\" \"sk\" \"sl\" \"sr\" \"sv\" \"tr\"
+	set \"az\" \"bg\" \"ca\" \"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\"
 else
 	/usr/bin/dialog --title "Select languages" --clear \
 		--checklist "\n\
 Please select desired languages:" -1 -1 16 \
-pt_BR		"Brazil portuguese" OFF \
+az		"Azerbaijani Turkish" OFF \
+bg		"Bulgarisch" OFF \
 ca		"Canada" OFF \
-zh_TW.Big5	"Chinese" ON \
 cs		"Czech" OFF \
 da		"Danish" OFF \
 nl		"Dutch" OFF \
@@ -30,7 +30,9 @@ is		"Icelandic" OFF \
 it		"Italian" OFF \
 ja		"Japanese" ON \
 ko		"Korean" ON \
-no		"Norwegian (Bokmaal)" OFF \
+lt		"Lithuanian" ON \
+lv		"Latvian" ON \
+mt		"Maltese" ON \
 no_NY		"Norwegian (Nynorsk)" OFF \
 pl		"Polish" OFF \
 pt		"Portuguese" OFF \
@@ -43,6 +45,7 @@ sl		"Slovenian" OFF \
 es		"Spanish" OFF \
 sv		"Swedish" OFF \
 tr		"Turkish" OFF \
+en_GB		"UK English" OFF \
 uk		"Ukrainian" OFF \
 2> /tmp/chklist.tmp.$$