6 files changed, 50 insertions, 6 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 7d1b7c3a61c3..fa35dd9410e5 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	1.2.0
+PORTREVISION=	2
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -28,12 +29,13 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 INSTALLS_OMF=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
-CONFIGURE_ARGS+=--disable-mozilla
 
 OPTIONS?=	DVDNAV "Enable DVD support" on \
-		GSTREAMER "Use Gstreamer instead of Xine" off
+		GSTREAMER "Use Gstreamer instead of Xine" off \
+		MOZILLA_PLUGIN "Totem mozilla plugin" off
 
 MAN1=	totem.1 totem-video-thumbnailer.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
@@ -44,14 +46,27 @@ CONFLICTS=	totem-gstreamer-[0-9]*
 
 LIB_DEPENDS+=	musicbrainz:${PORTSDIR}/audio/libmusicbrainz
 
+.if defined(WITH_MOZILLA_PLUGIN)
+USE_GECKO=	firefox mozilla seamonkey
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+PLIST_SUB+=	MOZILLA=""
+LIB_DEPENDS+=	dbus-1.1:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=--with-mozilla=${GECKO}
+.else
+PLIST_SUB+=	MOZILLA="@comment "
+CONFIGURE_ARGS+=--disable-mozilla
+.endif
+
 .if defined(WITH_GSTREAMER)
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 CONFIGURE_ARGS+=--enable-gstreamer
 USE_GSTREAMER+=	gnomevfs core gconf
 WITHOUT_DVDNAV=	yes
-PLIST_SUB=	GSTREAMER=""
+PLIST_SUB+=	GSTREAMER=""
 .else
 LIB_DEPENDS+=	xine.14:${PORTSDIR}/multimedia/libxine
-PLIST_SUB=	GSTREAMER="@comment "
+PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
 .if defined(WITH_DVDNAV) && !defined(WITHOUT_DVDNAV)
@@ -88,6 +103,14 @@ pre-everything::
 	@${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'"
 
 post-patch:
+	@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
+.if defined(WITH_MOZILLA_PLUGIN)
+	@${ECHO} "" >> ${PKGMESSAGE}
+	@${CAT} ${FILESDIR}/pkg-message-mozilla.in >> ${PKGMESSAGE}
+.endif
+	@${REINPLACE_CMD} -e 's|/plugins||; \
+		s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|' \
+		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		${WRKSRC}/src/totem-preferences.c \
 		${WRKSRC}/src/backend/bacon-video-widget-gst.c
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 0ce4edd042b6..838cc4a3137d 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,3 @@
 MD5 (gnome2/totem-1.2.0.tar.bz2) = e07aded62a929779a4cd28c16fdb2efd
+SHA256 (gnome2/totem-1.2.0.tar.bz2) = e1ad87f39914d8bb5098c2c4b0ba7d034a5d9e078af110a3074a1756c7aa8423
 SIZE (gnome2/totem-1.2.0.tar.bz2) = 1720687
diff --git a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp b/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
new file mode 100644
index 000000000000..2c34077eadd5
--- /dev/null
+++ b/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
@@ -0,0 +1,10 @@
+--- src/totem-mozilla-plugin.cpp.orig	Tue Nov  8 21:50:10 2005
++++ src/totem-mozilla-plugin.cpp	Tue Nov  8 21:50:27 2005
+@@ -27,6 +27,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ #include <string.h>
+ 
diff --git a/multimedia/totem/files/pkg-message-mozilla.in b/multimedia/totem/files/pkg-message-mozilla.in
new file mode 100644
index 000000000000..ddbbe4e548a7
--- /dev/null
+++ b/multimedia/totem/files/pkg-message-mozilla.in
@@ -0,0 +1,8 @@
+**************************************************************************
+The totem mozilla plugin  requires a D-BUS-enabled desktop session.  Consult
+the FreeBSD GNOME FAQ for instructions on setting up your desktop session
+through D-BUS:
+
+             http://www.freebsd.org/gnome/docs/faq2.html#q25
+
+**************************************************************************
diff --git a/multimedia/totem/pkg-message b/multimedia/totem/files/pkg-message.in
index 05d7f5b20978..05d7f5b20978 100644
--- a/multimedia/totem/pkg-message
+++ b/multimedia/totem/files/pkg-message.in
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 2dc09f12e3b2..503452052bb2 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -3,6 +3,9 @@ bin/totem-video-thumbnailer
 include/totem/1/plparser/totem-disc.h
 include/totem/1/plparser/totem-pl-parser-builtins.h
 include/totem/1/plparser/totem-pl-parser.h
+%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.a
+%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.so
+%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.xpt
 lib/libtotem-plparser.a
 lib/libtotem-plparser.so
 lib/libtotem-plparser.so.1
@@ -10,6 +13,7 @@ lib/nautilus/extensions-1.0/libtotem-properties-page.a
 lib/nautilus/extensions-1.0/libtotem-properties-page.so
 lib/nautilus/extensions-1.0/libtotem-properties-page.so.0
 libdata/pkgconfig/totem-plparser.pc
+%%MOZILLA%%libexec/totem-mozilla-viewer
 share/gnome/applications/totem.desktop
 share/gnome/help/totem/C/figures/totem_next_button.png
 share/gnome/help/totem/C/figures/totem_pause_button.png
@@ -161,8 +165,6 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/help/totem/C/figures
 @dirrm share/gnome/help/totem/C
 @dirrm share/gnome/help/totem
-%%GSTREAMER%%@unexec rmdir lib/mozilla/plugins 2>/dev/null || /usr/bin/true
-%%GSTREAMER%%@unexec rmdir lib/mozilla 2>/dev/null || /usr/bin/true
 @dirrm include/totem/1/plparser
 @dirrm include/totem/1
 @dirrm include/totem