[SVN-Commit] r1300 - in trunk: Mk www/firefox www/firefox-esr www/firefox-nightly www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Aug  5 15:31:06 2013
New Revision: 1300

Log:
avoid tripping up client.mk build due to config.guess

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Mon Aug  5 13:55:37 2013	(r1299)
+++ trunk/Mk/bsd.gecko.mk	Mon Aug  5 15:31:06 2013	(r1300)
@@ -819,7 +819,7 @@
 MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
 
 .if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=x86_64-unknown-${OPSYS:L}{OSREL}
 .elif ${ARCH:Mpowerpc*}
 USE_GCC?=	yes
 CFLAGS+=	-D__STDC_CONSTANT_MACROS

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile	Mon Aug  5 13:55:37 2013	(r1299)
+++ trunk/www/firefox-esr/Makefile	Mon Aug  5 15:31:06 2013	(r1300)
@@ -59,7 +59,6 @@
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 
 .undef GNU_CONFIGURE
-MOZ_OPTIONS+=	${CONFIGURE_TARGET}
 MAKEFILE=	${WRKSRC}/client.mk
 ALL_TARGET=	profiledbuild
 MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Mon Aug  5 13:55:37 2013	(r1299)
+++ trunk/www/firefox-nightly/Makefile	Mon Aug  5 15:31:06 2013	(r1300)
@@ -68,7 +68,6 @@
 USE_DISPLAY=		yes
 
 .undef GNU_CONFIGURE
-MOZ_OPTIONS+=	${CONFIGURE_TARGET}
 MAKEFILE=	${WRKSRC}/client.mk
 ALL_TARGET=	profiledbuild
 MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Mon Aug  5 13:55:37 2013	(r1299)
+++ trunk/www/firefox/Makefile	Mon Aug  5 15:31:06 2013	(r1300)
@@ -64,7 +64,6 @@
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 
 .undef GNU_CONFIGURE
-MOZ_OPTIONS+=	${CONFIGURE_TARGET}
 MAKEFILE=	${WRKSRC}/client.mk
 ALL_TARGET=	profiledbuild
 MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Mon Aug  5 13:55:37 2013	(r1299)
+++ trunk/www/seamonkey/Makefile	Mon Aug  5 15:31:06 2013	(r1300)
@@ -57,7 +57,6 @@
 # non-client.mk objdir build broken after bug 846540
 .undef GNU_CONFIGURE
 ALL_TARGET=	build
-MOZ_OPTIONS+=	${CONFIGURE_TARGET}
 MAKEFILE=	${WRKSRC}/client.mk
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"