Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 May 2013 23:48:47 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/178846: [MAINTAINER] graphics/glfw: update to 2.7.8
Message-ID:  <20130522214849.1902D6ED@hub.freebsd.org>
Resent-Message-ID: <201305222150.r4MLo04u098406@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         178846
>Category:       ports
>Synopsis:       [MAINTAINER] graphics/glfw: update to 2.7.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 22 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Jan 29 15:02:50 EST 2013
>Description:
- Update to 2.7.8
- Fix docs
- Fix examples, use executable

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

Is this good how examples are installed? Must be +x, can't use
COPYTREE_SHARE.

Can't use

USES=      pathfix

because this must be changed, and isn't in Uses/pathfix.mk

${WRKSRC}/lib/x11/Makefile.x11.in

Build log

https://redports.org/buildarchive/20130409183500-16351/

>Fix:

--- glfw-2.7.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/glfw/Makefile ./Makefile
--- /usr/ports/graphics/glfw/Makefile	2013-01-14 17:57:08.000000000 +0100
+++ ./Makefile	2013-04-19 12:17:06.000000000 +0200
@@ -2,7 +2,7 @@
 # $FreeBSD: head/graphics/glfw/Makefile 309114 2012-12-17 17:35:34Z pawel $
 
 PORTNAME=	glfw
-PORTVERSION=	2.7.7
+PORTVERSION=	2.7.8
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -23,7 +23,7 @@
 USE_XORG=	x11 xau xdamage xdmcp xext xfixes xrandr xrender xxf86vm
 USE_GL=		glu
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	include/GL/glfw.h \
 		lib/libglfw.a \
@@ -31,8 +31,25 @@
 		lib/libglfw.so.0 \
 		libdata/pkgconfig/libglfw.pc
 
-PORTDOCS=	*.pdf
-PORTEXAMPLES=	Makefile.x11.in *.c *.tga
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	*.html
+
+DOCSRCDIR2=	${WRKSRC}/docs
+DOCSDIR2=	${DOCSDIR}/docs
+DOC_FILES2=	*.pdf *.sty *.tex *.txt
+
+PORTEXAMPLES=	*
+
+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
 
 .include <bsd.port.options.mk>
 
@@ -53,15 +70,18 @@
 	${LN} -sf ${PREFIX}/lib/libglfw.so.0 ${PREFIX}/lib/libglfw.so
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-.for e in ${PORTEXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${e} ${EXAMPLESDIR}
-.endfor
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${EXAMPLES_FILES1:S|^|${EXAMPLESSRCDIR1}/|} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${EXAMPLESSRCDIR1}/*.tga ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR2}
+	${INSTALL_PROGRAM} ${EXAMPLES_FILES2:S|^|${EXAMPLESSRCDIR2}/|} ${EXAMPLESDIR2}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/glfw/distinfo ./distinfo
--- /usr/ports/graphics/glfw/distinfo	2013-01-14 17:57:08.000000000 +0100
+++ ./distinfo	2013-05-22 23:43:53.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (glfw-2.7.7.tar.bz2) = 422e755979524a1da28e4addcae723b7132998ca15e89be41bf34964d9360aa2
-SIZE (glfw-2.7.7.tar.bz2) = 927805
+SHA256 (glfw-2.7.8.tar.bz2) = 86b570a405353ab17a54461ec8b4871f59df6a49897a09f48acfd4dee9a9848b
+SIZE (glfw-2.7.8.tar.bz2) = 946926
--- glfw-2.7.8.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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