diff options
91 files changed, 1051 insertions, 430 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 107c807a5812..29d1f5b0e34e 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -5,7 +5,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.8 2008/06/20 22:17:41 mezz Exp $ +# $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.12 2008/08/07 04:42:34 mezz Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -130,9 +130,6 @@ GECKO_FALLTRHOUGH= ${TRUE} .endif # Generic defines -BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins -BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins - GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` @@ -266,7 +263,6 @@ PLISTF?= ${WRKDIR}/plist_files MASTER_DIR?= ${.CURDIR}/../../www/mozilla KRB5_HOME?= /usr -BROWSER_PLUGINS_DIR?= lib/browser_plugins MOZ_PIS_DIR?= lib/${MOZILLA}/init.d ESD_LIB?= libesd.so.2 @@ -288,10 +284,6 @@ EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */package/* \ --exclude mozilla/gc/boehm -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so - MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin @@ -521,8 +513,9 @@ gecko-post-patch: s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ @@ -592,8 +585,6 @@ gecko-create-plist: .for f in ${GECKO_PLIST_PRE_DIRS} ${ECHO_CMD} "@dirrm ${f}" >> ${PLISTD} .endfor - ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLISTF} - ${ECHO_CMD} "@dirrmtry ${BROWSER_PLUGINS_DIR}" >> ${PLISTD} ${MKDIR} ${FAKEDIR}/libdata ${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE} ${RM} -f ${FAKEDIR}/lib/pkgconfig @@ -632,8 +623,6 @@ gecko-do-install: ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/${pcfile}.pc .endfor - ${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR} - ${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep .endif # !defined(NOGECKO_INSTALL) gecko-moz-pis-pre-install: @@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20090109: + AFFECTS: users of any Mozilla and Opera products + AUTHOR: mezz@freebsd.org + + The Java plugins now no longer will be pick up by automatically from these + browsers. Because all Java ports have same name of plugins file. I am + thinking about someone or maybe me will need to write something similar + function of nspluginwrapper (but in shell script) that can add Java plugin + in ~/.*/plugins/ when user request to select one version of Java plugin if + this user has more than one version of Java installed. However, for now, + you will have to add Java plugin in ~/.*/plugins/ by manually. + 20090107: AFFECTS: users of databases/unixODBC AUTHOR: beech@freebsd.org @@ -610,17 +622,6 @@ upgrades. with the port, also new 'reload' and 'debug' commands for the rc.d script. Enjoy! -20080727: - AFFECTS: users of www/firefox3 - AUTHOR: gnome@FreeBSD.org - - Update to 3.0.1_1,1; it no longer seeks for plugins in lib/browser_plugins, - because few plugins that built with Firefox 2 can cause Firefox 3 to crash. - We are working on making some changes with plugins directory by using - www/linux-mplayer-plugin/Makefile.npapi. If there are some other plugins - that work with Firefox 3 and you would like to use, you can copy them to - ~/.mozilla/plugins or /usr/local/lib/firefox3/plugins manually for now. - 20080725: AFFECTS: users of x11-fm/nautilus and misc/shared-mime-info AUTHOR: gnome@FreeBSD.org diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index feb49b37da4f..118be6773970 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.90 2008/03/17 04:31:25 marcus Exp $ +# $MCom: ports-stable/audio/rhythmbox-devel/Makefile,v 1.2 2009/01/09 23:41:21 mezz 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,9 +127,14 @@ 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} +CONFIGURE_ENV+= MOZILLA_PLUGINDIR=${WEBPLUGINS_DIR} PLIST_SUB+= GECKO_PLUGIN="" .else CONFIGURE_ARGS+=--disable-browser-plugin diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist index f4d22b9ff2d4..d7d13860228d 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/graphics/djview4/Makefile b/graphics/djview4/Makefile index 1a741fa9d980..840a13614f9f 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -7,7 +7,7 @@ PORTNAME= djview PORTVERSION= 4.4 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/djvu DISTNAME= ${PORTNAME}4-${PORTVERSION} @@ -39,18 +39,20 @@ QMAKESPEC?= freebsd-g++ MAN1= djview4.1 nsdejavu.1 MLINKS= djview4.1 djview.1 +USE_WEBPLUGINS= gecko* +WEBPLUGINS_DIR= ${PREFIX}/lib/djview4/plugins +WEBPLUGINS_FILES= nsdejavu.so + +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" + post-patch: @${REINPLACE_CMD} -e 's,/netscape/,/djview4/,' \ ${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in @${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,@NSDEJAVU_LIBS@ -lXt -lXext,g' \ - ${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in - + ${WRKSRC}/nsdejavu/Makefile.in post-install: - @${MKDIR} ${LOCALBASE}/lib/browser_plugins - ${LN} -sf ${PREFIX}/lib/djview4/plugins/nsdejavu.so \ - ${LOCALBASE}/lib/browser_plugins/nsdejavu.so - @${FIND} -ds ${PREFIX}/share/djvu/djview4/ ! -type d | \ ${SED} 's,${PREFIX}/,,' >> ${TMPPLIST} @@ -59,4 +61,4 @@ post-install: @${ECHO_CMD} "@unexec ${RMDIR} %D/share/djvu 2>/dev/null || true" \ >> ${TMPPLIST} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/djview4/pkg-plist b/graphics/djview4/pkg-plist index 72167c10a222..4d796c1616a1 100644 --- a/graphics/djview4/pkg-plist +++ b/graphics/djview4/pkg-plist @@ -1,9 +1,5 @@ bin/djview bin/djview4 lib/djview4/plugins/nsdejavu.so -@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins -@exec ln -sf %D/lib/djview4/plugins/nsdejavu.so %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so -@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so -@unexec rmdir %%LOCALBASE%%/lib/browser_plugins > /dev/null 2>&1 || true @dirrm lib/djview4/plugins @dirrm lib/djview4 diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 9443d97b9c9b..def7456bba41 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -7,7 +7,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.21 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF/djvu @@ -41,7 +41,12 @@ MAN1= djview3.1 nsdejavu.1 MLINKS= djview3.1 djview.1 DESKTOPDIR= ${PREFIX}/share/djvu/djview3/desktop +USE_WEBPLUGINS= gecko* +WEBPLUGINS_DIR= ${PREFIX}/lib/djvulibre/plugins +WEBPLUGINS_FILES= nsdejavu.so + .include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" post-patch: @${REINPLACE_CMD} -E \ @@ -82,11 +87,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/desktopfiles/register-djview-menu \ ${DESKTOPDIR} -# -# Install browser plugin. -# - @${MKDIR} ${LOCALBASE}/lib/browser_plugins - ${LN} -sf ${PREFIX}/lib/djvulibre/plugins/nsdejavu.so \ - ${LOCALBASE}/lib/browser_plugins/nsdejavu.so - .include <bsd.port.post.mk> diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index 4dcef853b7fd..d2f54f5e40be 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -12,9 +12,6 @@ share/djvu/djview3/fr/djview.qm share/djvu/djview3/fr/qt.qm share/djvu/djview3/ja/djview.qm share/djvu/djview3/ja/qt.qm -@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins -@exec ln -sf %D/lib/djvulibre/plugins/nsdejavu.so %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so -@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/nsdejavu.so @dirrm share/djvu/djview3/ja @dirrm share/djvu/djview3/fr @dirrm share/djvu/djview3/desktop @@ -24,4 +21,3 @@ share/djvu/djview3/ja/qt.qm @dirrmtry share/djvu @dirrm lib/djvulibre/plugins @dirrm lib/djvulibre -@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index f1fbbcd87237..a3d7db0346f0 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnash PORTVERSION= 20081208 +PORTREVISION= 1 CATEGORIES= graphics # gnashdev.org is slower MASTER_SITES= http://mirror.amdmi3.ru/ \ @@ -43,7 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ - --with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \ + --with-npapi-plugindir="${WEBPLUGINS_DIR}" \ --with-kde-pluginprefix="${PREFIX}" GNASHVER= trunk @@ -70,6 +71,9 @@ OPTIONS= PLUGIN "Enable browser plugin" on \ # Plugin option processing .if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN) +USE_WEBPLUGINS= native +WEBPLUGINS_FILES= libgnashplugin.so +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" PLIST_SUB+= FFPLUGIN="" .else PLIST_SUB+= FFPLUGIN="@comment " diff --git a/graphics/gnash-devel/pkg-plist b/graphics/gnash-devel/pkg-plist index 8b8cdc664a16..4178ce302650 100644 --- a/graphics/gnash-devel/pkg-plist +++ b/graphics/gnash-devel/pkg-plist @@ -6,7 +6,7 @@ bin/soldumper %%GTK%%bin/gtk-gnash %%KDE%%bin/kde-gnash %%CYGNAL%%bin/cygnal -%%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so +%%FFPLUGIN%%%%WEBPLUGINS_DIR%%/libgnashplugin.so %%KONQPLUGIN%%share/apps/klash/pluginsinfo %%KONQPLUGIN%%share/apps/klash/klashpartui.rc %%KONQPLUGIN%%share/services/klash_part.desktop @@ -58,4 +58,4 @@ share/locale/sv/LC_MESSAGES/gnash.mo @dirrm %%DOCSDIR%% @dirrm lib/gnash %%KONQPLUGIN%%@dirrm share/apps/klash -%%FFPLUGIN%%@dirrmtry lib/browser_plugins +%%FFPLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 26d7a059158e..747f581b8560 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.8.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://getgnash.org/packages/releases/ \ ${MASTER_SITE_GNU} @@ -40,7 +40,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ - --with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \ + --with-npapi-plugindir="${WEBPLUGINS_DIR}" \ --with-kde-pluginprefix="${PREFIX}" GNASHVER= ${PORTVERSION} @@ -66,6 +66,9 @@ OPTIONS= PLUGIN "Enable browser plugin" on \ # Plugin option processing .if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN) +USE_WEBPLUGINS= native +WEBPLUGINS_FILES= libgnashplugin.so +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" PLIST_SUB+= FFPLUGIN="" .else PLIST_SUB+= FFPLUGIN="@comment " diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist index d67932f9985a..03107d0aa589 100644 --- a/graphics/gnash/pkg-plist +++ b/graphics/gnash/pkg-plist @@ -6,7 +6,7 @@ bin/soldumper %%GTK%%bin/gtk-gnash %%KDE%%bin/kde-gnash %%CYGNAL%%bin/cygnal -%%FFPLUGIN%%lib/browser_plugins/libgnashplugin.so +%%FFPLUGIN%%%%WEBPLUGINS_DIR%%/libgnashplugin.so %%KONQPLUGIN%%share/apps/klash/pluginsinfo %%KONQPLUGIN%%share/apps/klash/klashpartui.rc %%KONQPLUGIN%%share/services/klash_part.desktop @@ -55,4 +55,4 @@ share/locale/sv/LC_MESSAGES/gnash.mo @dirrm %%DOCSDIR%% @dirrm lib/gnash %%KONQPLUGIN%%@dirrm share/apps/klash -%%FFPLUGIN%%@dirrmtry lib/browser_plugins +%%FFPLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index cb1d4f798781..df15602807d8 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/librsvg2/Makefile,v 1.121 2008/03/04 18:51:53 kwm Exp $ +# $MCom: ports-stable/graphics/librsvg2/Makefile,v 1.3 2008/09/23 20:34:45 mezz Exp $ # PORTNAME= librsvg2 PORTVERSION= 2.22.3 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -46,7 +47,10 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no .if defined(WITH_MOZILLA_PLUGIN) USE_GECKO= firefox mozilla seamonkey xulrunner +USE_WEBPLUGINS= gecko* +WEBPLUGINS_FILES=libmozsvgdec.so .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" CONFIGURE_ENV+= MOZILLA_CONFIG=no CONFIGURE_ARGS+=--enable-mozilla-plugin=yes @@ -61,6 +65,8 @@ post-patch: .if defined(WITH_MOZILLA_PLUGIN) @${REINPLACE_CMD} -e 's|mozilla-plugin|${GECKO}-plugin|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[$$][(]libdir[)]/mozilla/plugins|${WEBPLUGINS_DIR}|g' \ + ${WRKSRC}/moz-plugin/Makefile.in .endif .include <bsd.port.post.mk> diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index 93551c798bd0..728d20fcbd1c 100644 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -1,14 +1,5 @@ --- moz-plugin/Makefile.in.orig 2008-09-23 15:17:45.000000000 -0500 +++ moz-plugin/Makefile.in 2008-09-23 15:19:11.000000000 -0500 -@@ -227,7 +227,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --plugindir = $(libdir)/mozilla/plugins -+plugindir = $(libdir)/browser_plugins - @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = - @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la - INCLUDES = $(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GLIB_CFLAGS) $(GDK_X11_CFLAGS) @@ -270,7 +270,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index e437b5ef6ca9..c89581974118 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -5,9 +5,9 @@ include/librsvg-2/librsvg/librsvg-enum-types.h include/librsvg-2/librsvg/librsvg-features.h include/librsvg-2/librsvg/rsvg-cairo.h include/librsvg-2/librsvg/rsvg.h -%%PLUGIN%%lib/browser_plugins/libmozsvgdec.a -%%PLUGIN%%lib/browser_plugins/libmozsvgdec.la -%%PLUGIN%%lib/browser_plugins/libmozsvgdec.so +%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.a +%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.la +%%PLUGIN%%%%WEBPLUGINS_DIR%%/libmozsvgdec.so lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so @@ -38,6 +38,7 @@ share/doc/rsvg/style.css share/doc/rsvg/up.png share/pixmaps/svg-viewer.svg @dirrm share/doc/rsvg +%%PLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%% @dirrm include/librsvg-2/librsvg @dirrm include/librsvg-2 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index e5e48864d3bd..9df78b58a8df 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/thunderbird/Makefile,v 1.28 2008/01/10 17:58:39 mezz Exp $ +# $MCom: ports-stable/mail/thunderbird/Makefile,v 1.18 2009/01/02 21:16:20 mezz Exp $ # PORTNAME= thunderbird DISTVERSION= 2.0.0.19 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source diff --git a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh index 7e038a39d310..dab3551bf701 100644 --- a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird-esr/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/thunderbird:${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"} diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index e5e48864d3bd..9df78b58a8df 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/thunderbird/Makefile,v 1.28 2008/01/10 17:58:39 mezz Exp $ +# $MCom: ports-stable/mail/thunderbird/Makefile,v 1.18 2009/01/02 21:16:20 mezz Exp $ # PORTNAME= thunderbird DISTVERSION= 2.0.0.19 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source diff --git a/mail/thunderbird/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird/files/patch-build_unix_run-mozilla.sh index 7e038a39d310..dab3551bf701 100644 --- a/mail/thunderbird/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird/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/thunderbird:${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"} diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index e5e48864d3bd..9df78b58a8df 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/thunderbird/Makefile,v 1.28 2008/01/10 17:58:39 mezz Exp $ +# $MCom: ports-stable/mail/thunderbird/Makefile,v 1.18 2009/01/02 21:16:20 mezz Exp $ # PORTNAME= thunderbird DISTVERSION= 2.0.0.19 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh index 7e038a39d310..dab3551bf701 100644 --- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird3/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/thunderbird:${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"} 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/ diff --git a/security/opensc/Makefile b/security/opensc/Makefile index b20f8a48321d..47dcbec7e5fd 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -7,6 +7,7 @@ PORTNAME= opensc PORTVERSION= 0.11.6 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \ http://www.opensc-project.org/files/${PORTNAME}/testing/ @@ -78,9 +79,13 @@ RUN_DEPENDS+= pinentry:${PORTSDIR}/${PINENTRY_PORT} USE_XORG= x11 CONFIGURE_ARGS+=--enable-nsplugin \ --with-libassuan-prefix=${LOCALBASE} \ - --with-plugindir=${LOCALBASE}/lib/browser_plugins \ + --with-plugindir=${WEBPLUGINS_DIR} \ --with-pinentry=${PINENTRY} PLIST_SUB+= SIGNER="" + +USE_WEBPLUGINS= gecko* +WEBPLUGINS_FILES=opensc-signer.so +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" .else PLIST_SUB+= SIGNER="@comment " .endif diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist index 3fb2bc0b9753..d06cf89bf29f 100644 --- a/security/opensc/pkg-plist +++ b/security/opensc/pkg-plist @@ -29,7 +29,7 @@ include/opensc/ui.h libdata/pkgconfig/libopensc.pc libdata/pkgconfig/libpkcs15init.pc libdata/pkgconfig/libscconf.pc -%%SIGNER%%lib/browser_plugins/opensc-signer.so +%%SIGNER%%%%WEBPLUGINS_DIR%%/opensc-signer.so %%SIGNER%%lib/opensc-signer.a %%SIGNER%%lib/opensc-signer.la %%SIGNER%%lib/opensc-signer.so @@ -72,6 +72,7 @@ lib/pkcs11/pkcs11-spy.so %%DATADIR%%/rutoken.profile %%DATADIR%%/setcos.profile %%DATADIR%%/starcos.profile +%%SIGNER%%@dirrmtry %%WEBPLUGINS_DIR%% @dirrm include/opensc @dirrm lib/pkcs11 @dirrm %%DATADIR%% diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile index 1c5b765d479e..c0773a92f654 100644 --- a/textproc/gxmlviewer/Makefile +++ b/textproc/gxmlviewer/Makefile @@ -8,7 +8,7 @@ PORTNAME= gxmlviewer PORTVERSION= 1.3.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,14 +21,18 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" +USE_WEBPLUGINS= native +WEBPLUGINS_DIR= ${PREFIX}/lib/gxmlviewer/plugins +WEBPLUGINS_FILES=npgxmlviewer.so + +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" + post-patch: @${REINPLACE_CMD} -e 's|intl||g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|= -DXP_UNIX|= -fPIC -DXP_UNIX|g ; \ - s|/netscape/|/gxmlviewer/|g' ${WRKSRC}/src/nsplugin/Makefile.in - -post-install: - @${MKDIR} ${LOCALBASE}/lib/browser_plugins - @${LN} -sf ${PREFIX}/lib/gxmlviewer/plugins/npgxmlviewer.so \ - ${LOCALBASE}/lib/browser_plugins/npgxmlviewer.so + s|/netscape/|/gxmlviewer/|g ; \ + s|@LIBS@|@LIBS@ -lXt -lXext|g' \ + ${WRKSRC}/src/nsplugin/Makefile.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/textproc/gxmlviewer/pkg-plist b/textproc/gxmlviewer/pkg-plist index 24f5da4d4b4b..798387bafa09 100644 --- a/textproc/gxmlviewer/pkg-plist +++ b/textproc/gxmlviewer/pkg-plist @@ -3,9 +3,5 @@ bin/xmlview-control bin/xmlformatter lib/gxmlviewer/plugins/npgxmlviewer.so share/oaf/GNOME_XMLView.oaf -@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so -@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true -@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true -@exec ln -sf %D/lib/gxmlviewer/plugins/npgxmlviewer.so %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so @dirrm lib/gxmlviewer/plugins @dirrm lib/gxmlviewer diff --git a/www/dummyflash/Makefile b/www/dummyflash/Makefile index dd6254be7688..3305bf17ec07 100644 --- a/www/dummyflash/Makefile +++ b/www/dummyflash/Makefile @@ -7,7 +7,7 @@ PORTNAME= dummyflash PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= ftp://ftp.netscape.com/pub/sdk/plugin/unix/ DISTNAME= unix-sdk-3.0b5 @@ -21,8 +21,14 @@ BUILD_WRKSRC= ${WRKSRC}/PluginSDK30b5/examples/UnixTemplate/Unix NO_WRKSUBDIR= yes MAKEFILE= makefile.freebsd +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=dummyflash.so + +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" + do-install: - @${MKDIR} ${PREFIX}/lib/browser_plugins - ${INSTALL_DATA} ${BUILD_WRKSRC}/dummyflash.so ${PREFIX}/lib/browser_plugins + @${MKDIR} ${WEBPLUGINS_DIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/dummyflash.so ${WEBPLUGINS_DIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/dummyflash/pkg-plist b/www/dummyflash/pkg-plist index 1d5c408d69d0..0fd01a0900ea 100644 --- a/www/dummyflash/pkg-plist +++ b/www/dummyflash/pkg-plist @@ -1,2 +1,2 @@ -lib/browser_plugins/dummyflash.so -@dirrmtry lib/browser_plugins +%%WEBPLUGINS_DIR%%/dummyflash.so +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 870a7fd776fd..7383a988d046 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.168 2008/03/17 05:00:09 marcus Exp $ +# $MCom: ports-stable/www/epiphany/Makefile,v 1.11 2008/08/06 04:20:12 mezz Exp $ # PORTNAME= epiphany PORTVERSION= 2.22.3 -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/firefox-devel/Makefile b/www/firefox-devel/Makefile index e61e9927813c..468d08c97060 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -3,11 +3,11 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox-devel/Makefile,v 1.36 2007/02/24 21:00:46 mezz Exp $ +# $MCom: ports-stable/www/firefox-devel/Makefile,v 1.7 2008/08/07 04:42:35 mezz Exp $ PORTNAME= firefox DISTVERSION= 3.0.a2 -PORTREVISION= 3 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -95,17 +95,6 @@ port-pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox-devel/files/patch-build_unix_run-mozilla.sh index a5295588ea97..38ef0a7f5ea3 100644 --- a/www/firefox-devel/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox-devel/files/patch-build_unix_run-mozilla.sh @@ -4,7 +4,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/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox-devel +export MOZ_PLUGIN_PATH + if [ $moz_debug -eq 1 ] diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ae3cb3d3a96c..820689f1925c 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.43 2008/02/09 16:38:43 marcus Exp $ +# $MCom: ports-stable/www/firefox/Makefile,v 1.32 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= firefox DISTVERSION= 2.0.0.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} @@ -93,17 +94,6 @@ pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox-esr/Makefile.webplugins b/www/firefox-esr/Makefile.webplugins new file mode 100644 index 000000000000..dd5db96f0cfc --- /dev/null +++ b/www/firefox-esr/Makefile.webplugins @@ -0,0 +1,226 @@ +#-*- mode: makefile; tab-width: 4; -* +# ex:ts=4 +# +# New ports collection makefile for: npapi infrastructure +# Date created: 27 June 2006 +# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ +# + +# MAINTAINER= gnome@FreeBSD.org +# +# Documentation and examples: +# +# Makefile.webplugins will create symlinks automatically for each supported +# applications that supports the webplugins framework. Also, it will remove +# these symlinks when the plug-in port is uninstalled. +# +# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in +# port supports. For each of these applications, a +# symlink will be created in +# lib/browser_plugins/symlinks. See +# WEBPLUGINS_APPS_ALL_* below for the list of +# supported applications. +# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all +# applications) +# +# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, +# then you can tweak WEBPLUGINS_NAME to change the +# name of the directory +# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). +# Default: WEBPLUGINS_NAME=${PKGBASE} +# +# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked +# in lib/browser_plugins/symlinks/*/. It cannot +# be empty or the port will set IGNORE. +# +# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be +# found. Each plug-in file in WEBPLUGINS_FILES +# must be found in WEBPLUGINS_DIR. If your port +# does not install in WEBPLUGINS_DIR, but in its own +# path. You will need to specify that here or +# symlinks will be created to non-existent files. +# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} +# +# +# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any +# of the following: +# +# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) +# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) +# USE_WEBPLUGINS=linux (Supports linux-*) +# USE_WEBPLUGINS=opera webkit-gtk2 +# +# Example to add in Makefile and pkg-plist if the plug-in file(s) install in +# WEBPLUGINS_DIR, and if your port does this manually: +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USE_WEBPLUGINS=gecko* +# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi +# +# .include <bsd.port.pre.mk> +# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" +# +# post-install: +# ${MKDIR} ${WEBPLUGINS_DIR} +# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ +# ${WEBPLUGINS_DIR} +# +# .include <bsd.port.post.mk> +# ------------------------------------------------------ +# +# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks +# in pkg-plist, because they will be removed automatically. +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# %%WEBPLUGINS_DIR%%/fooplugin.so +# %%WEBPLUGINS_DIR%%/fooplugin.xpi +# @dirrmtry %%WEBPLUGINS_DIR%% +# ------------------------------------------------------ +# +# Here is what it will look like when it creates the symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# ------------------------------------------------------ +# +# If your port uses libtool, and installs any *.a and *.la files, do not add +# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and +# *.xpi ONLY. +# +# Example to add in Makefile and pkg-plist if your port installs plug-ins in +# its own directory, and you need to set WEBPLUGINS_DIR. +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USE_WEBPLUGINS=gecko* +# WEBPLUGINS_DIR=#{PREFIX}/lib/application +# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi +# +# .include <bsd.port.pre.mk> +# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" +# +# [...] +# +# .include <bsd.port.post.mk> +# ------------------------------------------------------ +# +# As for the pkg-plist, it should only include the actual files your +# port installs: +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# lib/application/fooplugin.a +# lib/application/fooplugin.la +# lib/application/fooplugin.so +# lib/application/fooplugin.xpi +# @dirrm lib/application +# ------------------------------------------------------ +# +# Here is what it will look like when it creates symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# ------------------------------------------------------ + +WEBPLUGINS_NAME?= ${PKGBASE} +WEBPLUGINS_FILES?= empty +WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ + linux-flock-devel linux-mozilla \ + linux-nvu linux-opera linux-opera-devel \ + linux-seamonkey linux-seamonkey-devel \ + linux-sunbird linux-sunbird-devel +WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 +WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ + ${WEBPLUGINS_APPS_ALL_NATIVE} + +.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ + ${USE_WEBPLUGINS} == "*" +USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} +.endif + +.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ + ${WEBPLUGINS_FILES} == "" +IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document +.endif + +.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} +_TEMP_APP_=${_TEMP_APP__} +_TEMP_FLAG_=0 +. for _TEMP_USE__ in ${USE_WEBPLUGINS} +_TEMP_USE_=${_TEMP_USE__} +. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ + ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ + ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) +_TEMP_FLAG_=1 +. endif +. endfor +. if ${_TEMP_FLAG_} +USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} +. endif +.endfor + +WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} +WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} +WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} + +WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins +WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks +WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} + +PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" + +_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} +_Q= 2>/dev/null || true +_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} +_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} +_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} + +webplugins-post-install: + @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ + ${ECHO_CMD}; \ + ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD}; \ + else \ + for _f in ${WEBPLUGINS_FILES}; do \ + if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ + ${ECHO_CMD}; \ + ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD}; \ + fi; \ + done; \ + fi; \ + for _d in ${WEBPLUGINS_LINKFARMS}; do \ + ${INSTALL} -d $${_d}; \ + for _l in ${_LNWF}; do \ + ${LN} -sf $${_l} $${_d}/ ${_Q}; \ + done; \ + done; \ + for _d in ${_WLF}; do \ + ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ + for _l in ${_LNWF}; do \ + ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ + done; \ + for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ + ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ + done; \ + ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ + done + @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} + +post-install: webplugins-post-install diff --git a/www/firefox-esr/files/patch-build_unix_run-mozilla.sh b/www/firefox-esr/files/patch-build_unix_run-mozilla.sh index 87114cc7b898..5d8ec822d9a1 100644 --- a/www/firefox-esr/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox-esr/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/firefox:${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/firefox +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ae3cb3d3a96c..820689f1925c 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.43 2008/02/09 16:38:43 marcus Exp $ +# $MCom: ports-stable/www/firefox/Makefile,v 1.32 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= firefox DISTVERSION= 2.0.0.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} @@ -93,17 +94,6 @@ pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox/Makefile.webplugins b/www/firefox/Makefile.webplugins new file mode 100644 index 000000000000..dd5db96f0cfc --- /dev/null +++ b/www/firefox/Makefile.webplugins @@ -0,0 +1,226 @@ +#-*- mode: makefile; tab-width: 4; -* +# ex:ts=4 +# +# New ports collection makefile for: npapi infrastructure +# Date created: 27 June 2006 +# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ +# + +# MAINTAINER= gnome@FreeBSD.org +# +# Documentation and examples: +# +# Makefile.webplugins will create symlinks automatically for each supported +# applications that supports the webplugins framework. Also, it will remove +# these symlinks when the plug-in port is uninstalled. +# +# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in +# port supports. For each of these applications, a +# symlink will be created in +# lib/browser_plugins/symlinks. See +# WEBPLUGINS_APPS_ALL_* below for the list of +# supported applications. +# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all +# applications) +# +# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, +# then you can tweak WEBPLUGINS_NAME to change the +# name of the directory +# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). +# Default: WEBPLUGINS_NAME=${PKGBASE} +# +# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked +# in lib/browser_plugins/symlinks/*/. It cannot +# be empty or the port will set IGNORE. +# +# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be +# found. Each plug-in file in WEBPLUGINS_FILES +# must be found in WEBPLUGINS_DIR. If your port +# does not install in WEBPLUGINS_DIR, but in its own +# path. You will need to specify that here or +# symlinks will be created to non-existent files. +# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} +# +# +# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any +# of the following: +# +# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) +# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) +# USE_WEBPLUGINS=linux (Supports linux-*) +# USE_WEBPLUGINS=opera webkit-gtk2 +# +# Example to add in Makefile and pkg-plist if the plug-in file(s) install in +# WEBPLUGINS_DIR, and if your port does this manually: +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USE_WEBPLUGINS=gecko* +# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi +# +# .include <bsd.port.pre.mk> +# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" +# +# post-install: +# ${MKDIR} ${WEBPLUGINS_DIR} +# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ +# ${WEBPLUGINS_DIR} +# +# .include <bsd.port.post.mk> +# ------------------------------------------------------ +# +# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks +# in pkg-plist, because they will be removed automatically. +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# %%WEBPLUGINS_DIR%%/fooplugin.so +# %%WEBPLUGINS_DIR%%/fooplugin.xpi +# @dirrmtry %%WEBPLUGINS_DIR%% +# ------------------------------------------------------ +# +# Here is what it will look like when it creates the symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# ------------------------------------------------------ +# +# If your port uses libtool, and installs any *.a and *.la files, do not add +# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and +# *.xpi ONLY. +# +# Example to add in Makefile and pkg-plist if your port installs plug-ins in +# its own directory, and you need to set WEBPLUGINS_DIR. +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USE_WEBPLUGINS=gecko* +# WEBPLUGINS_DIR=#{PREFIX}/lib/application +# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi +# +# .include <bsd.port.pre.mk> +# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" +# +# [...] +# +# .include <bsd.port.post.mk> +# ------------------------------------------------------ +# +# As for the pkg-plist, it should only include the actual files your +# port installs: +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# lib/application/fooplugin.a +# lib/application/fooplugin.la +# lib/application/fooplugin.so +# lib/application/fooplugin.xpi +# @dirrm lib/application +# ------------------------------------------------------ +# +# Here is what it will look like when it creates symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# ------------------------------------------------------ + +WEBPLUGINS_NAME?= ${PKGBASE} +WEBPLUGINS_FILES?= empty +WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ + linux-flock-devel linux-mozilla \ + linux-nvu linux-opera linux-opera-devel \ + linux-seamonkey linux-seamonkey-devel \ + linux-sunbird linux-sunbird-devel +WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 +WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ + ${WEBPLUGINS_APPS_ALL_NATIVE} + +.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ + ${USE_WEBPLUGINS} == "*" +USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} +.endif + +.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ + ${WEBPLUGINS_FILES} == "" +IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document +.endif + +.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} +_TEMP_APP_=${_TEMP_APP__} +_TEMP_FLAG_=0 +. for _TEMP_USE__ in ${USE_WEBPLUGINS} +_TEMP_USE_=${_TEMP_USE__} +. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ + ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ + ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) +_TEMP_FLAG_=1 +. endif +. endfor +. if ${_TEMP_FLAG_} +USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} +. endif +.endfor + +WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} +WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} +WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} + +WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins +WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks +WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} + +PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" + +_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} +_Q= 2>/dev/null || true +_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} +_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} +_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} + +webplugins-post-install: + @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ + ${ECHO_CMD}; \ + ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD}; \ + else \ + for _f in ${WEBPLUGINS_FILES}; do \ + if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ + ${ECHO_CMD}; \ + ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD}; \ + fi; \ + done; \ + fi; \ + for _d in ${WEBPLUGINS_LINKFARMS}; do \ + ${INSTALL} -d $${_d}; \ + for _l in ${_LNWF}; do \ + ${LN} -sf $${_l} $${_d}/ ${_Q}; \ + done; \ + done; \ + for _d in ${_WLF}; do \ + ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ + for _l in ${_LNWF}; do \ + ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ + done; \ + for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ + ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ + done; \ + ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ + done + @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} + +post-install: webplugins-post-install diff --git a/www/firefox/files/patch-build_unix_run-mozilla.sh b/www/firefox/files/patch-build_unix_run-mozilla.sh index 87114cc7b898..5d8ec822d9a1 100644 --- a/www/firefox/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox/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/firefox:${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/firefox +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index e61e9927813c..468d08c97060 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -3,11 +3,11 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox-devel/Makefile,v 1.36 2007/02/24 21:00:46 mezz Exp $ +# $MCom: ports-stable/www/firefox-devel/Makefile,v 1.7 2008/08/07 04:42:35 mezz Exp $ PORTNAME= firefox DISTVERSION= 3.0.a2 -PORTREVISION= 3 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -95,17 +95,6 @@ port-pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh index a5295588ea97..38ef0a7f5ea3 100644 --- a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh @@ -4,7 +4,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/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox-devel +export MOZ_PLUGIN_PATH + if [ $moz_debug -eq 1 ] diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile index 7493548e29d5..663a007c6736 100644 --- a/www/firefox3/Makefile +++ b/www/firefox3/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/www/firefox3/Makefile,v 1.11 2008/06/30 16:07:29 mezz Exp $ +# $MCom: ports-stable/www/firefox3/Makefile,v 1.20 2008/12/31 01:52:03 mezz Exp $ # PORTNAME= firefox DISTVERSION= 3.0.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -112,17 +113,6 @@ port-pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -#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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox3/files/patch-build_unix_run-mozilla.sh b/www/firefox3/files/patch-build_unix_run-mozilla.sh new file mode 100644 index 000000000000..92777d76a378 --- /dev/null +++ b/www/firefox3/files/patch-build_unix_run-mozilla.sh @@ -0,0 +1,12 @@ +--- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006 ++++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006 +@@ -443,6 +443,9 @@ + export MOZILLA_FIVE_HOME LD_LIBRARY_PATH + export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3 ++export MOZ_PLUGIN_PATH ++ + if [ $moz_debug -eq 1 ] + then + moz_debug_program ${1+"$@"} diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index e61e9927813c..468d08c97060 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -3,11 +3,11 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox-devel/Makefile,v 1.36 2007/02/24 21:00:46 mezz Exp $ +# $MCom: ports-stable/www/firefox-devel/Makefile,v 1.7 2008/08/07 04:42:35 mezz Exp $ PORTNAME= firefox DISTVERSION= 3.0.a2 -PORTREVISION= 3 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -95,17 +95,6 @@ port-pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox35/files/patch-build_unix_run-mozilla.sh b/www/firefox35/files/patch-build_unix_run-mozilla.sh index a5295588ea97..38ef0a7f5ea3 100644 --- a/www/firefox35/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox35/files/patch-build_unix_run-mozilla.sh @@ -4,7 +4,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/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox-devel +export MOZ_PLUGIN_PATH + if [ $moz_debug -eq 1 ] diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index ae3cb3d3a96c..820689f1925c 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.43 2008/02/09 16:38:43 marcus Exp $ +# $MCom: ports-stable/www/firefox/Makefile,v 1.32 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= firefox DISTVERSION= 2.0.0.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} @@ -93,17 +94,6 @@ pre-install: >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) -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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/firefox36/Makefile.webplugins b/www/firefox36/Makefile.webplugins new file mode 100644 index 000000000000..dd5db96f0cfc --- /dev/null +++ b/www/firefox36/Makefile.webplugins @@ -0,0 +1,226 @@ +#-*- mode: makefile; tab-width: 4; -* +# ex:ts=4 +# +# New ports collection makefile for: npapi infrastructure +# Date created: 27 June 2006 +# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ +# + +# MAINTAINER= gnome@FreeBSD.org +# +# Documentation and examples: +# +# Makefile.webplugins will create symlinks automatically for each supported +# applications that supports the webplugins framework. Also, it will remove +# these symlinks when the plug-in port is uninstalled. +# +# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in +# port supports. For each of these applications, a +# symlink will be created in +# lib/browser_plugins/symlinks. See +# WEBPLUGINS_APPS_ALL_* below for the list of +# supported applications. +# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all +# applications) +# +# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, +# then you can tweak WEBPLUGINS_NAME to change the +# name of the directory +# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). +# Default: WEBPLUGINS_NAME=${PKGBASE} +# +# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked +# in lib/browser_plugins/symlinks/*/. It cannot +# be empty or the port will set IGNORE. +# +# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be +# found. Each plug-in file in WEBPLUGINS_FILES +# must be found in WEBPLUGINS_DIR. If your port +# does not install in WEBPLUGINS_DIR, but in its own +# path. You will need to specify that here or +# symlinks will be created to non-existent files. +# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} +# +# +# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any +# of the following: +# +# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) +# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) +# USE_WEBPLUGINS=linux (Supports linux-*) +# USE_WEBPLUGINS=opera webkit-gtk2 +# +# Example to add in Makefile and pkg-plist if the plug-in file(s) install in +# WEBPLUGINS_DIR, and if your port does this manually: +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USE_WEBPLUGINS=gecko* +# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi +# +# .include <bsd.port.pre.mk> +# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" +# +# post-install: +# ${MKDIR} ${WEBPLUGINS_DIR} +# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ +# ${WEBPLUGINS_DIR} +# +# .include <bsd.port.post.mk> +# ------------------------------------------------------ +# +# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks +# in pkg-plist, because they will be removed automatically. +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# %%WEBPLUGINS_DIR%%/fooplugin.so +# %%WEBPLUGINS_DIR%%/fooplugin.xpi +# @dirrmtry %%WEBPLUGINS_DIR%% +# ------------------------------------------------------ +# +# Here is what it will look like when it creates the symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# ------------------------------------------------------ +# +# If your port uses libtool, and installs any *.a and *.la files, do not add +# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and +# *.xpi ONLY. +# +# Example to add in Makefile and pkg-plist if your port installs plug-ins in +# its own directory, and you need to set WEBPLUGINS_DIR. +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USE_WEBPLUGINS=gecko* +# WEBPLUGINS_DIR=#{PREFIX}/lib/application +# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi +# +# .include <bsd.port.pre.mk> +# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" +# +# [...] +# +# .include <bsd.port.post.mk> +# ------------------------------------------------------ +# +# As for the pkg-plist, it should only include the actual files your +# port installs: +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# lib/application/fooplugin.a +# lib/application/fooplugin.la +# lib/application/fooplugin.so +# lib/application/fooplugin.xpi +# @dirrm lib/application +# ------------------------------------------------------ +# +# Here is what it will look like when it creates symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# ------------------------------------------------------ + +WEBPLUGINS_NAME?= ${PKGBASE} +WEBPLUGINS_FILES?= empty +WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ + linux-flock-devel linux-mozilla \ + linux-nvu linux-opera linux-opera-devel \ + linux-seamonkey linux-seamonkey-devel \ + linux-sunbird linux-sunbird-devel +WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 +WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ + ${WEBPLUGINS_APPS_ALL_NATIVE} + +.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ + ${USE_WEBPLUGINS} == "*" +USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} +.endif + +.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ + ${WEBPLUGINS_FILES} == "" +IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document +.endif + +.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} +_TEMP_APP_=${_TEMP_APP__} +_TEMP_FLAG_=0 +. for _TEMP_USE__ in ${USE_WEBPLUGINS} +_TEMP_USE_=${_TEMP_USE__} +. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ + ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ + ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) +_TEMP_FLAG_=1 +. endif +. endfor +. if ${_TEMP_FLAG_} +USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} +. endif +.endfor + +WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} +WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} +WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} + +WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins +WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks +WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} + +PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" + +_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} +_Q= 2>/dev/null || true +_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} +_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} +_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} + +webplugins-post-install: + @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ + ${ECHO_CMD}; \ + ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD}; \ + else \ + for _f in ${WEBPLUGINS_FILES}; do \ + if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ + ${ECHO_CMD}; \ + ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ + ${ECHO_CMD}; \ + fi; \ + done; \ + fi; \ + for _d in ${WEBPLUGINS_LINKFARMS}; do \ + ${INSTALL} -d $${_d}; \ + for _l in ${_LNWF}; do \ + ${LN} -sf $${_l} $${_d}/ ${_Q}; \ + done; \ + done; \ + for _d in ${_WLF}; do \ + ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ + for _l in ${_LNWF}; do \ + ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ + done; \ + for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ + ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ + done; \ + ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ + done + @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} + +post-install: webplugins-post-install diff --git a/www/firefox36/files/patch-build_unix_run-mozilla.sh b/www/firefox36/files/patch-build_unix_run-mozilla.sh index 87114cc7b898..5d8ec822d9a1 100644 --- a/www/firefox36/files/patch-build_unix_run-mozilla.sh +++ b/www/firefox36/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/firefox:${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/firefox +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile index df7a5797042d..68900dad02b4 100644 --- a/www/flashplugin-mozilla/Makefile +++ b/www/flashplugin-mozilla/Makefile @@ -7,7 +7,7 @@ PORTNAME?= flashplugin-mozilla PORTVERSION= 0.4.13 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= SF/gplflash DISTNAME= gplflash-${PORTVERSION} @@ -21,14 +21,18 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/plugin USE_XORG= xt x11 xext USE_BZIP2= yes -PLUGIN_DIR= lib/browser_plugins -PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-plugin-dir="${PREFIX}/${PLUGIN_DIR}" +CONFIGURE_ARGS+= --with-plugin-dir="${WEBPLUGINS_DIR}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lXt" CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=libnpflash.so + +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" + post-patch: @${REINPLACE_CMD} -e "s,-L../lib/.libs,-L${LOCALBASE}/lib," \ -e "s/libnpflash.so.0.0.0/libnpflash.so.0/" \ @@ -36,4 +40,4 @@ post-patch: @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/npapi.h @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${CONFIGURE_WRKSRC}/configure ${CONFIGURE_WRKSRC}/ltconfig -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/flashplugin-mozilla/pkg-plist b/www/flashplugin-mozilla/pkg-plist index 58310e6b2b4d..50cb4b09a08b 100644 --- a/www/flashplugin-mozilla/pkg-plist +++ b/www/flashplugin-mozilla/pkg-plist @@ -1,2 +1,2 @@ -%%PLUGIN_DIR%%/libnpflash.so -@dirrmtry %%PLUGIN_DIR%% +%%WEBPLUGINS_DIR%%/libnpflash.so +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/flock/Makefile b/www/flock/Makefile index 07a8f62d7f9e..dcb346fc4457 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -3,12 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/flock/Makefile,v 1.2 2006/10/05 21:37:18 mezz Exp $ +# $MCom: ports-stable/www/flock/Makefile,v 1.4 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= flock DISTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://ftp.osuosl.org/pub/${PORTNAME}/releases/${PORTVERSION}/ \ http://flock.vo.llnwd.net/o23/archive/${PORTNAME}/releases/${PORTVERSION}/ @@ -84,17 +84,6 @@ pre-install: ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FLOCK_ICON}' >> ${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 - post-install: ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ diff --git a/www/flock/files/patch-build_unix_run-mozilla.sh b/www/flock/files/patch-build_unix_run-mozilla.sh index 87114cc7b898..ab66b44982fa 100644 --- a/www/flock/files/patch-build_unix_run-mozilla.sh +++ b/www/flock/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/flock:${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/flock +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 570f4d4afe95..eda83aaecc14 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -3,11 +3,11 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/galeon/Makefile,v 1.14 2007/10/08 19:42:51 mezz Exp $ +# $MCom: ports-stable/www/galeon/Makefile,v 1.6 2008/11/16 20:00:21 marcus Exp $ # PORTNAME= galeon -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 CATEGORIES= www gnome MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//} @@ -51,7 +51,7 @@ post-patch: 's|malloc\.h|stdlib.h|g' @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \ ${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in - @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins|' \ + @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins/symlinks/gecko18|' \ ${WRKSRC}/mozilla/mozilla-embed-shell.cpp .include <bsd.port.post.mk> diff --git a/www/galeon/distinfo b/www/galeon/distinfo index e205a6789f79..b14dc93f2c93 100644 --- a/www/galeon/distinfo +++ b/www/galeon/distinfo @@ -1,3 +1,3 @@ -MD5 (galeon-2.0.6.tar.bz2) = 7723816d29edac94945e5fd9a2a402f8 -SHA256 (galeon-2.0.6.tar.bz2) = 266f5eb1675c704f31c63d14cb89e1f16c96e53f6256d961026bc816d0d95210 -SIZE (galeon-2.0.6.tar.bz2) = 3094830 +MD5 (galeon-2.0.7.tar.bz2) = 2eede1f43e3f6f2ac4ce7d4db99b15b2 +SHA256 (galeon-2.0.7.tar.bz2) = c6fb0c9e7e2a4014ee7c785cec35380985138bd9aa2b33e9cb63de497ea68b3b +SIZE (galeon-2.0.7.tar.bz2) = 3096337 diff --git a/www/galeon/files/patch-configure b/www/galeon/files/patch-configure deleted file mode 100644 index 89f6d121a693..000000000000 --- a/www/galeon/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-07-06 15:07:05.000000000 -0400 -+++ configure 2008-07-06 15:07:13.000000000 -0400 -@@ -23281,7 +23281,7 @@ if test $MOZILLA = libxul-embedding-unst - MOZILLA_GTKMOZEMBED=$MOZILLA - else - MOZILLA_XPCOM=$MOZILLA-xpcom -- MOZILLA_XPCOM=$MOZILLA-gtkmozembed -+ MOZILLA_GTKMOZEMBED=$MOZILLA-gtkmozembed - fi - - pkg_failed=no diff --git a/www/helixplugin/Makefile b/www/helixplugin/Makefile index 72e290792565..aa440330ee40 100644 --- a/www/helixplugin/Makefile +++ b/www/helixplugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= hxplugin PORTVERSION= 20070318 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www multimedia MASTER_SITES= http://virtual-estates.net/~mi/port-stuff/ @@ -17,16 +17,21 @@ COMMENT= Browser plugin for Real or Helix Players USE_BZIP2 = yes USE_DOS2UNIX = yes MAKEFILE = ${FILESDIR}/BSDmakefile -#USE_GECKO = firefox mozilla seamonkey xulrunner firefox-devel -USE_GECKO = ${_GECKO_ALL} +USE_GECKO = firefox mozilla seamonkey xulrunner MAKE_ENV += TOP="${WRKSRC}" GECKO=${GECKO} -PDIR ?= lib/browser_plugins +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=helix.so nphelix.xpt + +PDIR= ${WEBPLUGINS_DIR:S,${PREFIX}/,,} PLIST_FILES= ${PDIR}/helix.so ${PDIR}/nphelix.xpt +PLIST_DIRS= ${PDIR} do-install: - ${INSTALL_DATA} ${PLIST_FILES:S|${PDIR}|${WRKSRC}|} ${PREFIX}/${PDIR}/ + ${MKDIR} ${WEBPLUGINS_DIR} + ${INSTALL_DATA} ${WEBPLUGINS_FILES:S|^|${WRKSRC}/|} ${WEBPLUGINS_DIR}/ .include <bsd.port.pre.mk> .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" .include <bsd.port.post.mk> diff --git a/www/helixplugin/files/BSDmakefile b/www/helixplugin/files/BSDmakefile index b69e16a1145d..34db079ddb90 100644 --- a/www/helixplugin/files/BSDmakefile +++ b/www/helixplugin/files/BSDmakefile @@ -20,7 +20,7 @@ SRCS = hxbackend.cpp \ XPIDL ?= ${LOCALBASE}/lib/${GECKO}/xpidl XPTLINK ?= ${XPIDL:H}/xpt_link -SHARE_IDL != echo ${LOCALBASE}/share/idl/${GECKO:S/-devel/-2/}* +SHARE_IDL != echo ${LOCALBASE}/share/idl/${GECKO:S,firefox$,firefox-2,}* .PATH: ${TOP}/player/app/plugin ${TOP}/player/app/plugin/common diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 020d1c671082..21dd5873e51e 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-stable/www/mozilla/Makefile,v 1.22 2008/08/07 04:42:36 mezz Exp $ PORTNAME= mozilla PORTVERSION= 1.7.13 -PORTREVISION?= 8 +PORTREVISION?= 10 PORTEPOCH= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ @@ -129,14 +129,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 @@ -144,15 +136,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 87114cc7b898..b00e0e0eefb2 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-deinstall.in b/www/mozilla/pkg-deinstall.in index a7325eabd2da..ea9cd3dcb04a 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.11 2008/06/16 21:36:02 mezz Exp $ +# $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.13 2008/07/30 15:56:57 mezz Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in index 422ce3677545..6f787fe716a1 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-stable/www/mozilla/pkg-install.in,v 1.15 2008/08/04 05:01:00 mezz 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/mozplugger/Makefile b/www/mozplugger/Makefile index 76c95cec4738..303b68255479 100644 --- a/www/mozplugger/Makefile +++ b/www/mozplugger/Makefile @@ -7,6 +7,7 @@ PORTNAME= mozplugger PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://mozplugger.mozdev.org/files/ @@ -17,10 +18,21 @@ USE_XORG= x11 xt MAN7= mozplugger.7 SUB_FILES= pkg-message ALL_TARGET= freebsd +MAKE_ENV= WEBPLUGINS_DIR="${WEBPLUGINS_DIR}" + +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=mozplugger.so + +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" + +post-patch: + @${REINPLACE_CMD} -e 's|"/etc|"${PREFIX}/etc|g' \ + ${WRKSRC}/mozplugger.c post-install: @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/mozplugger/files/patch-Makefile b/www/mozplugger/files/patch-Makefile index cc4895a37280..a7383100fb67 100644 --- a/www/mozplugger/files/patch-Makefile +++ b/www/mozplugger/files/patch-Makefile @@ -49,7 +49,7 @@ - -@mkdir -p $(root)$(prefix)/lib/mozilla/plugins - -@mkdir -p $(root)$(prefix)/share/man/man7 - -@mkdir -p $(root)/etc -+ -@mkdir -p $(root)$(prefix)/lib/browser_plugins ++ -@mkdir -p $(root)${WEBPLUGINS_DIR} + -@mkdir -p $(root)$(prefix)/man/man7 + -@mkdir -p $(root)$(prefix)/etc cp mozplugger-helper $(root)$(prefix)/bin/ @@ -58,7 +58,7 @@ - cp mozplugger.so $(root)$(prefix)/lib/mozilla/plugins/ - cp mozpluggerrc $(root)/etc/ - cp mozplugger.7 $(root)$(prefix)/share/man/man7/ -+ cp mozplugger.so $(root)$(prefix)/lib/browser_plugins/ ++ cp mozplugger.so $(root)${WEBPLUGINS_DIR}/ + cp mozpluggerrc $(root)$(prefix)/etc/ + cp mozplugger.7 $(root)$(prefix)/man/man7/ diff --git a/www/mozplugger/pkg-plist b/www/mozplugger/pkg-plist index 0199c83042a1..a82f152c6df4 100644 --- a/www/mozplugger/pkg-plist +++ b/www/mozplugger/pkg-plist @@ -2,5 +2,5 @@ bin/mozplugger-controller bin/mozplugger-helper bin/mozplugger-linker etc/mozpluggerrc -lib/browser_plugins/mozplugger.so -@dirrmtry lib/browser_plugins +%%WEBPLUGINS_DIR%%/mozplugger.so +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile index 44b0d8b56f5a..9d765306a28c 100644 --- a/www/mplayer-plugin/Makefile +++ b/www/mplayer-plugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= mplayerplug-in PORTVERSION= 3.55 +PORTREVISION= 1 CATEGORIES= www multimedia MASTER_SITES= SF/mplayerplug-in @@ -18,7 +19,8 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer USE_GETTEXT= yes USE_GMAKE= yes USE_GECKO= firefox mozilla seamonkey -PLUGINSFILES= mplayerplug-in.so mplayerplug-in.xpt mplayerplug-in-wmp.so \ +USE_WEBPLUGINS= gecko* +WEBPLUGINS_FILES=mplayerplug-in.so mplayerplug-in.xpt mplayerplug-in-wmp.so \ mplayerplug-in-qt.so mplayerplug-in-rm.so \ mplayerplug-in-gmp.so mplayerplug-in-wmp.xpt \ mplayerplug-in-qt.xpt mplayerplug-in-rm.xpt \ @@ -32,7 +34,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBSD" \ USE_XORG= x11 xpm xt .include <bsd.port.pre.mk> -.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ @@ -43,9 +45,9 @@ post-patch: ${WRKSRC}/Source/plugin-setup.cpp do-install: - ${MKDIR} ${PREFIX}/lib/browser_plugins -.for moo in ${PLUGINSFILES} - ${INSTALL_DATA} ${WRKSRC}/${moo} ${PREFIX}/lib/browser_plugins + ${MKDIR} ${WEBPLUGINS_DIR} +.for moo in ${WEBPLUGINS_FILES} + ${INSTALL_DATA} ${WRKSRC}/${moo} ${WEBPLUGINS_DIR} .endfor ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \ ${PREFIX}/etc/mplayerplug-in.conf.dist diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist index 0e47a33e8ae8..3f36c2c2d9bd 100644 --- a/www/mplayer-plugin/pkg-plist +++ b/www/mplayer-plugin/pkg-plist @@ -2,18 +2,18 @@ etc/mplayerplug-in.conf.dist @unexec if cmp -s %D/etc/mplayerplug-in.types %D/etc/mplayerplug-in.types.dist; then rm -f %D/etc/mplayerplug-in.types; fi etc/mplayerplug-in.types.dist -lib/browser_plugins/mplayerplug-in-dvx.so -lib/browser_plugins/mplayerplug-in-dvx.xpt -lib/browser_plugins/mplayerplug-in-gmp.so -lib/browser_plugins/mplayerplug-in-gmp.xpt -lib/browser_plugins/mplayerplug-in-qt.so -lib/browser_plugins/mplayerplug-in-qt.xpt -lib/browser_plugins/mplayerplug-in-rm.so -lib/browser_plugins/mplayerplug-in-rm.xpt -lib/browser_plugins/mplayerplug-in-wmp.so -lib/browser_plugins/mplayerplug-in-wmp.xpt -lib/browser_plugins/mplayerplug-in.so -lib/browser_plugins/mplayerplug-in.xpt +%%WEBPLUGINS_DIR%%/mplayerplug-in-dvx.so +%%WEBPLUGINS_DIR%%/mplayerplug-in-dvx.xpt +%%WEBPLUGINS_DIR%%/mplayerplug-in-gmp.so +%%WEBPLUGINS_DIR%%/mplayerplug-in-gmp.xpt +%%WEBPLUGINS_DIR%%/mplayerplug-in-qt.so +%%WEBPLUGINS_DIR%%/mplayerplug-in-qt.xpt +%%WEBPLUGINS_DIR%%/mplayerplug-in-rm.so +%%WEBPLUGINS_DIR%%/mplayerplug-in-rm.xpt +%%WEBPLUGINS_DIR%%/mplayerplug-in-wmp.so +%%WEBPLUGINS_DIR%%/mplayerplug-in-wmp.xpt +%%WEBPLUGINS_DIR%%/mplayerplug-in.so +%%WEBPLUGINS_DIR%%/mplayerplug-in.xpt share/locale/cs/LC_MESSAGES/mplayerplug-in.mo share/locale/da/LC_MESSAGES/mplayerplug-in.mo share/locale/de/LC_MESSAGES/mplayerplug-in.mo @@ -34,7 +34,7 @@ share/locale/sk/LC_MESSAGES/mplayerplug-in.mo share/locale/tr/LC_MESSAGES/mplayerplug-in.mo share/locale/wa/LC_MESSAGES/mplayerplug-in.mo share/locale/zh_CN/LC_MESSAGES/mplayerplug-in.mo -@dirrmtry lib/browser_plugins +@dirrmtry %%WEBPLUGINS_DIR%% @dirrmtry share/locale/se/LC_MESSAGES @dirrmtry share/locale/se @dirrmtry share/locale/en_US/LC_MESSAGES diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index dafe6038c952..a8fc43b06a25 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -7,7 +7,7 @@ PORTNAME= openvrml PORTVERSION= 0.17.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -38,7 +38,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_GECKO= firefox seamonkey -PLIST_SUB= PLUGINS_DIR=${BROWSER_PLUGINS_DIR:S|^${LOCALBASE}/||} +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=openvrml.so .if !defined(NOPORTDOCS) PORTDOCS= * @@ -46,6 +47,7 @@ PORTDOCS= * .include <bsd.port.pre.mk> .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" .if ${OSVERSION} < 700042 BROKEN= Does not compile @@ -79,7 +81,7 @@ pre-configure: "/hardcode_libdir_flag_spec/s|\(=.\)\(.*\)\(\$$libdir\)|& \2${JAVA_HOME}/jre/lib/${ARCH}/client|" \ ${WRKSRC}/${cfg} .endfor - ${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${BROWSER_PLUGINS_DIR}|' \ + ${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${WEBPLUGINS_DIR}|' \ ${WRKSRC}/mozilla-plugin/src/Makefile.in .if ${GECKO} != "firefox" ${REINPLACE_CMD} -e "s|FIREFOX_JS|${GECKO:U}_JS|g;s|firefox-js|${GECKO}-js|" \ diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist index 5c6e7f8a7b21..6a4633704938 100644 --- a/www/openvrml/pkg-plist +++ b/www/openvrml/pkg-plist @@ -43,8 +43,8 @@ lib/libopenvrml-gl.so.7 lib/libopenvrml.a lib/libopenvrml.so lib/libopenvrml.so.8 -%%PLUGINS_DIR%%/openvrml.la -%%PLUGINS_DIR%%/openvrml.so +%%WEBPLUGINS_DIR%%/openvrml.la +%%WEBPLUGINS_DIR%%/openvrml.so libdata/pkgconfig/openvrml-gl.pc libdata/pkgconfig/openvrml.pc libexec/openvrml-xembed @@ -69,6 +69,7 @@ libexec/openvrml-xembed share/openvrml-player/glade/openvrml-player.glade @dirrm share/openvrml-player/glade @dirrm share/openvrml-player +@dirrmtry %%WEBPLUGINS_DIR%% @dirrm include/openvrml/openvrml/gl @dirrm include/openvrml/openvrml @dirrm include/openvrml diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile index 7a2189607222..e0abdf804029 100644 --- a/www/opera-devel/Makefile +++ b/www/opera-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= opera PORTVERSION= ${OPERA_VER} +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://snapshot.opera.com/${MASTER_SITES_VER_PATH}/ \ http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/ @@ -42,7 +43,7 @@ ONLY_FOR_ARCHS= i386 amd64 .if ${OSVERSION} >= 700000 OPERA_TYPE= 7 -.else +.else OPERA_TYPE= 6 .endif @@ -50,6 +51,10 @@ OPERA_TYPE= 6 LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell .endif +post-patch: + @${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/opera-devel|g' \ + ${WRKSRC}/usr/local/share/opera/ini/pluginpath.ini + do-install: @(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX} --docdir=${DOCSDIR} --sharedir=${DATADIR} --exec_prefix=${DATADIR}/bin --plugindir=${DATADIR}/plugins) @${CP} ${DATADIR}/bin/operapluginwrapper ${DATADIR}/bin/operapluginwrapper.freebsd diff --git a/www/opera/Makefile b/www/opera/Makefile index 3f7c8dec21a8..d9e8caddeb9b 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -7,6 +7,7 @@ PORTNAME= opera PORTVERSION= ${OPERA_VER}.${OPERA_DATE} +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \ ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \ @@ -69,6 +70,10 @@ OPERA_TYPE= 6 LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell .endif +post-patch: + @${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${LOCALBASE}/lib/browser_plugins/symlinks/opera|g' \ + ${WRKSRC}/usr/local/share/opera/ini/pluginpath.ini + do-install: @(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX} --docdir=${DOCSDIR} --sharedir=${DATADIR} --exec_prefix=${DATADIR}/bin --plugindir=${DATADIR}/plugins) @${CP} ${DATADIR}/bin/operapluginwrapper ${DATADIR}/bin/operapluginwrapper.freebsd diff --git a/www/plugger/Makefile b/www/plugger/Makefile index 793a4f9e469d..cf546ef27840 100644 --- a/www/plugger/Makefile +++ b/www/plugger/Makefile @@ -7,7 +7,7 @@ PORTNAME= plugger PORTVERSION= 5.1.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www audio graphics multimedia MASTER_SITES= http://fredrik.hubbe.net/plugger/ @@ -20,7 +20,11 @@ GNU_CONFIGURE= yes MAN7= plugger.7 PKGDEINSTALL= ${PKGINSTALL} +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=npplugger.so + .include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" post-patch: @${REINPLACE_CMD} -e \ @@ -39,9 +43,9 @@ do-install: ${PREFIX}/bin @${INSTALL_SCRIPT} ${WRKSRC}/plugger-oohelper \ ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/browser_plugins + @${MKDIR} ${WEBPLUGINS_DIR} @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ - ${PREFIX}/lib/browser_plugins/npplugger.so + ${WEBPLUGINS_DIR}/npplugger.so @if [ -f ${PREFIX}/etc/pluggerrc-${PORTVERSION} ]; then \ ${MV} ${PREFIX}/etc/pluggerrc-${PORTVERSION} \ ${PREFIX}/etc/pluggerrc-${PORTVERSION}.old; \ diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist index 2974fb3c4e8c..75689318588e 100644 --- a/www/plugger/pkg-plist +++ b/www/plugger/pkg-plist @@ -3,5 +3,5 @@ bin/plugger-controller bin/plugger-oohelper @unexec if cmp %D/etc/pluggerrc-5.1.3.sample %D/etc/pluggerrc-5.1.3 2>/dev/null; then rm -f %D/etc/pluggerrc-5.1.3; fi etc/pluggerrc-5.1.3.sample -lib/browser_plugins/npplugger.so -@dirrmtry lib/browser_plugins +%%WEBPLUGINS_DIR%%/npplugger.so +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 0fd7441d7342..e5b2214edf31 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,12 +3,12 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/seamonkey/Makefile,v 1.48 2007/12/28 17:39:30 mezz Exp $ +# $MCom: ports-stable/www/seamonkey/Makefile,v 1.9 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= seamonkey DISTVERSION= 1.1.14 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} @@ -105,29 +105,12 @@ post-patch: ${WRKDIR}/seamonkey.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 ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${CP} ${WRKSRC}/suite/branding/icons/gtk/default.xpm \ ${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/ 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}/seamonkey.desktop ${PREFIX}/share/applications diff --git a/www/seamonkey/files/patch-build_unix_run-mozilla.sh b/www/seamonkey/files/patch-build_unix_run-mozilla.sh index 6d8cb15859a2..17288b12b27e 100644 --- a/www/seamonkey/files/patch-build_unix_run-mozilla.sh +++ b/www/seamonkey/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}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} ++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${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/seamonkey +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 0fd7441d7342..e5b2214edf31 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -3,12 +3,12 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/seamonkey/Makefile,v 1.48 2007/12/28 17:39:30 mezz Exp $ +# $MCom: ports-stable/www/seamonkey/Makefile,v 1.9 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= seamonkey DISTVERSION= 1.1.14 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} @@ -105,29 +105,12 @@ post-patch: ${WRKDIR}/seamonkey.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 ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${CP} ${WRKSRC}/suite/branding/icons/gtk/default.xpm \ ${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/ 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}/seamonkey.desktop ${PREFIX}/share/applications diff --git a/www/seamonkey2/files/patch-build_unix_run-mozilla.sh b/www/seamonkey2/files/patch-build_unix_run-mozilla.sh index 6d8cb15859a2..17288b12b27e 100644 --- a/www/seamonkey2/files/patch-build_unix_run-mozilla.sh +++ b/www/seamonkey2/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}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} ++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${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/seamonkey +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] diff --git a/www/sidplug/Makefile b/www/sidplug/Makefile index 0951e2bcd457..8f5bad5aedcd 100644 --- a/www/sidplug/Makefile +++ b/www/sidplug/Makefile @@ -7,7 +7,7 @@ PORTNAME= sidplug PORTVERSION= 1.1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www audio MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ EXTRACT_SUFX= .tgz @@ -20,15 +20,19 @@ RUN_DEPENDS= xsidplay:${PORTSDIR}/audio/xsidplay MAKE_ARGS= CC="${CC}" OPTIMIZER="${CFLAGS} -I${LOCALBASE}/include" USE_XORG= x11 +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=npsidplug.so + .include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif do-install: - @${MKDIR} ${PREFIX}/lib/browser_plugins - @${INSTALL_PROGRAM} ${WRKSRC}/npsidplug.so ${PREFIX}/lib/browser_plugins + @${MKDIR} ${WEBPLUGINS_DIR} + @${INSTALL_PROGRAM} ${WRKSRC}/npsidplug.so ${WEBPLUGINS_DIR} @${LN} -sf ${LOCALBASE}/bin/xsidplay ${PREFIX}/bin/sidplug .ifndef(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} diff --git a/www/sidplug/pkg-plist b/www/sidplug/pkg-plist index 099e3f49c611..b396c5e001d7 100644 --- a/www/sidplug/pkg-plist +++ b/www/sidplug/pkg-plist @@ -1,7 +1,7 @@ bin/sidplug -lib/browser_plugins/npsidplug.so +%%WEBPLUGINS_DIR%%/npsidplug.so %%PORTDOCS%%share/examples/sidplug/Lazy_Fast.sid %%PORTDOCS%%share/examples/sidplug/README.html %%PORTDOCS%%share/examples/sidplug/sidplug.png %%PORTDOCS%%@dirrm share/examples/sidplug -@dirrmtry lib/browser_plugins/ +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index 7779a76ab70a..af9a85317e91 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= swfdec-plugin PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec-mozilla/0.6/ DISTNAME= swfdec-mozilla-${PORTVERSION} @@ -18,8 +18,13 @@ COMMENT= Flash rendering plugin LIB_DEPENDS= swfdec-0.6:${PORTSDIR}/graphics/swfdec USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS= --with-plugin-dir="${PREFIX}/lib/browser_plugins" +CONFIGURE_ARGS= --with-plugin-dir="${WEBPLUGINS_DIR}" USE_LDCONFIG= yes -.include <bsd.port.mk> +USE_WEBPLUGINS= gecko* +WEBPLUGINS_FILES=libswfdecmozilla.so + +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" +.include <bsd.port.post.mk> diff --git a/www/swfdec-plugin/pkg-plist b/www/swfdec-plugin/pkg-plist index 30f2c911497f..ffed0eed5a40 100644 --- a/www/swfdec-plugin/pkg-plist +++ b/www/swfdec-plugin/pkg-plist @@ -1,4 +1,4 @@ -lib/browser_plugins/libswfdecmozilla.a -lib/browser_plugins/libswfdecmozilla.la -lib/browser_plugins/libswfdecmozilla.so -@dirrmtry lib/browser_plugins +%%WEBPLUGINS_DIR%%/libswfdecmozilla.a +%%WEBPLUGINS_DIR%%/libswfdecmozilla.la +%%WEBPLUGINS_DIR%%/libswfdecmozilla.so +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/ump/Makefile b/www/ump/Makefile index bc43e56634f8..a522abb51e79 100644 --- a/www/ump/Makefile +++ b/www/ump/Makefile @@ -7,7 +7,7 @@ PORTNAME= ump PORTVERSION= 1.10 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:timidity/} \ http://www.geocities.com/SiliconValley/Lab/2826/1-10/:ump \ @@ -51,10 +51,14 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xpf - --exclude '*/libarc/*' \ --exclude '*/utils/mblock.h' --exclude '*/utils/memb.h' ALL_TARGET= ump +USE_WEBPLUGINS= native +WEBPLUGINS_FILES=ump.so + # USE_MOTIF= yes # CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}" .include <bsd.port.pre.mk> +.include "${PORTSDIR}/www/firefox/Makefile.webplugins" .if ${HAVE_GNOME:Mesound}!="" USE_GNOME= esound @@ -82,7 +86,7 @@ post-configure: @cd ${WRKSRC}; ${SETENV} CONFIG_HEADERS='' CONFIG_FILES=ump/Makefile ${SH} ./config.status do-install: - ${MKDIR} ${PREFIX}/lib/browser_plugins - ${INSTALL_PROGRAM} ${WRKSRC}/ump/ump.so ${PREFIX}/lib/browser_plugins + ${MKDIR} ${WEBPLUGINS_DIR} + ${INSTALL_DATA} ${WRKSRC}/ump/ump.so ${WEBPLUGINS_DIR} .include <bsd.port.post.mk> diff --git a/www/ump/pkg-plist b/www/ump/pkg-plist index fd50f1c0a322..410e385730a1 100644 --- a/www/ump/pkg-plist +++ b/www/ump/pkg-plist @@ -1,2 +1,2 @@ -lib/browser_plugins/ump.so -@dirrmtry lib/browser_plugins +%%WEBPLUGINS_DIR%%/ump.so +@dirrmtry %%WEBPLUGINS_DIR%% diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile index 959696004f90..0e859ea2c479 100644 --- a/www/xulrunner/Makefile +++ b/www/xulrunner/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/xulrunner/Makefile,v 1.15 2007/12/28 17:39:31 mezz Exp $ +# $MCom: ports-stable/www/xulrunner/Makefile,v 1.3 2008/08/07 04:42:36 mezz Exp $ # PORTNAME= xulrunner PORTVERSION= 1.8.0.4 -PORTREVISION?= 12 +PORTREVISION?= 14 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ diff --git a/www/xulrunner/files/patch-build_unix_run-mozilla.sh b/www/xulrunner/files/patch-build_unix_run-mozilla.sh index 6d8cb15859a2..24f45c913f8e 100644 --- a/www/xulrunner/files/patch-build_unix_run-mozilla.sh +++ b/www/xulrunner/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}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} ++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/xulrunner:${MOZ_DIST_BIN}/plugins:${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/xulrunner +export MOZ_PLUGIN_PATH if [ $moz_debug -eq 1 ] |