kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Fix broken installation (grrr..this fake thing is more trouble than it's

Browse source 
worth)
* Fix up some path issues in the Makefile
* Minor fix to plug-in installation
* Restore Franz's fix for the LD_LIBRARY_PATH PREFIX problem
* Bump PORTREVISION
This commit is contained in:
Joe Marcus Clarke 2004-02-11 19:30:49 +00:00
parent 89ac018b6f
commit 15e0c52fd1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=100706
18 changed files with 234 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
www/firefox-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox-devel/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox-esr/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox-esr/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox10/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox10/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox15/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox15/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox3-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox35/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox35/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/firefox36/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/firefox36/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then

22
www/flock/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firefox
PORTVERSION= 0.8
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}
@ -33,7 +33,7 @@ ESD_LIB= libesd.so.2
LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME}
NO_MTREE= yes
PLIST= ${WRKDIR}/plist
PLUGINSDIR= ${PREFIX}lib/browser_plugins
PLUGINSDIR= ${PREFIX}/lib/browser_plugins
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gtk20 libidl
@ -99,7 +99,7 @@ post-extract::
-e 's|@LIBS@|${LIBS}|' \
-e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
-e 's|@PREFIX@|${PREFIX}/lib/firefox|' \
-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \
-e 's|@PERL@|${PERL5}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
@ -123,7 +123,8 @@ post-patch:
pre-install:
@${RM} -rf ${FAKEDIR} ${PLIST}
@${MKDIR} ${FAKEDIR} ${FAKEDIR}/lib/browser_plugins
@${MKDIR} ${FAKEDIR}/lib/browser_plugins
@${TOUCH} ${PLIST}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
Makefile ${MAKE_ARGS} install
.if !defined (WITH_HEADERS)
@ -132,7 +133,7 @@ pre-install:
.for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS}
@${ECHO_CMD} bin/${ii} >> ${PLIST}
.endfor
@cd ${FAKEDIR}; ${FIND} * ! -type d | ${SORT} >>${PLIST}; \
@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} | ${SED} -e \
"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \
@ -150,16 +151,19 @@ post-install:
.for ii in f F
${RM} -f ${PREFIX}/bin/${ii}irefox
${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/${ii}irefox
.endfor
${RM} -f ${PREFIX}/bin/firefox-config
${LN} -sf ${LOCAL_PREFIX}/bin/mozilla-config \
${PREFIX}/bin/firefox-config
${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config
${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \
's|${FAKEDIR}|${PREFIX}|g'
-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 ; \
${LN} -sf $${jpi} \
${PLUGINSDIR}/libjavaplugin_oji.so ; \
break; \
fi; \
done; \

16
www/flock/files/patch-build_unix_run-mozilla.sh
View file

@ -1,13 +1,23 @@
$FreeBSD$
--- build/unix/run-mozilla.sh.orig Mon Feb 9 19:25:14 2004
+++ build/unix/run-mozilla.sh Mon Feb 9 21:18:11 2004
--- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003
+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004
@@ -355,7 +355,7 @@
fi
##
## 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:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_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"}
@@ -442,6 +442,9 @@
#
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
+export MOZ_PLUGIN_PATH
if [ $moz_debug -eq 1 ]
then