update to 3.1 official release

3 files changed, 13 insertions, 21 deletions

diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index d303f7d32cc7..d9553204578f 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -1,3 +1,4 @@
+# -*-mode: makefile-*-
 # New ports collection makefile for:	KDE3
 # Date created:				Sun May 14 2000 00:50:02
 # Whom:					Will Andrews <will@FreeBSD.org>
@@ -6,7 +7,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	3.0.5
+PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 23e5be2a1d05..cac0e5b9a398 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -17,6 +17,7 @@ _NO_KDE_FINAL=	yes
 _NO_KDE_NDEBUG=	yes
 DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-$//}
+DIST_SUBDIR=	KDE/kde-i18n
 
 # nasty hack to force newer timestamps on cache
 # required to enable correct building
@@ -24,11 +25,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-$//}
 post-extract:
 	@${FIND} ${WRKDIR} -type f -name index.cache.bz2 \
 		| ${XARGS} -n 10 -x ${TOUCH}
-.endif
-.endif
+.endif # !target(post-extract)
+.endif # defined(KDE_I18N)
 
-# KDE_DIST_VERSION (PORTVERSION)
-KDE_DIST_VERSION?=	${KDE_VERSION}
+.if defined(PREV_I18N_VER)
+PORTVERSION=	3.0.4
+.endif
 
 # Unfortunately, this feature doesn't work right now due to binary files.
 _NO_KDE_PATCHUP=yes
@@ -66,13 +68,13 @@ CONFIGURE_ARGS+=--enable-final
 .endif
 
 .if !defined(_NO_KDE_NDEBUG)
-.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
-CONFIGURE_ARGS+=--disable-debug
-.else
+#.if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
+#CONFIGURE_ARGS+=--disable-debug
+#.else
 CONFIGURE_ARGS+=--enable-debug
 STRIP=''
-.endif
-.endif
+#.endif # defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
+.endif # !defined(_NO_KDE_NDEBUG)
 
 .if !defined(_NO_KDE_NON_I386_OPTS)
 .if ${MACHINE_ARCH} == "alpha"
diff --git a/x11/kde4/pkg-message b/x11/kde4/pkg-message
deleted file mode 100644
index bb4c08b93045..000000000000
--- a/x11/kde4/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-======================================================================
-======================================================================
-If you are upgrading from kde 3.0.4, please type ^C (control-c) and
-then do the following before attempting to upgrade:
-
-	pkg_delete -f -x kdelibs kdebase kdenetwork
-
-Thanks.
--- The KDE-FreeBSD Team
-======================================================================
-======================================================================