From owner-svn-ports-all@freebsd.org Tue Nov 20 18:57:47 2018 Return-Path: Delivered-To: svn-ports-all@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 2528B1139E9E; Tue, 20 Nov 2018 18:57:47 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFECD7C26D; Tue, 20 Nov 2018 18:57:46 +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 A262F154F3; Tue, 20 Nov 2018 18:57:46 +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 wAKIvkQZ060304; Tue, 20 Nov 2018 18:57:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAKIvkhv060303; Tue, 20 Nov 2018 18:57:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811201857.wAKIvkhv060303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Nov 2018 18:57:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485462 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 485462 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BFECD7C26D X-Spamd-Result: default: False [0.45 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.31)[0.310,0]; NEURAL_SPAM_MEDIUM(0.14)[0.143,0]; NEURAL_SPAM_LONG(0.00)[0.001,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 18:57:47 -0000 Author: jbeich Date: Tue Nov 20 18:57:46 2018 New Revision: 485462 URL: https://svnweb.freebsd.org/changeset/ports/485462 Log: gecko: drop pre-52 support Modified: head/Mk/bsd.gecko.mk (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Nov 20 18:57:23 2018 (r485461) +++ head/Mk/bsd.gecko.mk Tue Nov 20 18:57:46 2018 (r485462) @@ -81,27 +81,17 @@ MOZILLA_VER?= ${PORTVERSION} MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} -USES+= cpe gl gmake iconv localbase perl5 pkgconfig \ +USES+= compiler:c++17-lang cpe gl gmake iconv localbase perl5 pkgconfig \ python:2.7,build desktop-file-utils CPE_VENDOR?=mozilla USE_GL= gl USE_PERL5= build -USE_XORG= x11 xcomposite xdamage xext xfixes xrender xt +USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrender xt HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes BUNDLE_LIBS= yes -.if ${MOZILLA_VER:R:R} >= 49 -USES+= compiler:c++17-lang -.else -USES+= compiler:c++11-lang -.endif - -.if ${MOZILLA_VER:R:R} >= 50 -USE_XORG+= xcb -.endif - .if ${MOZILLA_VER:R:R} >= 56 LLVM_DEFAULT?= 70 BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} @@ -158,14 +148,6 @@ RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} .endif -.if ${MOZILLA_VER:R:R} < 55 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1200032 -# use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning -MOZ_EXPORT+= MOZ_JEMALLOC4=1 -.if ${MOZILLA_VER:R:R} >= 48 -MOZ_OPTIONS+= --enable-jemalloc=4 -.endif # Mozilla >= 48 -.endif # Mozilla < 55 - # Standard depends _ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman sqlite vpx @@ -305,10 +287,6 @@ MOZ_OPTIONS+= --disable-dbus RUN_DEPENDS+= ffmpeg>=0.8,1:multimedia/ffmpeg .endif -.if ${MOZILLA_VER:R:R} < 46 -MOZ_OPTIONS+= --disable-gstreamer -.endif - .if ${PORT_OPTIONS:MGCONF} USE_GNOME+= gconf2 MOZ_OPTIONS+= --enable-gconf @@ -504,31 +482,12 @@ gecko-post-patch: ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \ done .endif - @for f in \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/configure \ - ${MOZSRC}/security/coreconf/FreeBSD.mk \ - ${MOZSRC}/js/src/Makefile.in \ - ${MOZSRC}/js/src/configure \ - ${MOZSRC}/configure \ - ${WRKSRC}/configure; do \ - if [ -f $$f ] ; then \ - ${REINPLACE_CMD} -Ee 's|-lc_r|-pthread|g ; \ - s|-l?pthread|-pthread|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - $$f; \ - fi; \ - done @if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \ ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${WRKSRC}/config/baseconfig.mk; \ fi @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${MOZSRC}/config/baseconfig.mk - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${MOZSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${MOZSRC}/xpcom/io/SpecialSystemDirectory.cpp