Update these ports to 3.0.5 per KDE security advisory. Fix missing deps

in kdebase (I didn't whack those intentionally, I don't think...).

5 files changed, 9 insertions, 51 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 56a4db31f61a..69fa51bcb9ce 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,21 +6,17 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_DIST_VERSION}
-PORTREVISION=	1
+PORTVERSION=	3.0.5
+PORTREVISION=	0
 CATEGORIES?=	x11 kde
-MASTER_SITES=	${MASTER_SITE_KDE_kde} \
-		${MASTER_SITE_LOCAL_keramik}
+MASTER_SITES=	${MASTER_SITE_KDE}
 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
 
-BUILD_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
-		automake:${PORTSDIR}/devel/automake
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf \
+		${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		qtmcop.1:${PORTSDIR}/audio/arts \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
@@ -45,9 +41,6 @@ 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"
 
@@ -73,17 +66,6 @@ pre-fetch: kde-version-check
 	@${ECHO}
 .endif
 
-.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
 
@@ -92,9 +74,5 @@ post-install:
 	${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 610ed43e6ec3..d6c3d97eb64f 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,2 +1 @@
-MD5 (KDE/kdelibs-3.0.4.tar.bz2) = 0b81f457a78c07978d2c973e0d7d7d49
-MD5 (KDE/kdelibs-keramik-20021008.1942.tar.bz2) = 84c90553ec2bf52e399cc394c297ca83
+MD5 (KDE/kdelibs-3.0.5.tar.bz2) = ff22bd58b91ac34e476c308d345421aa
diff --git a/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am b/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am
deleted file mode 100644
index 99b013949fa1..000000000000
--- a/x11/kdelibs3/files/keramik-patch-kstyles-Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
---- 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-message b/x11/kdelibs3/pkg-message
deleted file mode 100644
index bcfb87dc3a8a..000000000000
--- a/x11/kdelibs3/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-**********************************************************************
-**********************************************************************
-NOTE: The "Keramik" style is experimental. It was brought in from 
-KDE 3.1 CVS and so may have bugs. Use it if you want, but if it breaks
-you get to keep all the pieces.
-**********************************************************************
-**********************************************************************
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index ec200a6a7205..6383bac85692 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -563,8 +563,6 @@ 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
@@ -3191,9 +3189,9 @@ share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/icons/hicolor/22x22/actions/kde
 @exec /bin/mkdir -p %D/share/icons/hicolor/32x32/actions/kde
-@dirrm share/servicetypes
+@unexec /bin/rmdir %D/share/icons/hicolor/32x32/actions/kde || true
+@unexec /bin/rmdir %D/share/icons/hicolor/22x22/actions/kde || true
 @dirrm share/services/kded
-@dirrm share/services
 @dirrm share/mimelnk/video
 @dirrm share/mimelnk/text
 @dirrm share/mimelnk/multipart
@@ -3215,10 +3213,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/icons/hicolor/32x32/mimetypes
 @dirrm share/icons/hicolor/32x32/filesystems
 @dirrm share/icons/hicolor/32x32/devices
-@dirrm share/icons/hicolor/32x32/actions/kde
 @dirrm share/icons/hicolor/32x32/actions
 @dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/22x22/actions/kde
 @dirrm share/icons/hicolor/22x22/actions
 @dirrm share/icons/hicolor/22x22
 @dirrm share/icons/hicolor/16x16/mimetypes
@@ -3228,15 +3224,12 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
-@dirrm share/icons
 @dirrm share/doc/HTML/en/kspell
 @dirrm share/doc/HTML/en/common
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
 @dirrm share/config/ui
 @dirrm share/config/colors
-@dirrm share/config
-@dirrm share/autostart
 @dirrm share/apps/kstyle/themes
 @dirrm share/apps/kstyle/pixmaps/riscos
 @dirrm share/apps/kstyle/pixmaps
@@ -3364,7 +3357,6 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kate/syntax
 @dirrm share/apps/kate
 @dirrm share/apps/LICENSES
-@dirrm share/apps
 @dirrm lib/kde3/plugins/styles
 @dirrm lib/kde3/plugins/designer
 @dirrm lib/kde3/plugins
@@ -3379,3 +3371,4 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kabc
 @dirrm include/dom
 @dirrm include/arts
+@dirrm etc/rc.d