From owner-svn-ports-all@freebsd.org Mon Jun 15 18:23:03 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1542433C26D; Mon, 15 Jun 2020 18:23:03 +0000 (UTC) (envelope-from makc@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49m07V6qyjz4290; Mon, 15 Jun 2020 18:23:02 +0000 (UTC) (envelope-from makc@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 E5F5D21CB4; Mon, 15 Jun 2020 18:23:02 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05FIN2qs044864; Mon, 15 Jun 2020 18:23:02 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05FIN2ri044862; Mon, 15 Jun 2020 18:23:02 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202006151823.05FIN2ri044862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Mon, 15 Jun 2020 18:23:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538927 - in head/graphics/jogamp-jogl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/graphics/jogamp-jogl: . files X-SVN-Commit-Revision: 538927 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 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: Mon, 15 Jun 2020 18:23:03 -0000 Author: makc Date: Mon Jun 15 18:23:02 2020 New Revision: 538927 URL: https://svnweb.freebsd.org/changeset/ports/538927 Log: graphics/jogamp-jogl: - Fix build with clang and remove forced dependency on gcc. Respect CC - Use BINARY_ALIAS provided by the port framework instead of crafted solution - Rename FreeBSD specific patch (this one should go upstream) - Tweak WWW Added: head/graphics/jogamp-jogl/files/patch-freebsd - copied, changed from r538926, head/graphics/jogamp-jogl/files/patch-freebsd.x86 Deleted: head/graphics/jogamp-jogl/files/patch-freebsd.x86 Modified: head/graphics/jogamp-jogl/Makefile head/graphics/jogamp-jogl/pkg-descr Modified: head/graphics/jogamp-jogl/Makefile ============================================================================== --- head/graphics/jogamp-jogl/Makefile Mon Jun 15 17:54:33 2020 (r538926) +++ head/graphics/jogamp-jogl/Makefile Mon Jun 15 18:23:02 2020 (r538927) @@ -3,6 +3,7 @@ PORTNAME= jogamp-jogl PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= graphics devel java MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \ http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/ @@ -18,24 +19,23 @@ RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:x11-toolkits/swt ONLY_FOR_ARCHS= i386 amd64 -USES= tar:xz xorg +USES= compiler tar:xz xorg USE_ANT= yes -USE_GCC= yes USE_JAVA= yes USE_XORG= x11 xcursor xrandr xrender xxf86vm PATCH_WRKSRC= ${WRKDIR} BUILD_WRKSRC= ${WRKDIR}/jogl/make -BUILD_BINPATH= ${WRKSRC}/bin -MAKE_ENV+= PATH="${BUILD_BINPATH}:${PATH}" +# compiler must be literally "gcc" or "clang" +BINARY_ALIAS= ${CHOSEN_COMPILER_TYPE}=${CC} +MAKE_ARGS= -Dgcc.compat.compiler=${CHOSEN_COMPILER_TYPE} + post-extract: ${MV} ${WRKDIR}/gluegen-v${PORTVERSION} ${WRKDIR}/gluegen ${MV} ${WRKDIR}/jcpp-v${PORTVERSION}/src ${WRKDIR}/gluegen/jcpp/src ${MV} ${WRKDIR}/jogl-v${PORTVERSION} ${WRKDIR}/jogl - ${MKDIR} ${BUILD_BINPATH} - ${LN} -sf ${LOCALBASE}/bin/${CC} ${BUILD_BINPATH}/gcc post-patch: ${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|g' \ Copied and modified: head/graphics/jogamp-jogl/files/patch-freebsd (from r538926, head/graphics/jogamp-jogl/files/patch-freebsd.x86) ============================================================================== --- head/graphics/jogamp-jogl/files/patch-freebsd.x86 Mon Jun 15 17:54:33 2020 (r538926, copy source) +++ head/graphics/jogamp-jogl/files/patch-freebsd Mon Jun 15 18:23:02 2020 (r538927) @@ -1,7 +1,20 @@ ---- jogl/make/build-jogl.xml.orig 2014-03-11 00:59:24.000000000 +0000 -+++ jogl/make/build-jogl.xml 2014-05-12 07:33:35.849403725 +0000 -@@ -1195,7 +1195,7 @@ +--- jogl/make/build-jogl.xml.orig 2015-10-10 01:08:14 UTC ++++ jogl/make/build-jogl.xml +@@ -1184,9 +1184,9 @@ + + +- +- +- ++ ++ ++ + + + +@@ -1203,7 +1203,7 @@ + - @@ -9,7 +22,7 @@ -@@ -1383,7 +1383,7 @@ +@@ -1401,7 +1401,7 @@ @@ -18,9 +31,9 @@ ---- jogl/make/build-nativewindow.xml.orig 2014-03-11 00:59:24.000000000 +0000 -+++ jogl/make/build-nativewindow.xml 2014-05-12 07:32:13.047407428 +0000 -@@ -365,7 +365,7 @@ +--- jogl/make/build-nativewindow.xml.orig 2015-10-10 01:08:14 UTC ++++ jogl/make/build-nativewindow.xml +@@ -373,7 +373,7 @@ @@ -29,7 +42,7 @@ -@@ -562,7 +562,7 @@ +@@ -582,7 +582,7 @@ @@ -38,9 +51,9 @@ ---- jogl/make/build-newt.xml.orig 2014-03-11 00:59:24.000000000 +0000 -+++ jogl/make/build-newt.xml 2014-05-12 07:32:57.565406321 +0000 -@@ -273,7 +273,7 @@ +--- jogl/make/build-newt.xml.orig 2015-10-10 01:08:14 UTC ++++ jogl/make/build-newt.xml +@@ -289,7 +289,7 @@ @@ -49,7 +62,7 @@ -@@ -528,8 +528,8 @@ +@@ -560,8 +560,8 @@ Modified: head/graphics/jogamp-jogl/pkg-descr ============================================================================== --- head/graphics/jogamp-jogl/pkg-descr Mon Jun 15 17:54:33 2020 (r538926) +++ head/graphics/jogamp-jogl/pkg-descr Mon Jun 15 18:23:02 2020 (r538927) @@ -7,4 +7,4 @@ with custom windowing toolkits using the NativeWindow suite of open-source technologies initiated by the Game Technology Group at Sun Microsystems. -WWW: http://jogamp.org/jogl +WWW: https://jogamp.org/jogl