Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Dec 2020 09:37:39 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r557359 - head/graphics/glfw2
Message-ID:  <202012090937.0B99bdTr081598@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Dec  9 09:37:39 2020
New Revision: 557359
URL: https://svnweb.freebsd.org/changeset/ports/557359

Log:
  - Simplify docs and examples installation
  - Fix absolute symlink to the library
  - Add LICENSE_FILE
  - Update WWW

Modified:
  head/graphics/glfw2/Makefile
  head/graphics/glfw2/pkg-descr

Modified: head/graphics/glfw2/Makefile
==============================================================================
--- head/graphics/glfw2/Makefile	Wed Dec  9 09:27:51 2020	(r557358)
+++ head/graphics/glfw2/Makefile	Wed Dec  9 09:37:39 2020	(r557359)
@@ -12,9 +12,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable framework for OpenGL development
 
 LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USES=		gl tar:bzip2 xorg
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	compile.sh
 ALL_TARGET=	x11
 INSTALL_TARGET=	x11-install
@@ -28,36 +29,18 @@ PLIST_FILES=	include/GL/glfw.h lib/libglfw.a lib/libgl
 		lib/libglfw.so.0 libdata/pkgconfig/libglfw.pc
 
 PORTDOCS=	*
-
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	*.html
-
-DOCSRCDIR2=	${WRKSRC}/docs
-DOCSDIR2=	${DOCSDIR}/docs
-DOC_FILES2=	*.pdf *.sty *.tex *.txt
-
 PORTEXAMPLES=	*
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
 
-EXAMPLESSRCDIR1=	${WRKSRC}/examples
-EXAMPLES_FILES1=	boing gears heightmap listmodes mipmaps mtbench \
-			mthello pong3d splitview triangle wave
-
-EXAMPLESSRCDIR2=	${WRKSRC}/tests
-EXAMPLESDIR2=		${EXAMPLESDIR}/tests
-EXAMPLES_FILES2=	accuracy defaults dynamic events fsaa fsinput iconify \
-			joysticks peter reopen tearing version
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limit:^2\..*
 
 post-extract:
-	@${CHMOD} ${BINMODE} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${CHMOD} +x ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
@@ -68,21 +51,24 @@ post-patch:
 		${WRKSRC}/lib/x11/Makefile.x11.in
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/x11/libglfw.so \
-		${STAGEDIR}${PREFIX}/lib/libglfw.so.0
-	${LN} -sf ${PREFIX}/lib/libglfw.so.0 ${STAGEDIR}${PREFIX}/lib/libglfw.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libglfw.so.0
+	${INSTALL_LIB} ${WRKSRC}/lib/x11/libglfw.so ${STAGEDIR}${PREFIX}/lib/libglfw.so.0
+	${LN} -sf libglfw.so.0 ${STAGEDIR}${PREFIX}/lib/libglfw.so
 
-	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.pdf *.sty *.tex *.txt ${STAGEDIR}${DOCSDIR}
 
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_PROGRAM} ${EXAMPLES_FILES1:S|^|${EXAMPLESSRCDIR1}/|} \
-		${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLESSRCDIR1}/*.tga ${STAGEDIR}${EXAMPLESDIR}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR2}
-	${INSTALL_PROGRAM} ${EXAMPLES_FILES2:S|^|${EXAMPLESSRCDIR2}/|} \
-		${STAGEDIR}${EXAMPLESDIR2}
+.for f in boing gears heightmap listmodes mipmaps mtbench mthello pong3d splitview triangle wave
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/examples/*.tga ${STAGEDIR}${EXAMPLESDIR}
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests
+.for f in accuracy defaults dynamic events fsaa fsinput iconify joysticks peter reopen tearing version
+	${INSTALL_PROGRAM} ${WRKSRC}/tests/${f} ${STAGEDIR}${EXAMPLESDIR}/tests
+.endfor
 
 .include <bsd.port.mk>

Modified: head/graphics/glfw2/pkg-descr
==============================================================================
--- head/graphics/glfw2/pkg-descr	Wed Dec  9 09:27:51 2020	(r557358)
+++ head/graphics/glfw2/pkg-descr	Wed Dec  9 09:37:39 2020	(r557359)
@@ -3,4 +3,4 @@ development that provides a powerful API for handling 
 tasks such as opening an OpenGL window, reading keyboard, mouse, joystick and
 time input, creating threads, and more.
 
-WWW: http://www.glfw.org/
+WWW: https://www.glfw.org/



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