1. Remove QT warning from kde3. It's been there long enough.

2. This is 3.0.4, folks.
3. Added extra patch files for backport of keramik.

4 files changed, 45 insertions, 12 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index eeff9216e65c..d68c757361d7 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,10 +7,15 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_DIST_VERSION}
+PORTREVISION=	0
 CATEGORIES?=	x11 kde
-MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITES=	${MASTER_SITE_KDE_kde} \
+		${MASTER_SITE_LOCAL_keramik}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2:kde \
+		${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2:keramik
 DIST_SUBDIR=	KDE
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.bz2
 
 MAINTAINER?=	kde@FreeBSD.org
 
@@ -23,13 +28,11 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		cups.2:${PORTSDIR}/print/cups-base \
 		xslt.1:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
-		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
-
-KDE_DIST_VERSION=3.0.3a
+RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \
+		${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
 USE_OPENSSL=	yes
 USE_QT_VER=	3
@@ -42,6 +45,9 @@ PREFIX?=	${KDE_PREFIX}
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install
 FONTSCALE=	${X11BASE}/lib/X11/fonts/PEX/Roman.phont
 FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
+KERAMIK_DATE=	20021008.1942
+
+MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g}
 
 .include "${.CURDIR}/../kde3/Makefile.kde"
 
@@ -67,11 +73,32 @@ pre-fetch: kde-version-check
 	@${ECHO}
 .endif
 
+.if !defined(WITHOUT_KERAMIK)
+WITH_KERAMIK=	yes
+.endif # !defined(WITHOUT_KERAMIK)
+
+.if defined(WITH_KERAMIK)
+PLIST_SUB+=	KERAMIK=""
+KERAMIK_TARBALL=${PORTNAME}-keramik-${KERAMIK_DATE}.tar.bz2
+pre-patch:
+	@cd ${WRKSRC};\
+	${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${KERAMIK_TARBALL} | ${TAR} xf -;\
+	${CAT} ${FILESDIR}/keramik-patch-* | ${PATCH} ${PATCH_ARGS}
+.else
+PLIST_SUB+=	KERAMIK="@comment "
+.endif # defined(WITH_KERAMIK)
+
 pre-configure:
-	cd ${WRKSRC} && ${GMAKE} -f Makefile.cvs
+	cd ${WRKSRC}; ${GMAKE} -f Makefile.cvs
 
 post-install:
-	${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh
-	${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh
+	${MKDIR} ${DESTDIR}${PREFIX}/etc/rc.d
+	${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > \
+		${DESTDIR}${PREFIX}/etc/rc.d/kdelibs.sh
+	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/etc/rc.d/kdelibs.sh
+.if defined(WITH_KERAMIK)
+	@if test -f ${PKGMESSAGE}; then \
+		${ECHO}; ${CAT} ${PKGMESSAGE}; ${ECHO}; fi
+.endif # defined(WITH_KERAMIK)
 
 .include <bsd.port.post.mk>
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 5c850676d8e0..610ed43e6ec3 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdelibs-3.0.3a.tar.bz2) = 02627f595af113f7d544561a7ff6ec85
+MD5 (KDE/kdelibs-3.0.4.tar.bz2) = 0b81f457a78c07978d2c973e0d7d7d49
+MD5 (KDE/kdelibs-keramik-20021008.1942.tar.bz2) = 84c90553ec2bf52e399cc394c297ca83
diff --git a/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am b/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am
new file mode 100644
index 000000000000..99b013949fa1
--- /dev/null
+++ b/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am
@@ -0,0 +1,5 @@
+--- kstyles/Makefile.am.orig	Sun Jan 20 21:45:25 2002
++++ kstyles/Makefile.am	Fri Oct  4 22:40:56 2002
+@@ -1 +1 @@
+-SUBDIRS = highcolor themes light kthemestyle pics riscos utils
++SUBDIRS = highcolor themes light kthemestyle pics riscos keramik utils 
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 69225d77652e..ec200a6a7205 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -563,6 +563,8 @@ lib/kde3/plugins/designer/kdewidgets.la
 lib/kde3/plugins/designer/kdewidgets.so
 lib/kde3/plugins/styles/highcolor.la
 lib/kde3/plugins/styles/highcolor.so
+%%KERAMIK%%lib/kde3/plugins/styles/keramik.la
+%%KERAMIK%%lib/kde3/plugins/styles/keramik.so
 lib/kde3/plugins/styles/kthemestyle.la
 lib/kde3/plugins/styles/kthemestyle.so
 lib/kde3/plugins/styles/light.la
@@ -3187,10 +3189,8 @@ share/servicetypes/ktexteditoreditor.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@comment empty directories
 @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@comment remove directories
 @dirrm share/servicetypes
 @dirrm share/services/kded
 @dirrm share/services
@@ -3368,7 +3368,6 @@ share/servicetypes/scriptinterface.desktop
 @dirrm lib/kde3/plugins/styles
 @dirrm lib/kde3/plugins/designer
 @dirrm lib/kde3/plugins
-@dirrm lib/kde3
 @dirrm include/libkmid
 @dirrm include/ktexteditor
 @dirrm include/kparts
@@ -3379,3 +3378,4 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kate
 @dirrm include/kabc
 @dirrm include/dom
+@dirrm include/arts