Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

24 files changed, 131 insertions, 116 deletions

diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index b0a2e5a1cae2..48ad9166ba82 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bmpx
 PORTVERSION=	0.32.0
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://files.beep-media-player.org/releases/0.30/
 
@@ -14,13 +15,13 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Media player geared towards usability, technical efficiency and looks
 
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
-		cairomm-1.0.0:${PORTSDIR}/graphics/cairomm \
+		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		neon.25:${PORTSDIR}/www/neon \
 		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		boost_date_time.3:${PORTSDIR}/devel/boost \
-		dbus-1.2:${PORTSDIR}/devel/dbus
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 CONFLICTS=	bmpx-devel-[0-9]*
 
@@ -33,7 +34,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2 desktopfileutils
 INSTALLS_ICONS=	yes
 USE_GSTREAMER=	good mad ogg vorbis
-USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index af232bf1d65c..baad9db113a4 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -24,11 +24,12 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 ONLY_FOR_ARCHS=	i386 alpha
 
 USE_XLIB=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15
+USE_AUTOTOOLS=	autoconf:259 libtool:15 libltdl:15
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-		-I${X11BASE}/include/gtk12 -I${X11BASE}/include/gdk-pixbuf-1.0 \
+		-I${LOCALBASE}/include/gtk12 \
+		-I${LOCALBASE}/include/gdk-pixbuf-1.0 \
 		-I${LOCALBASE}/include/glib12" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/multimedia/gaim-xmms-remote/Makefile b/multimedia/gaim-xmms-remote/Makefile
index c4366c616c48..2bec588bcf86 100644
--- a/multimedia/gaim-xmms-remote/Makefile
+++ b/multimedia/gaim-xmms-remote/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim-xmms-remote
 PORTVERSION=	1.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	guifications
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	guifications
 MAINTAINER=	danielshafer@gmail.com
 COMMENT=	Plugin to display current XMMS song in Gaim
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 871a7988ad0c..4192a690b1f0 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xine
@@ -17,7 +18,6 @@ COMMENT=	An alternative GUI for the Xine media player
 LIB_DEPENDS=	xine.15:${PORTSDIR}/multimedia/libxine
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtk20 gnomehier
 USE_GMAKE=	yes
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 59e3d66de768..9cf8ef3166ba 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -3,10 +3,12 @@
 # Whom:					arved
 #
 # $FreeBSD$
+#    $MCom: ports/multimedia/kaffeine-mozilla/Makefile,v 1.3 2006/10/08 16:54:34 mezz Exp $
+#
 
 PORTNAME=	kaffeine-mozilla
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kaffeine
@@ -16,11 +18,10 @@ COMMENT=	Kaffeine Mozilla plugin
 
 RUN_DEPENDS=	kaffeine:${PORTSDIR}/multimedia/kaffeine
 
+USE_XLIB=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e "s,prefix)/plugins,prefix)/lib/browser_plugins," ${WRKSRC}/src/Makefile.in
diff --git a/multimedia/kaffeine-mozilla/pkg-plist b/multimedia/kaffeine-mozilla/pkg-plist
index 81adf1f26a03..6e4c057ecce4 100644
--- a/multimedia/kaffeine-mozilla/pkg-plist
+++ b/multimedia/kaffeine-mozilla/pkg-plist
@@ -1,3 +1,4 @@
 lib/browser_plugins/kaffeineplugin.so
 lib/browser_plugins/kaffeineplugin.la
 lib/browser_plugins/kaffeineplugin.a
+@dirrmtry lib/browser_plugins
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 9fa62bd55157..34cb710d9f18 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linux-realplayer
 DISTVERSION=	10.0.7.785-20060201
+PORTREVISION=	1
 CATEGORIES=	multimedia audio linux
 MASTER_SITES=	https://helixcommunity.org/download.php/1917/:player \
 		ftp://rpmfind.net/linux/sourceforge/m/mp/mplayer-tru/:codecs
@@ -38,14 +39,14 @@ PLIST_SUB+=	NLS=""
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/share/icons)
+.if exists(${LOCALBASE}/share/icons)
 WITH_ICONS=	yes
 PLIST_SUB+=	ICONS=""
 .else
 PLIST_SUB+=	ICONS="@comment "
 .endif
 
-.if exists(${X11BASE}/share/gnome)
+.if exists(${LOCALBASE}/share/gnome)
 WITH_GNOME=	yes
 PLIST_SUB+=	GNOME=""
 .else
@@ -101,32 +102,33 @@ do-install:
 
 .if defined(WITH_ICONS)
 . for size in 16x16 32x32 48x48 192x192
-	@${MKDIR} ${X11BASE}/share/icons/hicolor/${size}/apps
+	@${MKDIR} ${LOCALBASE}/share/icons/hicolor/${size}/apps
 	${INSTALL_DATA} ${WRKSRC}/share/icons/realplay_${size}.png \
-		${X11BASE}/share/icons/hicolor/${size}/apps
+		${LOCALBASE}/share/icons/hicolor/${size}/apps
 . endfor
 . for size in 48x48 192x192
-	@${MKDIR} ${X11BASE}/share/icons/hicolor/${size}/mimetypes
+	@${MKDIR} ${LOCALBASE}/share/icons/hicolor/${size}/mimetypes
 	${INSTALL_DATA} ${WRKSRC}/share/icons/mime-*_${size}.png \
-		${X11BASE}/share/icons/hicolor/${size}/mimetypes
+		${LOCALBASE}/share/icons/hicolor/${size}/mimetypes
 . endfor
 .endif
 
 .if defined(WITH_GNOME)
-	@${MKDIR} ${X11BASE}/share/gnome/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/share/realplay.png ${X11BASE}/share/gnome/pixmaps
+	@${MKDIR} ${LOCALBASE}/share/gnome/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/share/realplay.png \
+		${LOCALBASE}/share/gnome/pixmaps
 
-	@${MKDIR} ${X11BASE}/share/gnome/applications
+	@${MKDIR} ${LOCALBASE}/share/gnome/applications
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.desktop \
-		${X11BASE}/share/gnome/applications
+		${LOCALBASE}/share/gnome/applications
 
-	@${MKDIR} ${X11BASE}/share/gnome/application-registry
+	@${MKDIR} ${LOCALBASE}/share/gnome/application-registry
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.applications \
-		${X11BASE}/share/gnome/application-registry
+		${LOCALBASE}/share/gnome/application-registry
 
-	@${MKDIR} ${X11BASE}/share/gnome/mime-info
+	@${MKDIR} ${LOCALBASE}/share/gnome/mime-info
 	${INSTALL_DATA} ${WRKSRC}/share/realplay.keys ${WRKSRC}/share/realplay.mime \
-		${X11BASE}/share/gnome/mime-info
+		${LOCALBASE}/share/gnome/mime-info
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index 373ac43a74f7..2324fa7c2ea4 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -179,7 +179,7 @@ lib/linux-mozilla/plugins/nphelix.xpt
 @dirrm lib/RealPlayer
 @dirrmtry lib/linux-mozilla/plugins
 @dirrmtry lib/linux-mozilla
-%%X11%%@cwd %%X11BASE%%
+%%X11%%@cwd %%LOCALBASE%%
 %%GNOME%%share/gnome/application-registry/realplay.applications
 %%GNOME%%share/gnome/applications/realplay.desktop
 %%GNOME%%share/gnome/mime-info/realplay.keys
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile
index 8c3a6a8caebc..ae588423dbaf 100644
--- a/multimedia/ogle-gui/Makefile
+++ b/multimedia/ogle-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 PKGNAMESUFFIX=	-gui
@@ -22,7 +22,7 @@ LIB_DEPENDS=	glade-2.0:${PORTSDIR}/devel/libglade2 \
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
 		gnomeprefix \
@@ -35,7 +35,7 @@ CONFIGURE_ARGS=	--with-dvd-includes=${LOCALBASE}/include \
 		--with-dvdcontrol=${LOCALBASE} \
 		--without-included-gettext \
 		--enable-gtk2 \
-		--with-gtk-prefix=${X11BASE} \
+		--with-gtk-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-xml-prefix=${LOCALBASE}
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 54127ed0efb0..21e36a02bdfa 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -28,18 +28,8 @@ share/locale/fr/LC_MESSAGES/ogle_gui.mo
 share/locale/nl/LC_MESSAGES/ogle_gui.mo
 share/locale/pt/LC_MESSAGES/ogle_gui.mo
 share/locale/sv/LC_MESSAGES/ogle_gui.mo
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/nl/LC_MESSAGES
-@dirrmtry share/locale/nl
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/da/LC_MESSAGES
-@dirrmtry share/locale/da
 @dirrmtry share/locale
 @dirrm share/gnome/ogle_gui
 @dirrm lib/ogle
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index a8c30b5c2db1..7e8eb3037323 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogmrip
 DISTVERSION=	0.10.0-rc4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,9 +32,9 @@ LIB_DEPENDS=	xvidcore:${PORTSDIR}/multimedia/xvid \
 
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gtk20 glib20 gconf2 libglade2 intlhack
+USE_GNOME=	gnomehack gnomeprefix gtk20 glib20 gconf2 libglade2 intlhack
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 GCONF_SCHEMAS=	ogmrip.schemas
 
@@ -65,10 +66,6 @@ pre-extract:
 	@${ECHO_MSG} ""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-	  ${WRKSRC}/data/Makefile.in
-
 pre-configure:
 	@if ${LOCALBASE}/mencoder -ovc help 2> /dev/null | ${GREP} -q "^ *xvid *- .*" ; then \
 	  ${ECHO_MSG} "" ; \
diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist
index dfad22f465ff..5f9adbbd4f4a 100644
--- a/multimedia/ogmrip/pkg-plist
+++ b/multimedia/ogmrip/pkg-plist
@@ -64,20 +64,19 @@ lib/libogmjob.so.0
 libdata/pkgconfig/ogmdvd.pc
 libdata/pkgconfig/ogmrip.pc
 libdata/pkgconfig/ogmjob.pc
-share/applications/ogmrip.desktop
-%%DATADIR%%/ogmrip-crop.glade
-%%DATADIR%%/ogmrip-main.glade
-%%DATADIR%%/ogmrip-options.glade
-%%DATADIR%%/ogmrip-pref.glade
-%%DATADIR%%/ogmrip-progress.glade
-%%DATADIR%%/ogmrip-spell.glade
-%%DATADIR%%/ogmrip-ui.xml
-%%DATADIR%%/ogmrip.xml
-%%DATADIR%%/ogmrip.xsd
-%%DATADIR%%/xml.xsd
-share/pixmaps/ogmrip.png
+share/gnome/applications/ogmrip.desktop
+share/gnome/ogmrip/ogmrip-crop.glade
+share/gnome/ogmrip/ogmrip-main.glade
+share/gnome/ogmrip/ogmrip-options.glade
+share/gnome/ogmrip/ogmrip-pref.glade
+share/gnome/ogmrip/ogmrip-progress.glade
+share/gnome/ogmrip/ogmrip-spell.glade
+share/gnome/ogmrip/ogmrip-ui.xml
+share/gnome/ogmrip/ogmrip.xml
+share/gnome/ogmrip/ogmrip.xsd
+share/gnome/ogmrip/xml.xsd
+share/gnome/pixmaps/ogmrip.png
+@dirrm share/gnome/ogmrip
 @dirrm include/ogmrip
 @dirrm include/ogmjob
 @dirrm include/ogmdvd
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 05a1b301afbf..64b287fc2de9 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,14 +3,14 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.9 2006/05/15 02:56:23 ahze Exp $
-#
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.21 2006/10/01 18:16:43 ahze Exp $
+#      $Id: Makefile 6 2006-09-27 14:05:34Z buhnux $
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.6.20060621
-PORTREVISION=	5
+DISTVERSION=	0.9.0.20060926
+PORTREVISION=	0
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -18,21 +18,21 @@ MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
 #		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.8.6.//}
+DISTNAME=	${PORTNAME}-snapshot-${DISTVERSION:S/0.9.0.//}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
 
+LIB_DEPENDS=	notify.2:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 
 CONFLICTS=	vlc-[0-9]*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.6-svn
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.9.0-svn
 
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 
 #USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -42,13 +42,13 @@ WANT_SDL=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 
-FAKEDIR=	${WRKDIR}/fake
+FAKEDIR=	${WRKDIR}/fake/${PREFIX}
 PLIST=		${WRKDIR}/plist
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
 CONFIGURE_ARGS+=	--enable-ffmpeg \
 			--with-ffmpeg=${LOCALBASE} \
@@ -169,6 +169,13 @@ CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
 
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
 .if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
 LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=	--enable-arts
@@ -187,8 +194,7 @@ CONFIGUE_ARGS+=		--disable-bonjour
 LIB_DEPENDS+=	vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
 		cdio.7:${PORTSDIR}/sysutils/libcdio
 CONFIGURE_ARGS+=--enable-vcd \
-		--disable-libcdio \
-		--disable-libcddb \
+		--enable-libcddb \
 		--disable-cddax
 .else
 CONFIGURE_ARGS+=--disable-vcd \
@@ -373,7 +379,7 @@ CONFIGURE_ARGS+=--enable-libmpeg2
 CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
-.if defined(WITH_REALAUDIO)
+.if !defined(WITHOUT_REALAUDIO)
 CONFIGURE_ARGS+=	--enable-real \
 			--enable-realrtsp
 .endif
@@ -392,10 +398,10 @@ CONFIGURE_ARGS+=--disable-theora
 
 .if (defined(WITH_LIVEMEDIA) || exists(${LOCALBASE}/live/liveMedia/libliveMedia.a)) && !defined(WITHOUT_LIVEMEDIA)
 BUILD_DEPENDS+=	${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-CONFIGURE_ARGS+=--enable-livedotcom \
-		--with-livedotcom-tree=${LOCALBASE}/live
+CONFIGURE_ARGS+=--enable-live555 \
+		--with-live555-tree=${LOCALBASE}/live
 .else
-CONFIGURE_ARGS+=--disable-livedotcom
+CONFIGURE_ARGS+=--disable-live555
 .endif
 
 .if !defined(WITHOUT_MAD)
@@ -407,6 +413,20 @@ CONFIGURE_ARGS+=--enable-mad \
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
+.if !defined(WITHOUT_MODDEMUX)
+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+=--enable-mod
+.else
+CONFIGURE_ARGS+=--disable-mod
+.endif
+
+.if !defined(WITHOUT_MPCDEMUX)
+LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec
+CONFIGURE_ARGS+=--enable-mpc
+.else
+CONFIGURE_ARGS+=--disable-mpc
+.endif
+
 .if !defined(WITHOUT_OGG)
 LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 CONFIGURE_ARGS+=--enable-ogg
@@ -444,7 +464,7 @@ CONFIGURE_ARGS+=--disable-sdl
 RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
 
-.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
+.if !defined(WITHOUT_HTTPD)
 LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 .else
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index 84d12775eac4..1e542a6cf6e1 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -5,8 +5,8 @@
 # and will be autodetected to enable
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.2 2006/05/15 02:46:26 ahze Exp $
-#
+#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.8 2006/10/01 18:16:43 ahze Exp $
+#      $Id: Makefile.inc 6 2006-09-27 14:05:34Z buhnux $
 # If you define for example WITH_FAAD and WITHOUT_FAAD
 # the WITHOUT_ will always over ride the WITH_.
 #
@@ -61,9 +61,15 @@
 #   ** NOT DEFINED if PACKAGE_BUILDING is defined **
 #
 # WITHOUT_A52=yes
-#  liba52 audio Support
+#  liba52 audio support
+#
+# WITHOUT_MODDEMUX
+#  ModPlug mod-like music support
 #
-# WITH_REALAUDIO
+# WITHOUT_MPCDEMUX
+#  Musepack audio compression support
+#
+# WITHOUT_REALAUDIO
 #  Real audio(R) support
 #
 # WITH_SHOUT
@@ -187,6 +193,9 @@
 # WITHOUT_GNOMEVFS
 #  GnomeVFS support
 #
+# WITHOUT_HAL=yes
+#  Disable HAL support
+#
 # WITH_OPENGL=yes
 #  Enable OpenGL visual plugin (not playback, play back is default with X11)
 #
@@ -277,7 +286,7 @@ pre-build:
 	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
 		${WRKSRC}/vlc-config
 
-pre-install:
+pre-install: build
 	${RM} -rf ${PLIST} ${FAKEDIR}
 	${MKDIR} ${FAKEDIR}
 	${TOUCH} -f ${PLIST}
@@ -294,6 +303,7 @@ pre-install:
 .endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+	${RM} -f ${FAKEDIR}/share/locale/locale.alias
 	cd ${FAKEDIR}/bin && ${FIND} -s * | \
 		${SED} -e 's|^|bin/|' >> ${PLIST}
 	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -310,6 +320,7 @@ pre-install:
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
 .endfor
+		${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 4913ff2e88a0..55306aab015a 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-snapshot-20060621.tar.gz) = ad07e1b97b1d275d51d3d6554e27e3d7
-SHA256 (vlc-snapshot-20060621.tar.gz) = 19f8bbebe6656e79dbb0d62c9648bab94bc4b48b887cc9d3ff6f3d6b40d60e29
-SIZE (vlc-snapshot-20060621.tar.gz) = 12535187
+MD5 (vlc-snapshot-20060926.tar.gz) = a4ecdcc79e6f5ce756858b767ec284af
+SHA256 (vlc-snapshot-20060926.tar.gz) = f633b5c50d0330a1ed8b477a0bda0f36f7f45e86b08760a9b897efbd32c40d5b
+SIZE (vlc-snapshot-20060926.tar.gz) = 13327513
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_x264.c b/multimedia/vlc-devel/files/patch-modules_codec_x264.c
deleted file mode 100644
index 2ff0294a2ab2..000000000000
--- a/multimedia/vlc-devel/files/patch-modules_codec_x264.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/codec/x264.c.orig	Wed Aug  9 21:24:08 2006
-+++ modules/codec/x264.c	Wed Aug  9 21:24:27 2006
-@@ -588,7 +588,7 @@
- 
-     /* cbr = 1 overrides qp or crf and sets an average bitrate
-        but maxrate = average bitrate is needed for "real" CBR */
--    if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
-+    if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1;
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
-     if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index ab43d0fe3aff..c544495a7fb1 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.5 2006/05/06 06:06:47 ahze Exp $
+#    $MCom: ports/multimedia/vlc/Makefile,v 1.4 2006/10/01 16:05:06 ahze Exp $
 #
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
@@ -27,7 +27,6 @@ CONFLICTS=	vlc-devel-[0-9]*
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 63d77f5d7c97..36f81c870e66 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -5,7 +5,7 @@
 # and will be autodetected to enable
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.1 2006/05/06 06:06:47 ahze Exp $
+#    $MCom: ports/multimedia/vlc/Makefile.inc,v 1.3 2006/09/30 18:15:02 ahze Exp $
 #
 # If you define for example WITH_FAAD and WITHOUT_FAAD
 # the WITHOUT_ will always over ride the WITH_.
@@ -294,6 +294,7 @@ pre-install:
 .endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+	${RM} -f ${FAKEDIR}/share/locale/locale.alias
 	cd ${FAKEDIR}/bin && ${FIND} -s * | \
 		${SED} -e 's|^|bin/|' >> ${PLIST}
 	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -310,6 +311,7 @@ pre-install:
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
 .endfor
+		${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
 		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 445d014430a2..8a549088c9bb 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-media
 PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	multimedia xfce
 MASTER_SITES=	http://spuriousinterrupt.org/files/xfmedia/
 DISTNAME=	xfmedia-${PORTVERSION}
diff --git a/multimedia/xfce4-media/pkg-plist b/multimedia/xfce4-media/pkg-plist
index 15f1c103f890..6f6117f24e92 100644
--- a/multimedia/xfce4-media/pkg-plist
+++ b/multimedia/xfce4-media/pkg-plist
@@ -51,14 +51,16 @@ share/xfmedia/doc/xfce.css
 @dirrm share/xfmedia/doc
 @dirrm share/xfmedia
 @dirrm etc/xdg/xfmedia
+@dirrmtry etc/xdg
 @dirrm include/xfmedia
 @dirrm lib/xfmedia/plugins
 @dirrm lib/xfmedia
-@dirrmtry etc/xdg
 @dirrmtry share/applications
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index b78aa0610022..98e594372878 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xmms-controller-plugin
 PORTVERSION=	1.4.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://eoin.angrystickman.com/files/
 DIST_SUBDIR=	xfce4
@@ -22,7 +22,6 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index a0767abe617a..b4b29f178815 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xfce4-xmms-plugin
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/ \
 		http://download2.berlios.de/xfce-goodies/
@@ -26,7 +27,6 @@ RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
 
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index 591aa12c7c57..54c513600da8 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -19,3 +19,5 @@ share/xfce4/xmms-plugin/xmms-plugin-stop.png
 @dirrmtry lib/xfce4/panel-plugins
 @dirrmtry lib/xfce4
 @dirrm share/xfce4/xmms-plugin
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index d11a1fc9ee19..67fbf31fd448 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Mario S F Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/multimedia/xmps-win32-plugin/Makefile,v 1.1 2006/10/11 23:24:13 ahze Exp $
 
 PORTNAME=	xmps-win32-plugin
 PORTVERSION=	0.0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/
 
@@ -21,7 +21,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_LDCONFIG=	yes
 
 #CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs