Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Jun 2019 09:07:08 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r505146 - head/graphics/gauche-gl
Message-ID:  <201906260907.x5Q978iY015807@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906260907.x5Q978iY015807>