From owner-svn-ports-all@freebsd.org Wed Jun 26 09:07:10 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 7B50315C184E; Wed, 26 Jun 2019 09:07:10 +0000 (UTC) (envelope-from danfe@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 A5D7F944F3; Wed, 26 Jun 2019 09:07:09 +0000 (UTC) (envelope-from danfe@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 3B6FB256F7; Wed, 26 Jun 2019 09:07:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5Q979xl015808; Wed, 26 Jun 2019 09:07:09 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5Q978iY015807; Wed, 26 Jun 2019 09:07:08 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201906260907.x5Q978iY015807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 26 Jun 2019 09:07:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505146 - head/graphics/gauche-gl X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/graphics/gauche-gl X-SVN-Commit-Revision: 505146 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A5D7F944F3 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_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,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-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, 26 Jun 2019 09:07:10 -0000 Author: danfe Date: Wed Jun 26 09:07:08 2019 New Revision: 505146 URL: https://svnweb.freebsd.org/changeset/ports/505146 Log: Unbreak staging against modern Gauche (ABI version had been bumped from 0.9 to 0.97 previously, but this port had slipped though the cracks). Modified: head/graphics/gauche-gl/Makefile head/graphics/gauche-gl/pkg-plist Modified: head/graphics/gauche-gl/Makefile ============================================================================== --- head/graphics/gauche-gl/Makefile Wed Jun 26 09:02:02 2019 (r505145) +++ head/graphics/gauche-gl/Makefile Wed Jun 26 09:07:08 2019 (r505146) @@ -15,8 +15,6 @@ COMMENT= OpenGL binding for Gauche LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to stage - BUILD_DEPENDS= gosh:lang/gauche RUN_DEPENDS= gosh:lang/gauche @@ -26,11 +24,12 @@ USE_XORG= ice sm x11 xext xmu xi USE_GL= gl glu glut GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes +GAUCHE_ABI= 0.97 DOCSDIR= ${PREFIX}/share/doc/gauche/${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/gauche/${PORTNAME} -PLIST_SUB= TARGET="${CONFIGURE_TARGET}" +PLIST_SUB= TARGET="${CONFIGURE_TARGET}" ABI_VER=${GAUCHE_ABI} INFO= gauche-gl-refe gauche-gl-refj @@ -50,7 +49,7 @@ do-install: ${GZCAT} ${WRKSRC}/doc/${i}.info.gz \ > ${STAGEDIR}${PREFIX}/${INFO_PATH}/${i}.info .endfor - @(cd ${STAGEDIR}${PREFIX}/lib/gauche-0.9/site/${CONFIGURE_TARGET} && \ + @(cd ${STAGEDIR}${PREFIX}/lib/gauche-${GAUCHE_ABI}/site/${CONFIGURE_TARGET} && \ ${CHMOD} u+w libgauche-*.so && ${STRIP_CMD} libgauche-*.so && \ ${CHMOD} u-w libgauche-*.so) Modified: head/graphics/gauche-gl/pkg-plist ============================================================================== --- head/graphics/gauche-gl/pkg-plist Wed Jun 26 09:02:02 2019 (r505145) +++ head/graphics/gauche-gl/pkg-plist Wed Jun 26 09:07:08 2019 (r505146) @@ -1,7 +1,7 @@ -lib/gauche-0.9/site/%%TARGET%%/libgauche-gl.so -lib/gauche-0.9/site/%%TARGET%%/libgauche-glut.so -lib/gauche-0.9/site/%%TARGET%%/libgauche-math3d.so -lib/gauche-0.9/site/include/gauche/math3d.h +lib/gauche-%%ABI_VER%%/site/%%TARGET%%/libgauche-gl.so +lib/gauche-%%ABI_VER%%/site/%%TARGET%%/libgauche-glut.so +lib/gauche-%%ABI_VER%%/site/%%TARGET%%/libgauche-math3d.so +lib/gauche-%%ABI_VER%%/site/include/gauche/math3d.h %%PORTDOCS%%%%DOCSDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cg/cg-gl-vertex-example.cg @@ -74,9 +74,9 @@ lib/gauche-0.9/site/include/gauche/math3d.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.frag %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/particle.vert %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slbook/ogl2particle/run.sh -share/gauche-0.9/site/lib/gl.scm -share/gauche-0.9/site/lib/gl/glut.scm -share/gauche-0.9/site/lib/gl/math3d.scm -share/gauche-0.9/site/lib/gl/simple-image.scm -share/gauche-0.9/site/lib/gl/simple/image.scm -share/gauche-0.9/site/lib/gl/simple/viewer.scm +share/gauche-%%ABI_VER%%/site/lib/gl.scm +share/gauche-%%ABI_VER%%/site/lib/gl/glut.scm +share/gauche-%%ABI_VER%%/site/lib/gl/math3d.scm +share/gauche-%%ABI_VER%%/site/lib/gl/simple-image.scm +share/gauche-%%ABI_VER%%/site/lib/gl/simple/image.scm +share/gauche-%%ABI_VER%%/site/lib/gl/simple/viewer.scm