Sync w/ ports-stable. The epiphany, webkit-gtk2 and xulrunner still need

some double check, thought, when I get my machine to use ports.


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

10 files changed, 55 insertions, 60 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index bd575ab1d..efe69905f 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox-devel/Makefile,v 1.95 2008/07/13 17:41:11 marcus Exp $
+#   $MCom: ports/audio/rhythmbox-devel/Makefile,v 1.96 2008/07/13 17:48:10 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.11.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
@@ -127,6 +127,11 @@ PLIST_SUB+=	IPOD="@comment "
 .if !defined(WITHOUT_GECKO_PLUGIN)
 USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+
+USE_WEBPLUGINS=	gecko18
+WEBPLUGINS_FILES=librhythmbox-itms-detection-plugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+
 CONFIGURE_ARGS+=--enable-browser-plugin \
 		--with-gecko=${GECKO}
 CONFIGURE_ENV+=	MOZILLA_PLUGINDIR=${BROWSER_PLUGINS_DIR}
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index f4d22b9ff..d7d138602 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,8 +1,8 @@
 bin/rhythmbox
 bin/rhythmbox-client
-%%GECKO_PLUGIN%%lib/browser_plugins/librhythmbox-itms-detection-plugin.a
-%%GECKO_PLUGIN%%lib/browser_plugins/librhythmbox-itms-detection-plugin.la
-%%GECKO_PLUGIN%%lib/browser_plugins/librhythmbox-itms-detection-plugin.so
+%%GECKO_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.a
+%%GECKO_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.la
+%%GECKO_PLUGIN%%%%WEBPLUGINS_DIR%%/librhythmbox-itms-detection-plugin.so
 lib/librhythmbox-core.a
 lib/librhythmbox-core.la
 lib/librhythmbox-core.so
@@ -609,6 +609,7 @@ share/rhythmbox/rhythmbox-ui.xml
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
+%%GECKO_PLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index efff1f696..01e47ab77 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.109 2008/06/06 21:38:51 marcus Exp $
+#   $MCom: ports/multimedia/totem/Makefile,v 1.110 2008/06/12 19:49:48 marcus Exp $
 #
 
 PORTNAME=	totem
 PORTVERSION=	2.23.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -38,7 +38,7 @@ INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -lXrandr" \
-		BROWSER_PLUGIN_DIR="${PREFIX}/lib/browser_plugins"
+		BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}"
 CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
 
 MAN1=		totem.1 totem-video-thumbnailer.1
@@ -101,6 +101,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 \
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 56d9430c2..75728f91c 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -2,24 +2,24 @@ 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-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-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-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-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-narrowspace-plugin.a
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.la
-%%GECKO_PLUGINS%%lib/browser_plugins/libtotem-narrowspace-plugin.so
+%%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-complex-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-complex-plugin.so
+%%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-gmp-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-gmp-plugin.so
+%%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-narrowspace-plugin.a
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.la
+%%GECKO_PLUGINS%%%%WEBPLUGINS_DIR%%/libtotem-narrowspace-plugin.so
 lib/libbaconvideowidget.a
 lib/libbaconvideowidget.la
 lib/libbaconvideowidget.so
@@ -389,7 +389,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/www/epiphany/Makefile b/www/epiphany/Makefile
index 151ea58a4..45900a5ed 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.180 2008/07/02 05:46:42 marcus Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.181 2008/07/23 19:46:55 marcus Exp $
 #
 
 PORTNAME=	epiphany
 PORTVERSION=	2.23.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -96,7 +96,7 @@ post-patch:
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
+	@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins/symlinks/gecko18"|' \
 		${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
 
 post-install:
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 8e76f2f0f..8df00e1b3 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,11 +3,11 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports-stable/www/mozilla/Makefile,v 1.18 2008/06/16 22:25:44 mezz Exp $
+#    $MCom: ports/www/mozilla/Makefile,v 1.52 2008/07/26 19:07:07 ahze Exp $
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.13
-PORTREVISION?=	8
+PORTREVISION?=	9
 PORTEPOCH=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -130,14 +130,6 @@ post-patch:
 		${WRKDIR}/mozilla.desktop
 
 pre-install:
-	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
-		for jpi in ${JPI_LIST}; do \
-			if [ -f $${jpi} ]; then \
-				${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \
-				break; \
-			fi; \
-		done; \
-	fi
 .if !defined(WITHOUT_MAILNEWS)
 	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults
 .endif
@@ -145,15 +137,6 @@ pre-install:
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 
 do-install:
-	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
-		for jpi in ${JPI_LIST}; do \
-			if [ -f $${jpi} ]; then \
-		    		${LN} -sf $${jpi} \
-			    		${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
-				break; \
-			fi; \
-		done; \
-	fi
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \
 		${PREFIX}/share/applications
diff --git a/www/mozilla/files/patch-build_unix_run-mozilla.sh b/www/mozilla/files/patch-build_unix_run-mozilla.sh
index 87114cc7b..b00e0e0ee 100644
--- a/www/mozilla/files/patch-build_unix_run-mozilla.sh
+++ b/www/mozilla/files/patch-build_unix_run-mozilla.sh
@@ -5,7 +5,7 @@
  ##
  ## Set LD_LIBRARY_PATH
 -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/mozilla:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
  if [ -n "$LD_LIBRARYN32_PATH" ]
  then
  	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
@@ -14,7 +14,7 @@
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
 +
-+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins
++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/mozilla
 +export MOZ_PLUGIN_PATH
  
  if [ $moz_debug -eq 1 ]
diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in
index 422ce3677..097d76158 100644
--- a/www/mozilla/pkg-install.in
+++ b/www/mozilla/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    $MCom: ports-stable/www/mozilla/pkg-install.in,v 1.11 2008/06/16 21:36:02 mezz Exp $
+#    $MCom: ports/www/mozilla/pkg-install.in,v 1.25 2008/07/26 19:07:07 ahze Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -33,10 +33,6 @@ fi
 if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then
 	./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1
 fi
-if [ ! -d %%PREFIX%%/lib/browser_plugins ]; then
-    mkdir -p %%PREFIX%%/lib/browser_plugins
-fi
-cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/plugins/ > /dev/null 2>&1
 cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1
 
 exit 0
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 79dc70408..d19399506 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD: ports/www/webkit-gtk2/Makefile,v 1.2 2008/03/31 10:33:05 ahze Exp $
-#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.17 2008/07/23 01:14:28 marcus Exp $
+#   $MCom: ports/www/webkit-gtk2/Makefile,v 1.18 2008/07/27 20:08:13 ahze Exp $
 #
 
 PORTNAME=	webkit
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://people.freedesktop.org/~alp/webkit/gtk/
 PKGNAMESUFFIX=	-gtk2
@@ -37,7 +37,7 @@ CONFIGURE_ARGS=	--with-webkit-target=x11 \
 		--enable-svg-experimental
 MAKEFILE=	GNUmakefile
 
-BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins
+BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
 #_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
 .include <bsd.port.pre.mk>
diff --git a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
index 8dddf2475..ed0a5895f 100644
--- a/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
+++ b/www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
@@ -4,7 +4,7 @@
      userPluginPath.append(String("/.netscape/plugins"));
      paths.append(userPluginPath);
  
-+    paths.append("%%BROWSER_PLUGINS");
++    paths.append("%%BROWSER_PLUGINS%%");
      paths.append("/usr/lib/browser/plugins");
      paths.append("/usr/local/lib/mozilla/plugins");
      paths.append("/usr/lib/firefox/plugins");