Rejoice, for the long awaited upgrade to kde 3.1.1 is here!

4 files changed, 14 insertions, 26 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index efd567a05667..d81a93b5982c 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Multimedia utilities for the KDE integrated X11 desktop
 
-RUN_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
+RUN_DEPENDS+=	xanim:${PORTSDIR}/graphics/xanim
 LIB_DEPENDS+=	ogg.4:${PORTSDIR}/audio/libogg \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
@@ -33,9 +33,8 @@ GNU_CONFIGURE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}
 
 CONFIGURE_ARGS+=	--without-lame \
-			--with-vorbis=${LOCALBASE} \
+			--with-vorbis="${LOCALBASE}" \
 			--disable-cdparanoia \
-			--with-xine-prefix=${NONEXISTENT} \
 			--enable-audio=oss,esd
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
@@ -50,25 +49,23 @@ post-patch::
 .endif # ${MACHINE_ARCH} == "alpha"
 .else
 DO_NOT_COMPILE+=	kmidi
-.endif # defined(WITHOUT_MIDI)
+.endif #  defined(WITH_MIDI) || defined(WITH_KMIDI)
 
-DO_NOT_COMPILE+=	xine-artsplugin
-
-.if exists(${X11BASE}/bin/xine-config)
-WITH_XINE=	yes
-.endif # exists(${LOCALBASE}/bin/xine-config)
+#.if exists(${X11BASE}/bin/xine-config)
+#WITH_XINE=	yes
+#.endif # exists(${LOCALBASE}/bin/xine-config)
 
-.if defined(WITH_XINE)
-post-patch::
-	${ECHO_MSG} Cannot use libxine at this time. The library was
-	${ECHO_MSG} broken at the time this package was prepared.
-.endif # defined(WITH_XINE)
+WITHOUT_XINE=yes
 
-#.if defined(WITH_XINE)
+.if defined(WITHOUT_XINE)
+DO_NOT_COMPILE+=	xine-artsplugin
+#CONFIGURE_ARGS+=	--disable-xinetest
+#.elif defined(WITH_XINE)
 #PLIST_APPEND+=	plist.xine
 #LIB_DEPENDS+=	xine.4:${PORTSDIR}/multimedia/libxine
 #BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
-#.endif # defined(WITH_XINE)
+#CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
+.endif # defined(WITHOUT_XINE)
 
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 883d73e729ab..3cdc3cfb2f32 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdemultimedia-3.1.tar.bz2) = c418c435b14ab5bcb51247c2d182b80d
+MD5 (KDE/kdemultimedia-3.1.1.tar.bz2) = bdd53d23d13adf2419554e995417178e
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index 79a319573f8b..d3dc3d66c794 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -35,7 +35,6 @@
 @dirrm share/doc/HTML/en/aktion
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
-@dirrm share/doc
 @dirrm share/config
 @dirrm share/apps/noatun/skins/winamp/Winamp
 @dirrm share/apps/noatun/skins/winamp
diff --git a/multimedia/kdemultimedia3/files/plist.midi b/multimedia/kdemultimedia3/files/plist.midi
index 21a4e6335331..294f8c6ca59f 100644
--- a/multimedia/kdemultimedia3/files/plist.midi
+++ b/multimedia/kdemultimedia3/files/plist.midi
@@ -5,14 +5,6 @@ share/applnk/Multimedia/More/kmidi.desktop
 share/applnk/Multimedia/More/timidity.desktop
 share/applnk/Multimedia/kmidi.desktop
 share/applnk/Multimedia/timidity.desktop
-share/apps/kmidi/Axel_Elf.mid
-share/apps/kmidi/Cavatina.mid
-share/apps/kmidi/Georgia.mid
-share/apps/kmidi/Malaguena.mid
-share/apps/kmidi/Mission_Impossible.mid
-share/apps/kmidi/Mr_Postman.mid
-share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid
-share/apps/kmidi/Vangelis-Chung_Kuo.mid
 share/apps/kmidi/config/BITMAPS/arrow.xbm
 share/apps/kmidi/config/BITMAPS/back.xbm
 share/apps/kmidi/config/BITMAPS/check.xbm