4 files changed, 15 insertions, 65 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 5b5180b3222f..f94657ed1c16 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	kdesdk
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,36 +15,23 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
 
-USE_KDEBASE_VER=2
-USE_BZIP2=	yes
+USE_KDEBASE_VER=3
 GNU_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2=	yes
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
 .endif
-
-.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
-
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde2
-
-MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
+LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-pre-configure:
-	${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
-	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
-	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
-	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
-		${GMAKE} -f Makefile.cvs
+MAN1=		cvs2pack.1 cvsversion.1 noncvslist.1 kde-build.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 91704129044c..a22ffbf00ceb 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-2.2.2.tar.bz2) = f8080a3269a99f0c22a55ad9cab0682d
+MD5 (KDE/kdesdk-3.0.tar.bz2) = 1c0c1329d5222ca26639370b62d4eabc
diff --git a/devel/kdesdk3/files/patch-aa b/devel/kdesdk3/files/patch-aa
deleted file mode 100644
index 2d65987e5766..000000000000
--- a/devel/kdesdk3/files/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
---- kbabel/common/libgettext/xmalloc.c.orig	Tue Aug 21 11:08:13 2001
-+++ kbabel/common/libgettext/xmalloc.c	Tue Aug 21 11:09:28 2001
-@@ -26,6 +26,7 @@
- #endif
- 
- #include <sys/types.h>
-+#include <err.h>
- 
- #if STDC_HEADERS
- # include <stdlib.h>
-@@ -61,7 +62,6 @@
-    The caller may set it to some other value.  */
- int xmalloc_exit_failure = EXIT_FAILURE;
- 
--void error (int, int, const char *, ...);
- 
- static VOID *
- fixup_null_alloc (n)
-@@ -73,7 +73,7 @@
-   if (n == 0)
-     p = malloc ((size_t) 1);
-   if (p == 0)
--    error (xmalloc_exit_failure, 0, _("Memory exhausted"));
-+    err (xmalloc_exit_failure, "Memory exhausted");
-   return p;
- }
- 
diff --git a/devel/kdesdk3/files/patch-kstartperf-libkstartperf.c b/devel/kdesdk3/files/patch-kstartperf-libkstartperf.c
deleted file mode 100644
index 8ffcc6b5d2f9..000000000000
--- a/devel/kdesdk3/files/patch-kstartperf-libkstartperf.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
---- kstartperf/libkstartperf.c.orig	Tue Dec 11 15:13:51 2001
-+++ kstartperf/libkstartperf.c	Tue Dec 11 15:13:55 2001
-@@ -13,7 +13,6 @@
-  * (C) 2000 Bill Soudan <soudan@kde.org>
-  */
- 
--#include <malloc.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <stdio.h>