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...).

8 files changed, 10 insertions, 116 deletions

diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index b369c9f56a52..4372c9747e0c 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	kdebase
-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=	xgettext:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+=	xgettext:${PORTSDIR}/devel/gettext \
+		${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf\
+		${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
 
 USE_KDELIBS_VER=3
 USE_XPM=	yes
@@ -30,9 +28,6 @@ CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--without-ldap --disable-closure
 USE_GMAKE=	yes
-KERAMIK_DATE=	20021008.1942
-
-MASTER_SITE_LOCAL_keramik=${MASTER_SITE_LOCAL:S@%SUBDIR%/@alane/:keramik@g}
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 
@@ -66,17 +61,6 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
-.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)
-
 post-patch:
 	@${PERL} -pi -e "s@Exec=ee@Exec=ElectricEyes@g" \
 		${WRKSRC}/kappfinder/apps/Graphics/ElectricEyes.desktop
@@ -94,9 +78,5 @@ post-install:
 	${CHMOD} u+s ${PREFIX}/bin/kcheckpass
 	${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \
 		${CHMOD} g+s ${PREFIX}/bin/ksysguardd
-.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/kdebase4/distinfo b/x11/kdebase4/distinfo
index 1bc7764e027b..e22e00242db2 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,2 +1 @@
-MD5 (KDE/kdebase-3.0.4.tar.bz2) = d82ddae716912a3195139c8755e5c668
-MD5 (KDE/kdebase-keramik-20021008.1942.tar.bz2) = cee01ca9292219c56ebd1100f53f8502
+MD5 (KDE/kdebase-3.0.5.tar.bz2) = e50369b20f8955e757eeda0a521a14f5
diff --git a/x11/kdebase4/files/keramik-patch-kwin-Makefile.am b/x11/kdebase4/files/keramik-patch-kwin-Makefile.am
deleted file mode 100644
index 7a14cf7edc7c..000000000000
--- a/x11/kdebase4/files/keramik-patch-kwin-Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
---- kwin/Makefile.am.orig	Fri Mar  8 15:49:39 2002
-+++ kwin/Makefile.am	Sun Oct  6 16:33:31 2002
-@@ -8,14 +8,15 @@
- # workspace.cpp has to be first in order not to break --enable-final
- kwin_la_SOURCES = workspace.cpp atoms.cpp  client.cpp main.cpp \
- 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
--	killwindow.cpp kwinbutton.cpp
-+	killwindow.cpp kwinbutton.cpp placement.cpp popupinfo.cpp
- kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
- kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- include_HEADERS = KWinInterface.h
- 
- kwinincludedir = $(includedir)/kwin
--kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h
-+kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h \
-+	placement.h popupinfo.h
- 
- kwin_SOURCES = kwin_main.cpp
- kwin_LDADD = kwin.la 
diff --git a/x11/kdebase4/files/keramik-patch-kwin-client.h b/x11/kdebase4/files/keramik-patch-kwin-client.h
deleted file mode 100644
index bf09b2f0355a..000000000000
--- a/x11/kdebase4/files/keramik-patch-kwin-client.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- kwin/client.h.orig	Sun Oct  6 16:00:30 2002
-+++ kwin/client.h	Sun Oct  6 14:49:21 2002
-@@ -161,6 +161,7 @@
-     bool isTool() const; // KDE4 remove me
-     bool isToolbar() const;
-     bool isTopMenu() const;
-+    bool isMenu() const; // compat. for KDE 3.0.x <alane@freebsd.org>
-     bool isNormalWindow() const; // normal as in 'NET::Normal or NET::Unknown non-transient'
-     bool isDialog() const;
- 
-@@ -505,6 +506,16 @@
- {
-     return cmap;
- }
-+
-+/*
-+  compat. for 3.0.x <alane@freebsd.org>
-+*/
-+
-+inline bool Client::isMenu() const
-+{
-+  return isTopMenu();
-+}
-+
- 
- class NoBorderClient : public Client
- {
diff --git a/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am b/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am
deleted file mode 100644
index d63afd653f14..000000000000
--- a/x11/kdebase4/files/keramik-patch-kwin-clients-Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
---- kwin/clients/Makefile.am.orig	Sat Jan 26 11:06:53 2002
-+++ kwin/clients/Makefile.am	Mon Oct  7 03:51:41 2002
-@@ -1,2 +1,2 @@
- SUBDIRS = default kde1 riscos redmond quartz icewm web b2 \
--	modernsystem laptop system kwmtheme kstep
-+	modernsystem laptop system kwmtheme kstep keramik
diff --git a/x11/kdebase4/files/patch-ksysguard-ksysguardd-FBSD-netdev.c b/x11/kdebase4/files/patch-ksysguard-ksysguardd-FBSD-netdev.c
deleted file mode 100644
index 33eaede03c2d..000000000000
--- a/x11/kdebase4/files/patch-ksysguard-ksysguardd-FBSD-netdev.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig	Fri Oct 11 18:06:41 2002
-+++ ksysguard/ksysguardd/FreeBSD/netdev.c	Fri Oct 11 18:06:58 2002
-@@ -20,6 +20,7 @@
- */
- 
- #include <fcntl.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if.h>
- #include <net/if_mib.h>
-@@ -27,7 +28,6 @@
- #include <string.h>
- #include <sys/sysctl.h>
- #include <sys/time.h>
--#include <sys/types.h>
- #include <unistd.h>
- 
- 
diff --git a/x11/kdebase4/pkg-message b/x11/kdebase4/pkg-message
deleted file mode 100644
index bcfb87dc3a8a..000000000000
--- a/x11/kdebase4/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/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 806a0450c141..e7e05da9e53a 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -106,8 +106,6 @@ include/ksgrd/TimerSettings.h
 include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
-%%KERAMIK%%include/kwin/placement.h
-%%KERAMIK%%include/kwin/popupinfo.h
 include/kwin/workspace.h
 lib/appletproxy.la
 lib/appletproxy.so
@@ -303,10 +301,6 @@ lib/kde3/kwin_icewm_config.la
 lib/kde3/kwin_icewm_config.so
 lib/kde3/kwin_kde1.la
 lib/kde3/kwin_kde1.so
-%%KERAMIK%%lib/kde3/kwin_keramik.la
-%%KERAMIK%%lib/kde3/kwin_keramik.so
-%%KERAMIK%%lib/kde3/kwin_keramik_config.la
-%%KERAMIK%%lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_kstep.la
 lib/kde3/kwin_kstep.so
 lib/kde3/kwin_kwmtheme.la
@@ -1332,7 +1326,6 @@ share/apps/kwin/icewm-themes/titleIS.xpm
 share/apps/kwin/icewm-themes/titleIT.xpm
 share/apps/kwin/icewm.desktop
 share/apps/kwin/kde1.desktop
-%%KERAMIK%%share/apps/kwin/keramik.desktop
 share/apps/kwin/kstep.desktop
 share/apps/kwin/laptop.desktop
 share/apps/kwin/modernsystem.desktop
@@ -2553,8 +2546,10 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/apps/kscreensaver
 @exec /bin/mkdir -p %D/share/fonts/override
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
+@unexec /bin/rmdir %D/share/templates/.source/emptydir || true
+@unexec /bin/rmdir %D/share/fonts/override || true
+@unexec /bin/rmdir %D/share/apps/kscreensaver || true
 @dirrm share/wallpapers
-@dirrm share/templates/.source/emptydir
 @dirrm share/templates/.source
 @dirrm share/templates
 @dirrm share/sounds
@@ -2585,7 +2580,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/icons/hicolor/16x16/actions
 @dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
-@dirrm share/fonts/override
 @dirrm share/doc/HTML/en/kwrite
 @dirrm share/doc/HTML/en/ksysguard
 @dirrm share/doc/HTML/en/kpager
@@ -2627,7 +2621,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/ksplash
 @dirrm share/apps/ksmserver/pics
 @dirrm share/apps/ksmserver
-@dirrm share/apps/kscreensaver
 @dirrm share/apps/kpersonalizer/pics
 @dirrm share/apps/kpersonalizer
 @dirrm share/apps/konsole