Update to 2.23.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11045 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 20 insertions, 28 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 8274c392e..efff1f696 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/totem/Makefile,v 1.108 2008/05/20 22:08:01 marcus Exp $
+#   $MCom: ports/multimedia/totem/Makefile,v 1.109 2008/06/06 21:38:51 marcus Exp $
 #
 
 PORTNAME=	totem
-PORTVERSION=	2.23.3
-PORTREVISION?=	1
+PORTVERSION=	2.23.4
+PORTREVISION?=	0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -37,7 +37,8 @@ USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LIBS="-L${LOCALBASE}/lib -lXrandr"
+	       	LIBS="-L${LOCALBASE}/lib -lXrandr" \
+		BROWSER_PLUGIN_DIR="${PREFIX}/lib/browser_plugins"
 CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
 
 MAN1=		totem.1 totem-video-thumbnailer.1
@@ -139,10 +140,6 @@ pre-everything::
 
 post-patch:
 	@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e ' s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|; \
-		s|mozilla/plugins|browser_plugins|' \
-		${WRKSRC}/browser-plugin/Makefile.in \
-		${WRKSRC}/browser-plugin/idl/Makefile.in
 	@${REINPLACE_CMD} -e 's|dbus >= 0.61|dbus-1 >= 0.61|g' \
 	    	${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 993b77dc5..fda72d04e 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.23.3.tar.bz2) = 2d85049d7d7615a72e388060fc17ae17
-SHA256 (gnome2/totem-2.23.3.tar.bz2) = bdedae4bb79eccbced6127e8c52d526087144d97f3e6a4b492a72aa49a2dcce3
-SIZE (gnome2/totem-2.23.3.tar.bz2) = 2360842
+MD5 (gnome2/totem-2.23.4.tar.bz2) = e90839bbac5b7b663a1ddc74646ded99
+SHA256 (gnome2/totem-2.23.4.tar.bz2) = b0bc44f22ac05d490d607282f40986027a1cda2996adad56203dfed8faa815d9
+SIZE (gnome2/totem-2.23.4.tar.bz2) = 2368212
diff --git a/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in b/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in
deleted file mode 100644
index 238b32c32..000000000
--- a/multimedia/totem/files/patch-browser-plugin_idl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- browser-plugin/idl/Makefile.in.orig	2008-03-15 20:31:26.000000000 -0500
-+++ browser-plugin/idl/Makefile.in	2008-03-15 20:31:34.000000000 -0500
-@@ -532,7 +532,7 @@
- 
- info-am:
- 
--install-data-am: install-docDATA install-xptDATA
-+install-data-am: install-xptDATA
- 
- install-dvi: install-dvi-am
- 
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
new file mode 100644
index 000000000..f320e4f6b
--- /dev/null
+++ b/multimedia/totem/files/patch-configure
@@ -0,0 +1,12 @@
+--- configure.orig	2008-06-12 15:35:11.000000000 -0400
++++ configure	2008-06-12 15:35:40.000000000 -0400
+@@ -25083,7 +25083,9 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+ 
++if [ -z "${BROWSER_PLUGIN_DIR}" ]; then
+ 	BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
++    fi
+ 
+ 
+ 
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 7fca86526..56d9430c2 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -5,27 +5,21 @@ bin/totem-video-thumbnailer
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.a
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.la
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.so
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-basic-plugin.xpt
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.a
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.la
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.so
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-complex-plugin.xpt
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.a
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.la
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.so
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-cone-plugin.xpt
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.a
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.la
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.so
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-gmp-plugin.xpt
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.a
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.la
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.so
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-mully-plugin.xpt
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.a
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.la
 %%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.so
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt
 lib/libbaconvideowidget.a
 lib/libbaconvideowidget.la
 lib/libbaconvideowidget.so