From owner-freebsd-gecko@FreeBSD.ORG Thu Oct 23 19:48:24 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC5A0FDF for ; Thu, 23 Oct 2014 19:48:24 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56CCC7E7 for ; Thu, 23 Oct 2014 19:48:24 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s9NJmMrW067023 for ; Thu, 23 Oct 2014 19:48:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s9NJmHRW065448 for freebsd-gecko@freebsd.org; Thu, 23 Oct 2014 19:48:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 23 Oct 2014 19:48:17 GMT Message-Id: <201410231948.s9NJmHRW065448@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1742 - in trunk: Mk mail/thunderbird www/firefox www/firefox-esr www/firefox-nightly www/libxul www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2014 19:48:24 -0000 Author: jbeich Date: Thu Oct 23 19:48:17 2014 New Revision: 1742 Log: drop non-client.mk build support Modified: trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/libxul/Makefile trunk/www/seamonkey/Makefile Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/Mk/bsd.gecko.mk Thu Oct 23 19:48:17 2014 (r1742) @@ -97,15 +97,13 @@ PLISTF?= ${WRKDIR}/plist_files MOZ_OBJDIR?= ${WRKSRC}/obj-${CONFIGURE_TARGET} -CONFIGURE_WRKSRC?=${MOZ_OBJDIR} -BUILD_WRKSRC?= ${MOZ_OBJDIR} -INSTALL_WRKSRC?=${MOZ_OBJDIR} MOZ_PIS_DIR?= lib/${MOZILLA}/init.d -CONFIGURE_SCRIPT?=../configure PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig +# XXX Not ?= because fmake uses MAKEFILE internally +MAKEFILE= ${WRKSRC}/client.mk MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall @@ -115,6 +113,8 @@ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin +ALL_TARGET?= build + CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} MOZ_EXPORT+= ${CONFIGURE_ENV} \ PERL="${PERL}" @@ -338,8 +338,6 @@ USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} USE_DISPLAY=yes -.undef GNU_CONFIGURE -MAKEFILE= ${WRKSRC}/client.mk ALL_TARGET= profiledbuild MOZ_EXPORT+=MOZ_OPTIMIZE_FLAGS="-Os" MOZ_PGO_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" .endif Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/mail/thunderbird/Makefile Thu Oct 23 19:48:17 2014 (r1742) @@ -41,7 +41,6 @@ WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -ALL_TARGET= default USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -62,11 +61,6 @@ OPTIONS_DEFINE= ENIGMAIL LIGHTNING OPTIONS_DEFAULT=ENIGMAIL LIGHTNING -# non-client.mk objdir build broken after bug 846540 -.undef GNU_CONFIGURE -ALL_TARGET= build -MAKEFILE= ${WRKSRC}/client.mk - .include "${.CURDIR}/../../www/firefox/Makefile.options" OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GSTREAMER//} Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/www/firefox-esr/Makefile Thu Oct 23 19:48:17 2014 (r1742) @@ -41,8 +41,6 @@ WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -ALL_TARGET= default -GNU_CONFIGURE= yes USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/www/firefox-nightly/Makefile Thu Oct 23 19:48:17 2014 (r1742) @@ -48,7 +48,6 @@ WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -ALL_TARGET= build MAKEFILE= ${WRKSRC}/client.mk USE_GL= gl USES= dos2unix tar:bzip2 Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/www/firefox/Makefile Thu Oct 23 19:48:17 2014 (r1742) @@ -40,8 +40,6 @@ WANT_GNOME= yes USE_QT5= # empty QT_NONSTANDARD= yes -ALL_TARGET= default -GNU_CONFIGURE= yes USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/www/libxul/Makefile Thu Oct 23 19:48:17 2014 (r1742) @@ -36,8 +36,6 @@ USE_QT5= # empty QT_NONSTANDARD= yes WANT_PERL= yes -ALL_TARGET= default -GNU_CONFIGURE= yes USE_GL= gl USES= dos2unix pathfix tar:bzip2 DOS2UNIX_FILES= media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Thu Oct 23 19:48:08 2014 (r1741) +++ trunk/www/seamonkey/Makefile Thu Oct 23 19:48:17 2014 (r1742) @@ -40,7 +40,6 @@ USE_QT5= # empty QT_NONSTANDARD= yes WANT_PERL= yes -ALL_TARGET= default USE_GL= gl USES= dos2unix tar:bzip2 DOS2UNIX_FILES= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -63,11 +62,6 @@ LDAP_DESC?= LDAP support for Mailnews MAILNEWS_DESC?= Mail and News modules -# non-client.mk objdir build broken after bug 846540 -.undef GNU_CONFIGURE -ALL_TARGET= build -MAKEFILE= ${WRKSRC}/client.mk - .include "${.CURDIR}/../../www/firefox/Makefile.options" .include