diff options
-rw-r--r-- | www/firefox/Makefile | 16 | ||||
-rw-r--r-- | www/firefox10/Makefile | 16 | ||||
-rw-r--r-- | www/mozilla/bsd.gecko.mk | 7 | ||||
-rw-r--r-- | www/seamonkey/Makefile | 18 |
4 files changed, 31 insertions, 26 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 1e338a396..d0bd34771 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,20 +3,20 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.24 2005/11/23 16:10:42 marcus Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.25 2005/11/23 16:13:15 marcus Exp $ # -PORTNAME= firefox +PORTNAME?= firefox DISTVERSION= 1.5rc3 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}-source +DISTNAME= firefox-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla +COMMENT?= Web browser based on the browser portion of Mozilla USE_X_PREFIX= yes WANT_GNOME= yes @@ -30,16 +30,16 @@ USE_GCC= 3.4+ FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --enable-application=browser \ +MOZ_OPTIONS?= --enable-application=browser \ --enable-svg-renderer=cairo \ --enable-system-cairo \ --enable-official-branding \ --enable-canvas SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome +MOZ_PIS_SCRIPTS?= moz_pis_S50cleanhome -OPTIONS= NEWTAB "Open external links in a new tab" on \ +OPTIONS?= NEWTAB "Open external links in a new tab" on \ SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> @@ -53,6 +53,7 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif +.if !defined(GECKO_SLAVEPORT) post-extract:: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop @@ -99,5 +100,6 @@ post-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} +.endif # if !defined(GECKO_SLAVEPORT) .include <bsd.port.post.mk> diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 1e338a396..d0bd34771 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -3,20 +3,20 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.24 2005/11/23 16:10:42 marcus Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.25 2005/11/23 16:13:15 marcus Exp $ # -PORTNAME= firefox +PORTNAME?= firefox DISTVERSION= 1.5rc3 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}-source +DISTNAME= firefox-${DISTVERSION}-source MAINTAINER= gnome@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla +COMMENT?= Web browser based on the browser portion of Mozilla USE_X_PREFIX= yes WANT_GNOME= yes @@ -30,16 +30,16 @@ USE_GCC= 3.4+ FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --enable-application=browser \ +MOZ_OPTIONS?= --enable-application=browser \ --enable-svg-renderer=cairo \ --enable-system-cairo \ --enable-official-branding \ --enable-canvas SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome +MOZ_PIS_SCRIPTS?= moz_pis_S50cleanhome -OPTIONS= NEWTAB "Open external links in a new tab" on \ +OPTIONS?= NEWTAB "Open external links in a new tab" on \ SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> @@ -53,6 +53,7 @@ IGNORE= core dumps on alpha during post-build EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl .endif +.if !defined(GECKO_SLAVEPORT) post-extract:: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop @@ -99,5 +100,6 @@ post-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} +.endif # if !defined(GECKO_SLAVEPORT) .include <bsd.port.post.mk> diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index 84eed7b6d..4a0178cf5 100644 --- a/www/mozilla/bsd.gecko.mk +++ b/www/mozilla/bsd.gecko.mk @@ -2,7 +2,7 @@ # ex:ts=4 # # $FreeBSD$ -# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.4 2005/11/27 00:40:05 ahze Exp $ +# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.5 2005/11/27 22:55:18 ahze Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -37,10 +37,9 @@ Mozilla_Pre_Include= bsd.mozilla.mk # WITH_GECKO= mozilla firefox seamonkey # -_GECKO_ALL= firefox firefox-devel mozilla nvu \ - seamonkey sunbird thunderbird +_GECKO_ALL= firefox mozilla nvu seamonkey sunbird thunderbird xulrunner -_NEW_GCC_GECKO= firefox firefox-devel seamonkey sunbird +_NEW_GCC_GECKO= firefox seamonkey sunbird xulrunner sunbird_PORTSDIR= deskutils diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 8ffe667dc..702fc0049 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/seamonkey/Makefile,v 1.32 2005/11/22 21:29:16 ahze Exp $ +# $MCom: ports/www/seamonkey/Makefile,v 1.33 2005/11/23 04:54:59 ahze Exp $ # PORTNAME?= seamonkey @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze #MASTER_SITES= ${MASTER_SITE_MOZILLA} #MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} -DISTNAME= ${PORTNAME}-${DISTVERSION}.source +DISTNAME= seamonkey-${DISTVERSION}.source MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser @@ -24,19 +24,19 @@ WANT_GNOME= yes HAS_CONFIGURE= yes ALL_TARGET= default USE_X_PREFIX= yes -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome +MOZ_PIS_SCRIPTS?= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -MOZ_EXTENSIONS= default -MOZ_OPTIONS+= --enable-application=suite \ +MOZ_EXTENSIONS?= default +MOZ_OPTIONS?= --enable-application=suite \ --enable-svg-renderer=cairo \ --enable-system-cairo -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite +MOZ_MK_OPTIONS?= MOZ_CO_PROJECT=suite -OPTIONS=MAILNEWS "Enable Mail and News modules" on \ +OPTIONS?=MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ @@ -45,7 +45,7 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \ .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) +.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) && !defined(GECKO_SLAVEPORT) # Glitz support can only be enabled if cairo is built with glitz support MOZ_OPTIONS+= --enable-glitz LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz @@ -59,6 +59,7 @@ IGNORE= core dumps on ${ARCH} during post-build USE_GCC= 3.4+ .endif +.if !defined(GECKO_SLAVEPORT) .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else @@ -127,6 +128,7 @@ do-install: fi ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications +.endif # if defined(GECKO_SLAVEPORT) .include "${.CURDIR}/../mozilla/Makefile.common" .include <bsd.port.post.mk> |