summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gxine/Makefile12
-rw-r--r--multimedia/gxine/pkg-plist1
-rw-r--r--multimedia/kaffeine-mozilla/Makefile14
-rw-r--r--multimedia/kaffeine-mozilla/pkg-plist8
-rw-r--r--multimedia/totem/Makefile23
-rw-r--r--multimedia/totem/pkg-plist50
-rw-r--r--multimedia/vlc-devel/Makefile6
-rw-r--r--multimedia/vlc-devel/Makefile.inc9
-rw-r--r--multimedia/vlc/Makefile8
-rw-r--r--multimedia/vlc/Makefile.inc9
10 files changed, 80 insertions, 60 deletions
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 7448f7f5ed7e..6b8ff705bd07 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gxine
PORTVERSION= 0.5.903
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= SF
MASTER_SITE_SUBDIR= xine
@@ -78,7 +79,10 @@ CONFIGURE_ARGS+=--without-browser-plugin
PLIST_SUB+= MOZILLA_PLUGIN="@comment "
.else
USE_GECKO= firefox mozilla seamonkey xulrunner
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+USE_WEBPLUGINS= native
+WEBPLUGINS_DIR= ${PREFIX}/lib/gxine
+WEBPLUGINS_FILES=gxineplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
LIB_DEPENDS+= nspr4.1:${PORTSDIR}/devel/nspr
CONFIGURE_ENV+= NSPR_CFLAGS="-I${LOCALBASE}/include/nspr" \
NSPR_LIBS="-L${LOCALBASE}/lib"
@@ -100,10 +104,4 @@ pre-configure:
@${REINPLACE_CMD} -e "s:@MAKE_PNG_TRUE@:#:g" \
${WRKSRC}/pixmaps/Makefile.in
-post-install:
-.if !defined(WITHOUT_MOZILLA_PLUGIN)
- @${MKDIR} ${PREFIX}/lib/browser_plugins
- @${LN} -sf ${PREFIX}/lib/gxine/gxineplugin.so ${PREFIX}/lib/browser_plugins
-.endif
-
.include <bsd.port.post.mk>
diff --git a/multimedia/gxine/pkg-plist b/multimedia/gxine/pkg-plist
index 35db4178b732..30539abed527 100644
--- a/multimedia/gxine/pkg-plist
+++ b/multimedia/gxine/pkg-plist
@@ -5,7 +5,6 @@ etc/gxine/keypad.xml
etc/gxine/startup
etc/gxine/toolbar-fullscreen.xml
etc/gxine/toolbar-window.xml
-%%MOZILLA_PLUGIN%%lib/browser_plugins/gxineplugin.so
%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.a
%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.la
%%MOZILLA_PLUGIN%%lib/gxine/gxineplugin.so
diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile
index 91cac517186b..18cfd25e38d3 100644
--- a/multimedia/kaffeine-mozilla/Makefile
+++ b/multimedia/kaffeine-mozilla/Makefile
@@ -3,12 +3,12 @@
# Whom: arved
#
# $FreeBSD$
-# $MCom: ports/multimedia/kaffeine-mozilla/Makefile,v 1.3 2006/10/08 16:54:34 mezz Exp $
+# $MCom: ports-stable/multimedia/kaffeine-mozilla/Makefile,v 1.1 2008/08/01 23:13:21 mezz Exp $
#
PORTNAME= kaffeine-mozilla
PORTVERSION= 0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= multimedia
MASTER_SITES= SF/kaffeine
@@ -19,12 +19,18 @@ RUN_DEPENDS= kaffeine:${PORTSDIR}/multimedia/kaffeine
USE_XORG= x11 xaw
USE_BZIP2= yes
+USE_WEBPLUGINS= native
+WEBPLUGINS_FILES=kaffeineplugin.so
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
USE_AUTOTOOLS= libtool:15
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+
post-patch:
- ${REINPLACE_CMD} -e "s,prefix)/plugins,prefix)/lib/browser_plugins," ${WRKSRC}/src/Makefile.in
+ ${REINPLACE_CMD} -e "s,[$$][(]prefix[)]/plugins,${WEBPLUGINS_DIR}," \
+ ${WRKSRC}/src/Makefile.in
${REINPLACE_CMD} -e "s,echo aout, echo elf," ${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/kaffeine-mozilla/pkg-plist b/multimedia/kaffeine-mozilla/pkg-plist
index 6e4c057ecce4..71e0f1875c6f 100644
--- a/multimedia/kaffeine-mozilla/pkg-plist
+++ b/multimedia/kaffeine-mozilla/pkg-plist
@@ -1,4 +1,4 @@
-lib/browser_plugins/kaffeineplugin.so
-lib/browser_plugins/kaffeineplugin.la
-lib/browser_plugins/kaffeineplugin.a
-@dirrmtry lib/browser_plugins
+%%WEBPLUGINS_DIR%%/kaffeineplugin.so
+%%WEBPLUGINS_DIR%%/kaffeineplugin.la
+%%WEBPLUGINS_DIR%%/kaffeineplugin.a
+@dirrmtry %%WEBPLUGINS_DIR%%
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index e0561d19112c..81836a23f05d 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.102 2008/03/16 06:11:13 mezz Exp $
+# $MCom: ports-stable/multimedia/totem/Makefile,v 1.9 2008/08/02 21:17:25 mezz Exp $
#
PORTNAME= totem
PORTVERSION= 2.22.2
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -100,6 +100,16 @@ CONFIGURE_ARGS+=--with-mozilla=${GECKO} \
--enable-complex-plugin \
--enable-narrowspace-plugin
PLIST_SUB+= GECKO_PLUGINS=""
+
+USE_WEBPLUGINS= gecko*
+WEBPLUGINS_FILES= libtotem-basic-plugin.so libtotem-basic-plugin.xpt \
+ libtotem-complex-plugin.so libtotem-complex-plugin.xpt \
+ libtotem-cone-plugin.so libtotem-cone-plugin.xpt \
+ libtotem-gmp-plugin.so libtotem-gmp-plugin.xpt \
+ libtotem-mully-plugin.so libtotem-mully-plugin.xpt \
+ libtotem-narrowspace-plugin.so \
+ libtotem-narrowspace-plugin.xpt
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
.else
CONFIGURE_ARGS+=--without-mozilla \
--disable-browser-plugins \
@@ -139,12 +149,9 @@ 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|dbus >= 0.61|dbus-1 >= 0.61|g ; \
+ s|_PLUGINDIR=".*"|_PLUGINDIR="${WEBPLUGINS_DIR}"|g' \
+ ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index adbd789b65c8..ef4479b60a0a 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -2,30 +2,30 @@ bin/totem
bin/totem-audio-preview
bin/totem-video-indexer
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
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.so
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-basic-plugin.xpt
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.so
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.xpt
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.so
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-cone-plugin.xpt
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.so
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.xpt
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.so
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-mully-plugin.xpt
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.so
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.xpt
lib/nautilus/extensions-2.0/libtotem-properties-page.a
lib/nautilus/extensions-2.0/libtotem-properties-page.la
lib/nautilus/extensions-2.0/libtotem-properties-page.so
@@ -403,7 +403,7 @@ share/vala/vapi/totem.vapi
%%GALAGO%%@dirrm lib/totem/plugins/galago
@dirrm lib/totem/plugins
@dirrm lib/totem
-%%GECKO_PLUGINS%%@dirrmtry lib/browser_plugins
+%%GECKO_PLUGINS%%@dirrmtry %%WEBPLUGINS_DIR%%
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/applications
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index eca50a39fedd..4f43d67f388e 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,13 +3,14 @@
# Whom: Brian Somers <brian@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.21 2006/10/01 18:16:43 ahze Exp $
+# $MCom: ports-stable/multimedia/vlc-devel/Makefile,v 1.11 2009/01/09 23:41:21 mezz Exp $
# $Id: Makefile 6 2006-09-27 14:05:34Z buhnux $
# *** PLEASE READ Makefile.inc for more information on knobs ***
#
PORTNAME= vlc
DISTVERSION= 0.9.8a
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -393,6 +394,9 @@ CONFIGURE_ARGS+=--disable-a52
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
USE_GECKO= firefox mozilla seamonkey nvu
+USE_WEBPLUGINS= gecko*
+WEBPLUGINS_FILES=libvlcplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
CONFIGURE_ENV+= MOZILLA_CONFIG="${GECKO_CONFIG}" \
XPIDL="${XPIDL}" \
XPIDL_INCL="${XPIDL_INCL}"
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index adb01ae41a4e..9d55b991499a 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -4,7 +4,7 @@
# and will be autodetected to enable
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.8 2006/10/01 18:16:43 ahze Exp $
+# $MCom: ports-stable/multimedia/vlc-devel/Makefile.inc,v 1.4 2009/01/09 23:41:21 mezz 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_.
@@ -281,7 +281,8 @@ pre-install: build
.endif
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
- ${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
+ ${SED} -e 's|^|%%WEBPLUGINS_DIR%%/|' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry %%WEBPLUGINS_DIR%%" >> ${PLIST}
.endif
.for locale in co fur my oc ps tet tl
${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
@@ -298,8 +299,8 @@ do-install:
cd ${FAKEDIR}/share && ${FIND} . | \
${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
- @${MKDIR} ${PREFIX}/lib/browser_plugins
- ${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
+ @${MKDIR} ${WEBPLUGINS_DIR}
+ ${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${WEBPLUGINS_DIR}
.endif
${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a9a811d8344e..263181c70104 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,14 +3,14 @@
# Whom: Brian Somers <brian@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.21 2006/10/01 18:16:43 ahze Exp $
+# $MCom: ports-stable/multimedia/vlc/Makefile,v 1.6 2009/01/09 23:41:21 mezz 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.6i
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
@@ -354,6 +354,10 @@ CONFIGURE_ENV+= MOZILLA_CONFIG="${GECKO_CONFIG}" \
XPIDL="${XPIDL}" \
XPIDL_INCL="${XPIDL_INCL}"
CONFIGURE_ARGS+=--enable-mozilla
+
+USE_WEBPLUGINS= gecko*
+WEBPLUGINS_FILES=libvlcplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
.endif
.if !defined(WITHOUT_MPEG2)
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 6b88cc3bae3a..7b06e305cc87 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -4,7 +4,7 @@
# and will be autodetected to enable
#
# $FreeBSD$
-# $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.8 2006/10/01 18:16:43 ahze Exp $
+# $MCom: ports-stable/multimedia/vlc/Makefile.inc,v 1.5 2009/01/09 23:41:21 mezz 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_.
@@ -302,7 +302,8 @@ pre-install: build
.endif
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
- ${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
+ ${SED} -e 's|^|%%WEBPLUGINS_DIR%%/|' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry %%WEBPLUGINS_DIR%%" >> ${PLIST}
.endif
.for locale in co fur my oc ps tet tl
${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
@@ -322,8 +323,8 @@ do-install:
cd ${FAKEDIR}/share && ${FIND} . | \
${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
- @${MKDIR} ${PREFIX}/lib/browser_plugins
- ${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
+ @${MKDIR} ${WEBPLUGINS_DIR}
+ ${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${WEBPLUGINS_DIR}
.endif
${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/