[SVN-Commit] r438 - branches/experimental/Mk trunk/Mk

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Mon Nov 22 18:13:00 UTC 2010 

Author: beat
Date: Mon Nov 22 18:12:53 2010
New Revision: 438

Log:
- Remove obsolete gecko providers
- Change gecko master port from www/mozilla to www/seamonkey
- Respect STRIP to allow for debugging builds [1]

PR:		ports/152043 [1]
Submitted by:	Anonymous <swell.k AT gmail.com> [1]

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   trunk/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Mon Nov 22 18:09:24 2010	(r437)
+++ branches/experimental/Mk/bsd.gecko.mk	Mon Nov 22 18:12:53 2010	(r438)
@@ -122,7 +122,7 @@
 # WITH_GECKO=	libxul
 #
 # The valid backends are:
-# libxul seamonkey thunderbird
+# libxul seamonkey
 #
 # See below for more details.
 # ======================= /USERS ================================
@@ -144,9 +144,8 @@
 
 # Users should use the following syntax:
 #
-# WITH_GECKO= libxul seamonkey thunderbird
-#  Use libxul whenever a port supports it, falling back on seamonkey and
-#  then thunderbird.
+# WITH_GECKO= libxul seamonkey
+#  Use libxul whenever a port supports it, falling back on seamonkey.
 # WITH_GECKO= libxul
 #  Sets your preferred backend. With this example, libxul will always
 #  be chosen, unless the port doesn't support a libxul backend. In that
@@ -156,19 +155,18 @@
 #
 # Ports should use the following:
 #
-# USE_GECKO= libxul seamonkey thunderbird
+# USE_GECKO= libxul seamonkey
 #  The list of gecko backends that the port supports. Unless the user
 #  overrides it with WITH_GECKO, the first gecko listed in USE_GECKO
 #  will be the default. In the above example, www/libxul will be used
-#  as a gecko backend unless WITH_GECKO=seamonkey or WITH_GECKO=thunderbird
-#  is defined by the user.
+#  as a gecko backend unless WITH_GECKO=seamonkey is defined by the user.
 #
 # USE_GECKO= libxul-devel<->libxul
 #  This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure 
 #  if ${GECKO}=="libxul-devel"
 #
 #  Example:
-#  USE_GECKO= libxul seamonkey thunderbird
+#  USE_GECKO= libxul seamonkey
 #  
 #  post-patch:
 #	@${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
@@ -178,7 +176,7 @@
 #  has been chosen.
 #
 #  Example:
-#  USE_GECKO= libxul seamonkey thunderbird
+#  USE_GECKO= libxul seamonkey
 #  
 #  post-patch:
 #  .if ${GECKO}=="seamonkey"
@@ -186,9 +184,8 @@
 #		${MOZSRC}/configure
 #  .endif
 
-_GECKO_ALL=	seamonkey thunderbird libxul
+_GECKO_ALL=	seamonkey libxul
 
-thunderbird_PORTSDIR=	mail
 libxul_PLIST=		${LOCALBASE}/lib/libxul/libxul.so
 
 .for gecko in ${_GECKO_ALL}
@@ -370,7 +367,7 @@
 PLIST?=		${WRKDIR}/plist
 PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
-MASTER_DIR?=	${.CURDIR}/../../www/mozilla
+MASTER_DIR?=	${.CURDIR}/../../www/seamonkey
 
 KRB5_HOME?=	/usr
 MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
@@ -378,14 +375,14 @@
 ESD_LIB?=	libesd.so.2
 FREETYPE_LIB?=	libfreetype.so.9
 
-GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in
+GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/seamonkey/files/mozconfig-generic.in
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin include lib share/idl
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 PKGINSTALL?=	${WRKDIR}/pkg-install
 PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
-MASTER_MOZDIR?=	${PORTSDIR}/www/mozilla
+MASTER_MOZDIR?=	${PORTSDIR}/www/seamonkey
 PKGINSTALL_INC?=	${MASTER_MOZDIR}/pkg-install.in
 PKGDEINSTALL_INC?=	${MASTER_MOZDIR}/pkg-deinstall.in
 
@@ -525,14 +522,16 @@
 MOZ_OPTIONS+=	--disable-gnomevfs
 .endif
 
+.if !defined(STRIP) || ${STRIP} == ""
+MOZ_OPTIONS+=	--disable-strip --disable-install-strip
+.endif
+
 .if defined(WITH_DEBUG)
-MOZ_OPTIONS+=	--enable-debug				\
-		--disable-strip
+MOZ_OPTIONS+=	--enable-debug
 WITH_LOGGING=	yes
 .else
 MOZ_OPTIONS+=	--disable-debug				\
-		--enable-optimize=${WITH_OPTIMIZE}	\
-		--enable-strip
+		--enable-optimize=${WITH_OPTIMIZE}
 .endif
 
 .if defined(WITH_JAVA) && defined(_WITH_JAVA)

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Mon Nov 22 18:09:24 2010	(r437)
+++ trunk/Mk/bsd.gecko.mk	Mon Nov 22 18:12:53 2010	(r438)
@@ -4,17 +4,17 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze at FreeBSD.org>
 #
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.20 2010/03/28 06:30:26 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.22 2010/08/29 15:16:20 beat Exp $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
 # ======================= USERS =================================
 # To specify which gecko-based backend you prefer, use something like:
 #
-# WITH_GECKO=	firefox
+# WITH_GECKO=	libxul
 #
 # The valid backends are:
-# firefox flock seamonkey thunderbird
+# libxul seamonkey
 #
 # See below for more details.
 # ======================= /USERS ================================
@@ -36,31 +36,29 @@
 
 # Users should use the following syntax:
 #
-# WITH_GECKO= mozilla firefox seamonkey
-#  Use mozilla whenever a port supports it, falling back on firefox and
-#  then seamonkey.
-# WITH_GECKO= firefox
-#  Sets your preferred backend. With this example, firefox will always
-#  be chosen, unless the port doesn't support a firefox backend. In that
+# WITH_GECKO= libxul seamonkey
+#  Use libxul whenever a port supports it, falling back on seamonkey.
+# WITH_GECKO= libxul
+#  Sets your preferred backend. With this example, libxul will always
+#  be chosen, unless the port doesn't support a libxul backend. In that
 #  case, you get whatever the porter chose as the default. Better to use
 #  the first example.
 #
 #
 # Ports should use the following:
 #
-# USE_GECKO= mozilla firefox seamonkey
+# USE_GECKO= libxul seamonkey
 #  The list of gecko backends that the port supports. Unless the user
 #  overrides it with WITH_GECKO, the first gecko listed in USE_GECKO
-#  will be the default. In the above example, www/mozilla will be used
-#  as a gecko backend unless WITH_GECKO=firefox or WITH_GECKO=seamonkey
-#  is defined by the user.
+#  will be the default. In the above example, www/libxul will be used
+#  as a gecko backend unless WITH_GECKO=seamonkey is defined by the user.
 #
 # USE_GECKO= firefox-devel<->firefox
 #  This will sed -e 's/firefox/firefox-devel/' on Makefile.in's and configure 
 #  if ${GECKO}=="firefox-devel"
 #
 #  Example:
-#  USE_GECKO= mozilla firefox seamonkey
+#  USE_GECKO= libxul seamonkey
 #  
 #  post-patch:
 #	@${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
@@ -70,7 +68,7 @@
 #  has been chosen.
 #
 #  Example:
-#  USE_GECKO= mozilla firefox seamonkey
+#  USE_GECKO= libxul seamonkey
 #  
 #  post-patch:
 #  .if ${GECKO}=="seamonkey"
@@ -78,10 +76,8 @@
 #		${MOZSRC}/configure
 #  .endif
 
-_GECKO_ALL=	firefox seamonkey thunderbird flock mozilla \
-		libxul
+_GECKO_ALL=	seamonkey libxul
 
-thunderbird_PORTSDIR=	mail
 libxul_PLIST=		${LOCALBASE}/lib/libxul/libxul.so
 
 .for gecko in ${_GECKO_ALL}
@@ -263,7 +259,7 @@
 PLIST?=		${WRKDIR}/plist
 PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
-MASTER_DIR?=	${.CURDIR}/../../www/mozilla
+MASTER_DIR?=	${.CURDIR}/../../www/seamonkey
 
 KRB5_HOME?=	/usr
 MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
@@ -271,14 +267,14 @@
 ESD_LIB?=	libesd.so.2
 FREETYPE_LIB?=	libfreetype.so.9
 
-GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in
+GENERIC_MOZCONFIG?=	${.CURDIR}/../../www/seamonkey/files/mozconfig-generic.in
 PORT_MOZCONFIG?=	${FILESDIR}/mozconfig.in
 MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin include lib share/idl
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 PKGINSTALL?=	${WRKDIR}/pkg-install
 PKGDEINSTALL?=	${WRKDIR}/pkg-deinstall
-MASTER_MOZDIR?=	${PORTSDIR}/www/mozilla
+MASTER_MOZDIR?=	${PORTSDIR}/www/seamonkey
 PKGINSTALL_INC?=	${MASTER_MOZDIR}/pkg-install.in
 PKGDEINSTALL_INC?=	${MASTER_MOZDIR}/pkg-deinstall.in
 
@@ -418,14 +414,16 @@
 MOZ_OPTIONS+=	--disable-gnomevfs
 .endif
 
+.if !defined(STRIP) || ${STRIP} == ""
+MOZ_OPTIONS+=	--disable-strip --disable-install-strip
+.endif
+
 .if defined(WITH_DEBUG)
-MOZ_OPTIONS+=	--enable-debug				\
-		--disable-strip
+MOZ_OPTIONS+=	--enable-debug
 WITH_LOGGING=	yes
 .else
 MOZ_OPTIONS+=	--disable-debug				\
-		--enable-optimize=${WITH_OPTIMIZE}	\
-		--enable-strip
+		--enable-optimize=${WITH_OPTIMIZE}
 .endif
 
 .if defined(WITH_JAVA) && defined(_WITH_JAVA)

More information about the freebsd-gecko mailing list