From owner-svn-ports-all@freebsd.org Wed Jan 2 09:48:08 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 7F5D3143CBF7; Wed, 2 Jan 2019 09:48:08 +0000 (UTC) (envelope-from linimon@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 25F6784099; Wed, 2 Jan 2019 09:48:08 +0000 (UTC) (envelope-from linimon@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 1560D7CFA; Wed, 2 Jan 2019 09:48:08 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x029m7IR074407; Wed, 2 Jan 2019 09:48:07 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x029m7xP074405; Wed, 2 Jan 2019 09:48:07 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201901020948.x029m7xP074405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Wed, 2 Jan 2019 09:48:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489073 - in branches/2019Q1/java/java3d: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in branches/2019Q1/java/java3d: . files X-SVN-Commit-Revision: 489073 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 25F6784099 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Wed, 02 Jan 2019 09:48:08 -0000 Author: linimon Date: Wed Jan 2 09:48:07 2019 New Revision: 489073 URL: https://svnweb.freebsd.org/changeset/ports/489073 Log: MFH: r489072 Correct mistakes made in r484256 by not including newer version of patch. This correctly fixes the build on powerpc64. PR: 231946 Submitted by: Piotr Kubaj Approved by: portmgr (tier-2 blanket) Approved by: portmgr (tier-2 blanket) Modified: branches/2019Q1/java/java3d/Makefile branches/2019Q1/java/java3d/files/patch-freebsd Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/java/java3d/Makefile ============================================================================== --- branches/2019Q1/java/java3d/Makefile Wed Jan 2 09:32:49 2019 (r489072) +++ branches/2019Q1/java/java3d/Makefile Wed Jan 2 09:48:07 2019 (r489073) @@ -60,12 +60,10 @@ do-install: ${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dcore.jar \ ${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \ ${STAGEDIR}${JAVA_HOME}/jre/lib/ext -.if ${ARCH} != powerpc64 @${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} ${INSTALL} \ ${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \ ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} -.endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: branches/2019Q1/java/java3d/files/patch-freebsd ============================================================================== --- branches/2019Q1/java/java3d/files/patch-freebsd Wed Jan 2 09:32:49 2019 (r489072) +++ branches/2019Q1/java/java3d/files/patch-freebsd Wed Jan 2 09:48:07 2019 (r489073) @@ -126,7 +126,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/buil + + + -+ ++ + + + @@ -139,7 +139,7 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/buil + + + -+ ++ + + +