diff options
author | marcus <marcus@FreeBSD.org> | 2004-06-19 08:51:17 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-06-19 08:51:17 +0800 |
commit | 66fa69b7d4a74a486a3a4589c076870fc23809ff (patch) | |
tree | 1eb917b40cb680e1db824e84e27fb653ba4a0e70 /www/firefox36 | |
parent | 3a4bbe1da1eb873df438fa2347b0fddd4d1df0c7 (diff) | |
download | freebsd-ports-gnome-66fa69b7d4a74a486a3a4589c076870fc23809ff.tar.gz freebsd-ports-gnome-66fa69b7d4a74a486a3a4589c076870fc23809ff.tar.zst freebsd-ports-gnome-66fa69b7d4a74a486a3a4589c076870fc23809ff.zip |
* Try a little harder to get firefox to work without first running as root
* Make sure optimized CFLAGS are actually respected [1]
* Frobnicate the mozconfig file a little bit to be more inline with typical
Linux builds
* Try a safer hack to ensure the install completes okay
Reported by: kris [1]
Diffstat (limited to 'www/firefox36')
-rw-r--r-- | www/firefox36/Makefile | 18 | ||||
-rw-r--r-- | www/firefox36/files/mozconfig.in | 20 | ||||
-rw-r--r-- | www/firefox36/pkg-install.in | 11 |
3 files changed, 24 insertions, 25 deletions
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index ec944c9ba17b..6c77fb3bc839 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -7,7 +7,7 @@ PORTNAME= firefox PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} @@ -57,10 +57,6 @@ OPTIONS= DEBUG "Build a debugging image" off \ .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" -CONFIGURE_ENV+= WITH_REORDER=yes -.endif # ${ARCH} == "i386" - .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes @@ -68,6 +64,9 @@ CONFIGURE_ENV+= WITH_DEBUG=yes .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 +CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 +.else +CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) @@ -137,10 +136,11 @@ pre-configure: fi post-build: - # XXX This works around an install problem that is triggered when - # toolkit/profile/src is built after profile/src. - @(cd ${WRKSRC}/dist/lib && ${LN} -sf ../../profile/src/libprofile_s.a \ - .) +# XXX This works around an install problem that is triggered when +# toolkit/profile/src is built after profile/src. +# @(cd ${WRKSRC}/dist/lib && ${LN} -sf ../../profile/src/libprofile_s.a \ +# .) + @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in index df281d3a3ca8..68a01ee39874 100644 --- a/www/firefox36/files/mozconfig.in +++ b/www/firefox36/files/mozconfig.in @@ -6,7 +6,6 @@ export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 ac_add_options --enable-crypto ac_add_options --disable-tests -ac_add_options --disable-debug ac_add_options --disable-mailnews ac_add_options --disable-composer ac_add_options --enable-default-toolkit=gtk2 @@ -42,25 +41,22 @@ ac_add_options --disable-ldap ac_add_options --disable-pedantic ac_add_options --disable-profilesharing ac_add_options --disable-installer -ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector +ac_add_options --enable-image-decoders=png,gif,jpeg,bmp +ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector,venkman ###################################################################### # conditional from port Makefile -if test -n "$WITH_REORDER"; then - ac_add_options --enable-reorder -else - ac_add_options --disable-reorder -fi # test -n "$WITH_REORDER" +#if test -n "$WITH_REORDER"; then +# ac_add_options --enable-reorder +#else +# ac_add_options --disable-reorder +#fi # test -n "$WITH_REORDER" if test -n "$WITH_DEBUG"; then ac_add_options --enable-debug ac_add_options --disable-strip else ac_add_options --disable-debug - ac_add_options --enable-optimize + ac_add_options --enable-optimize=${WITH_OPTIMIZE} ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 fi # test -n "$WITH_DEBUG" if test -n "$WITH_LOGGING"; then ac_add_options --enable-logging diff --git a/www/firefox36/pkg-install.in b/www/firefox36/pkg-install.in index 958ace50d56f..a39e85bff19f 100644 --- a/www/firefox36/pkg-install.in +++ b/www/firefox36/pkg-install.in @@ -23,9 +23,12 @@ mkdir -p ${MOZDIR}/chrome/overlayinfo rm -f ${MOZDIR}/component.reg rm -rf ${MOZDIR}/extensions -LD_LIBRARY_PATH=${MOZDIR} MOZILLA_FIVE_HOME=${MOZDIR} ${REGXPCOM} || true -LD_LIBRARY_PATH=${MOZDIR} MOZILLA_FIVE_HOME=${MOZDIR} ${REGCHROME} || true -touch ${MOZDIR}/chrome/user-skins.rdf ${MOZDIR}/chrome/user-locales.rdf -cp -rp ${MOZDIR}/defaults/profile/extensions ${MOZDIR} +cd ${MOZDIR} || exit 1 +./run-mozilla.sh ${REGXPCOM} || true +./run-mozilla.sh ${REGCHROME} || true +mkdir -p ${MOZDIR}/extensions +cp -p ${MOZDIR}/defaults/profile/extensions/Extensions.rdf ${MOZDIR}/extensions +cp -p ${MOZDIR}/defaults/profile/extensions/installed-extensions.txt \ + ${MOZDIR}/extensions/installed-extensions-processed.txt exit 0 |