- Back out of last commit for slave ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5236 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 22 insertions, 28 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index d0bd34771..b3e8c056c 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.25 2005/11/23 16:13:15 marcus Exp $
+#   $MCom$
 #
 
-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=	firefox-${DISTVERSION}-source
+DISTNAME=	${PORTNAME}-${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,7 +53,6 @@ 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
@@ -100,6 +99,5 @@ 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 d0bd34771..b3e8c056c 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.25 2005/11/23 16:13:15 marcus Exp $
+#   $MCom$
 #
 
-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=	firefox-${DISTVERSION}-source
+DISTNAME=	${PORTNAME}-${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,7 +53,6 @@ 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
@@ -100,6 +99,5 @@ 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/seamonkey/Makefile b/www/seamonkey/Makefile
index 702fc0049..8761e953b 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.33 2005/11/23 04:54:59 ahze Exp $
+#    $MCom$
 #
 
 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=	seamonkey-${DISTVERSION}.source
+DISTNAME=	${PORTNAME}-${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) && !defined(GECKO_SLAVEPORT)
+.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
 # 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,7 +59,6 @@ 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
@@ -128,7 +127,6 @@ 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>