From owner-svn-ports-all@freebsd.org Tue Feb 19 22:09:25 2019 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 0D13814DBA5B; Tue, 19 Feb 2019 22:09:25 +0000 (UTC) (envelope-from gerald@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 A042C769CA; Tue, 19 Feb 2019 22:09:24 +0000 (UTC) (envelope-from gerald@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 850C723F87; Tue, 19 Feb 2019 22:09:24 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1JM9Oip033464; Tue, 19 Feb 2019 22:09:24 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1JM9Oql033462; Tue, 19 Feb 2019 22:09:24 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201902192209.x1JM9Oql033462@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Tue, 19 Feb 2019 22:09:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493396 - in head/lang/gcc6: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/lang/gcc6: . files X-SVN-Commit-Revision: 493396 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A042C769CA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] 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, 19 Feb 2019 22:09:25 -0000 Author: gerald Date: Tue Feb 19 22:09:23 2019 New Revision: 493396 URL: https://svnweb.freebsd.org/changeset/ports/493396 Log: Fix an incorrect sed regular expression used in libjava by adding a local patch files/patch-libjava-classpath-scripts-check_jni_methods.sh.in. Escapes of ordinary characters will be disallowed by regex(3) in the future. [1] While here already, factor out a proper USES block in the Makefile. [2] PR: 233443 [1] Submitted by: kevans [1] Reported by: portlint [2] Added: head/lang/gcc6/files/patch-libjava-classpath-scripts-check_jni_methods.sh.in (contents, props changed) Modified: head/lang/gcc6/Makefile Modified: head/lang/gcc6/Makefile ============================================================================== --- head/lang/gcc6/Makefile Tue Feb 19 20:49:24 2019 (r493395) +++ head/lang/gcc6/Makefile Tue Feb 19 22:09:23 2019 (r493396) @@ -23,18 +23,18 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libmpc.so:math/mpc BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils - .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:misc/dejagnu .endif +USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz +USE_BINUTILS= yes +USE_PERL5= build + CPE_VENDOR= gnu GCC_VERSION= ${PORTVERSION} SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} -USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz -USE_BINUTILS= yes -USE_PERL5= build SSP_UNSAFE= yes CFLAGS:= ${CFLAGS:N-mretpoline} CXXFLAGS:= ${CXXFLAGS:N-mretpoline} Added: head/lang/gcc6/files/patch-libjava-classpath-scripts-check_jni_methods.sh.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcc6/files/patch-libjava-classpath-scripts-check_jni_methods.sh.in Tue Feb 19 22:09:23 2019 (r493396) @@ -0,0 +1,12 @@ +--- UTC +--- libjava/classpath/scripts/check_jni_methods.sh.in.orig 2018-11-23 15:02:00 UTC ++++ libjava/classpath/scripts/check_jni_methods.sh.in +@@ -29,7 +29,7 @@ find @abs_top_srcdir@/native/jni -name \*.cpp | \ + find @abs_top_srcdir@/native/jni -name \*.cpp | \ + xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \ + cut -f4 -d\ | \ +- LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2 ++ LC_ALL=C sed -e 's,^JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2 + mv $TMPFILE2 $TMPFILE3 + LC_ALL=C sort -u $TMPFILE3 > $TMPFILE2 + rm $TMPFILE3