4 files changed, 18 insertions, 57 deletions

diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index cc7d0a4384e1..8050452b969b 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	kdeaddons
-PORTVERSION=	2.2.2
+PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,38 +15,30 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER?=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
-		automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS+=	noatun.0:${PORTSDIR}/audio/kdemultimedia2 \
-		SDL-1.1.4:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS+=	noatun.0:${PORTSDIR}/audio/kdemultimedia3 \
+		SDL-1.1.3:${PORTSDIR}/devel/sdl12
 
 WITH_SDL=	yes
-USE_KDEBASE_VER=2
+USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 PLIST_SUB+=	RM=${RM}
 CONFIGURE_ENV+=	SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500029
-_NO_KDE_OBJPRELINK=yes
+CONFIGURE_ARGS=	--enable-objprelink
+.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"
+post-configure:
+	${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		"s@sdl-config@${SDL_CONFIG}@g"
 
-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
-	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
-		"s@sdl-config@${LOCALBASE}/bin/sdl11-config@g"
+.include <bsd.port.pre.mk>
 
 .include <bsd.port.post.mk>
diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo
index 40c40c31dea5..8e7400184dca 100644
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeaddons-2.2.2.tar.bz2) = 9392da0992f4aede5f6a86840e47fef6
+MD5 (KDE/kdeaddons-3.0.tar.bz2) = 18a7ce6b8b1b4577152ecbbf26a44d82
diff --git a/misc/kdeaddons3/files/patch-noatun-plugins::blurscope::Makefile.in b/misc/kdeaddons3/files/patch-noatun-plugins::blurscope::Makefile.in
deleted file mode 100644
index d7a2b36e86f4..000000000000
--- a/misc/kdeaddons3/files/patch-noatun-plugins::blurscope::Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- noatun-plugins/blurscope/Makefile.in.orig	Sat Sep  8 09:52:51 2001
-+++ noatun-plugins/blurscope/Makefile.in	Wed Oct 24 23:03:09 2001
-@@ -215,11 +215,11 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--INCLUDES = -I$(kde_includes)/noatun  `sdl-config --cflags` $(all_includes)
-+INCLUDES = -I$(kde_includes)/noatun  `$(SDL_CONFIG) --cflags` $(all_includes)
- 
- lib_LTLIBRARIES = libnoatunblurscope.la
- libnoatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp
--libnoatunblurscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `sdl-config --libs`
-+libnoatunblurscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `$(SDL_CONFIG) --libs`
- libnoatunblurscope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
- #>- libnoatunblurscope_la_METASOURCES = AUTO
- 
diff --git a/misc/kdeaddons3/files/patch-noatun-plugins::noatunmadness::Makefile.in b/misc/kdeaddons3/files/patch-noatun-plugins::noatunmadness::Makefile.in
deleted file mode 100644
index e32afb46449e..000000000000
--- a/misc/kdeaddons3/files/patch-noatun-plugins::noatunmadness::Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- noatun-plugins/noatunmadness/Makefile.in.orig	Sat Sep  8 09:52:51 2001
-+++ noatun-plugins/noatunmadness/Makefile.in	Wed Oct 24 23:06:44 2001
-@@ -215,11 +215,11 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--INCLUDES = -I$(kde_includes)/noatun  `sdl-config --cflags` $(all_includes)
-+INCLUDES = -I$(kde_includes)/noatun  `$(SDL_CONFIG) --cflags` $(all_includes)
- 
- lib_LTLIBRARIES = libnoatunmadness.la
- libnoatunmadness_la_SOURCES = madness.cpp
--libnoatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `sdl-config --libs`
-+libnoatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined `$(SDL_CONFIG) --libs`
- libnoatunmadness_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
- #>- libnoatunmadness_la_METASOURCES = AUTO
-