diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-29 05:09:25 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-29 05:09:25 +0800 |
commit | 2938ac4ae47b808c37d1f7b25b63be737d209977 (patch) | |
tree | ee5a30bcfa158368ea9b8f0e4397bd1e3bd2e060 | |
parent | 0548d2fabe9c0c71f7bdd2e375676b4101d9588d (diff) | |
download | marcuscom-ports-experimental-2938ac4ae47b808c37d1f7b25b63be737d209977.tar.gz marcuscom-ports-experimental-2938ac4ae47b808c37d1f7b25b63be737d209977.tar.zst marcuscom-ports-experimental-2938ac4ae47b808c37d1f7b25b63be737d209977.zip |
Sync w/ FreeBSD ports and fix bug of MOZ_OPTIONS by merge two into one.
git-svn-id: svn://creme-brulee.marcuscom.com/ports-experimental/trunk@17403 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | www/firefox-devel/Makefile | 10 | ||||
-rw-r--r-- | www/firefox/Makefile | 9 |
2 files changed, 11 insertions, 8 deletions
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index d8befbc..2078be1 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -3,10 +3,11 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-experimental/www/firefox-devel/Makefile,v 1.7 2007/11/20 14:26:27 ahze Exp $ +# $MCom: ports-experimental/www/firefox-devel/Makefile,v 1.8 2008/02/23 15:51:24 ahze Exp $ PORTNAME= firefox DISTVERSION= 3.0b3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -22,8 +23,6 @@ USE_MOZILLA= -png MOZILLA_NAME= Firefox-${MOZILLA_SUFX} MOZILLA_SUFX= -devel MOZILLA= ${PORTNAME}${MOZILLA_SUFX} -MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --enable-svg --enable-svg-renderer=cairo MOZ_TOOLKIT= cairo-gtk2 WANT_GNOME= yes @@ -37,7 +36,10 @@ NO_MOZPKGINSTALL=yes FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/firefox-devel/chrome/icons/default/default.xpm -MOZ_OPTIONS= --enable-application=browser \ +MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ + --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ + --enable-svg --enable-svg-renderer=cairo + --enable-application=browser \ --enable-system-cairo \ --enable-official-branding \ --enable-canvas \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index ff3498a..70877db 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,12 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-experimental/www/firefox/Makefile,v 1.2 2007/12/03 21:01:20 ahze Exp $ +# $MCom: ports-experimental/www/firefox/Makefile,v 1.3 2008/02/23 04:29:58 ahze Exp $ # PORTNAME= firefox DISTVERSION= 2.0.0.12 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} @@ -21,7 +21,6 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nss>=3.11.2:${PORTSDIR}/security/nss MOZILLA_NAME= Firefox -MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' USE_GECKO= gecko WANT_GNOME= yes @@ -38,7 +37,9 @@ GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/ FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --enable-application=browser \ +MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ + --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ + --enable-application=browser \ --enable-system-cairo \ --enable-official-branding \ --enable-canvas \ |