Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Nov 2012 01:58:34 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/173571: [PATCH] graphics/glfw: update to 2.7.7, take maintainership, added License
Message-ID:  <20121112005836.E76B445A@hub.freebsd.org>
Resent-Message-ID: <201211120100.qAC100XK058826@freefall.freebsd.org>

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

>Number:         173571
>Category:       ports
>Synopsis:       [PATCH] graphics/glfw: update to 2.7.7, take maintainership, added License
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 01:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

- Update to 2.7.7
- Take maintainership

Removed file(s):
- pkg-plist
because pkg-plist have only 5 items
+PLIST_FILES=

Makefile changed:
+LICENSE=	ZLIB
+PORTDOCS=	*.pdf
+PORTEXAMPLES=	Makefile.x11.in *.c *.tga
+		 /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' ${WRKSRC}/${CONFIGURE_SCRIPT}

Changed and refined
 .if ${PORT_OPTIONS:MDOCS}
 .if ${PORT_OPTIONS:MEXAMPLES}
pkg-descr

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

portlint -A
looks fine.

port test: clean

Can't give build log, because RedPorts not works at the time.

>Fix:

--- glfw-2.7.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/glfw/Makefile ./Makefile
--- /usr/ports/graphics/glfw/Makefile	2012-10-18 03:52:49.000000000 +0200
+++ ./Makefile	2012-11-12 01:49:46.000000000 +0100
@@ -2,13 +2,15 @@
 # $FreeBSD: ports/graphics/glfw/Makefile,v 1.19 2012/10/18 01:52:49 jhale Exp $
 
 PORTNAME=	glfw
-PORTVERSION=	2.7.6
+PORTVERSION=	2.7.7
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Portable framework for OpenGL development
 
+LICENSE=	ZLIB
+
 USE_BZIP2=	yes
 USE_XORG=	x11 xext xrandr
 USE_GL=		glu
@@ -19,6 +21,15 @@
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 
+PLIST_FILES=	include/GL/glfw.h \
+		lib/libglfw.a \
+		lib/libglfw.so \
+		lib/libglfw.so.0 \
+		libdata/pkgconfig/libglfw.pc
+
+PORTDOCS=	*.pdf
+PORTEXAMPLES=	Makefile.x11.in *.c *.tga
+
 .include <bsd.port.options.mk>
 
 post-extract:
@@ -29,22 +40,24 @@
 		's|/usr/X11R6|${LOCALBASE}| ; \
 		 /SOFLAGS/s|-soname |-Wl,-soname,| ; \
 		 /CFLAGS_THREAD/s|"-pthread"|"${PTHREAD_CFLAGS}"| ; \
-		 /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+		 /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e \
 		's|lib/pkgconfig|libdata/pkgconfig|g' ${WRKSRC}/lib/x11/Makefile.x11.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/x11/libglfw.so ${PREFIX}/lib/libglfw.so.0
 	${LN} -sf ${PREFIX}/lib/libglfw.so.0 ${PREFIX}/lib/libglfw.so
+
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
 .endif
+
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.x11 ${EXAMPLESDIR}/makefile
-	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.tga ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}
+.for e in ${PORTEXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${e} ${EXAMPLESDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/glfw/distinfo ./distinfo
--- /usr/ports/graphics/glfw/distinfo	2012-10-18 03:52:49.000000000 +0200
+++ ./distinfo	2012-11-12 00:52:42.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (glfw-2.7.6.tar.bz2) = d4e9a74be4c20ff03470c6aa5dad6877e65e4e1aa6b31039a4579b281e89a333
-SIZE (glfw-2.7.6.tar.bz2) = 907927
+SHA256 (glfw-2.7.7.tar.bz2) = 422e755979524a1da28e4addcae723b7132998ca15e89be41bf34964d9360aa2
+SIZE (glfw-2.7.7.tar.bz2) = 927805
diff -ruN --exclude=CVS /usr/ports/graphics/glfw/pkg-descr ./pkg-descr
--- /usr/ports/graphics/glfw/pkg-descr	2011-10-18 15:05:57.000000000 +0200
+++ ./pkg-descr	2012-11-12 01:38:27.000000000 +0100
@@ -1,6 +1,6 @@
-GLFW is a free, open source, portable framework for OpenGL application
-development. In short, it is a library that constitutes a powerful API
-for handling operating system specific tasks, such as opening an OpenGL
-window, reading keyboard and mouse input, creating threads, and much more.
+GLFW is a free, Open Source, multi-platform library for OpenGL application
+development that provides a powerful API for handling operating system specific
+tasks such as opening an OpenGL window, reading keyboard, mouse, joystick and
+time input, creating threads, and more.
 
 WWW: http://www.glfw.org/
diff -ruN --exclude=CVS /usr/ports/graphics/glfw/pkg-plist ./pkg-plist
--- /usr/ports/graphics/glfw/pkg-plist	2012-04-08 08:43:10.000000000 +0200
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-include/GL/glfw.h
-lib/libglfw.a
-lib/libglfw.so
-lib/libglfw.so.0
-libdata/pkgconfig/libglfw.pc
-%%PORTDOCS%%%%DOCSDIR%%/Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boing.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heightmap.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listmodes.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mipmaps.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mtbench.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mthello.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/particles.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/splitview.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangle.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wave.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mipmaps.tga
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d_field.tga
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d_instr.tga
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d_menu.tga
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d_title.tga
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d_winner1.tga
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pong3d_winner2.tga
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- glfw-2.7.7.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?20121112005836.E76B445A>