From owner-svn-ports-head@freebsd.org Thu Jul 4 11:40:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1151715D2F19; Thu, 4 Jul 2019 11:40:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 85D488DF19; Thu, 4 Jul 2019 11:40:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 11C2822664; Thu, 4 Jul 2019 11:40:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x64BeXfA073679; Thu, 4 Jul 2019 11:40:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x64BeX8A073678; Thu, 4 Jul 2019 11:40:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201907041140.x64BeX8A073678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 4 Jul 2019 11:40:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505829 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 505829 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 85D488DF19 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2019 11:40:36 -0000 Author: jbeich Date: Thu Jul 4 11:40:33 2019 New Revision: 505829 URL: https://svnweb.freebsd.org/changeset/ports/505829 Log: gecko: drop PORT_MOZCONFIG, it wasn't flexible enough Modified: head/Mk/bsd.gecko.mk (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Thu Jul 4 11:40:26 2019 (r505828) +++ head/Mk/bsd.gecko.mk Thu Jul 4 11:40:33 2019 (r505829) @@ -39,11 +39,6 @@ Gecko_Pre_Include= bsd.gecko.mk # MOZILLA_PLIST_DIRS List of directories to descend into when installing # and creating the plist # -# MOZ_SED_ARGS sed(1) commands through which MOZ_PIS_SCRIPTS are -# filtered. There is a default set defined here, so -# you probably want to add to MOZ_SED_ARGS rather -# than clobber it -# # MOZ_OPTIONS configure arguments (added to .mozconfig). If # NOMOZCONFIG is defined, you probably want to set # CONFIGURE_ARGS+=${MOZ_OPTIONS} @@ -62,9 +57,6 @@ Gecko_Pre_Include= bsd.gecko.mk # MOZ_TOOLKIT A variable for the --enable-default-toolkit= in # CONFIGURE_ARGS. The default is cairo-gtk3. # -# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can be -# set to a generic mozconfig included with the port -# # NOMOZCONFIG Don't drop a customized .mozconfig into the build # directory. Options will have to be specified in # CONFIGURE_ARGS instead @@ -122,7 +114,6 @@ MOZILLA_SUFX?= none MOZSRC?= ${WRKSRC} PLISTF?= ${WRKDIR}/plist_files -PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications @@ -374,24 +365,6 @@ MOZ_MAKE_FLAGS+=-j${MAKE_JOBS_NUMBER} MOZ_MK_OPTIONS+=MOZ_MAKE_FLAGS="${MOZ_MAKE_FLAGS}" .endif -MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ - -e 's|@CFLAGS@|${CFLAGS}|g' \ - -e 's|@LDFLAGS@|${LDFLAGS}|g' \ - -e 's|@LIBS@|${LIBS}|g' \ - -e 's|@LOCALBASE@|${LOCALBASE}|g' \ - -e 's|@PERL@|${PERL}|g' \ - -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g' \ - -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%CFLAGS%%|${CFLAGS}|g' \ - -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ - -e 's|%%LIBS%%|${LIBS}|g' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%PERL%%|${PERL}|g' \ - -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - -e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g' \ - -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' -MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} - .if ${ARCH} == amd64 . if ${USE_MOZILLA:M-nss} USE_BINUTILS= # intel-gcm.s @@ -415,9 +388,6 @@ post-patch: gecko-post-patch gecko-post-patch: @${RM} ${MOZCONFIG} .if !defined(NOMOZCONFIG) - @if [ -e ${PORT_MOZCONFIG} ] ; then \ - ${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \ - fi .for arg in ${MOZ_OPTIONS} @${ECHO_CMD} ac_add_options ${arg:Q} >> ${MOZCONFIG} .endfor