ports/160116: Update port: graphics/glfw to 2.7.2

KATO Tsuguru tkato432 at yahoo.com
Wed Aug 24 18:50:27 UTC 2011 

>Number:         160116
>Category:       ports
>Synopsis:       Update port: graphics/glfw to 2.7.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 24 18:50:26 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.7.2

Remove file:
files/patch-compile.sh
files/patch-lib_x11_Makefile.x11.in
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/glfw/Makefile graphics/glfw/Makefile
--- /usr/ports/graphics/glfw/Makefile	2009-07-10 16:29:44.000000000 +0900
+++ graphics/glfw/Makefile	2011-08-20 06:39:51.000000000 +0900
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glfw
-PORTVERSION=	2.6
+PORTVERSION=	2.7.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -14,35 +14,46 @@
 COMMENT=	A portable framework for OpenGL development
 
 USE_BZIP2=	yes
-USE_XORG=	x11 xxf86vm xext xrandr
-USE_GL=		yes
-USE_LDCONFIG=	yes
+USE_XORG=	x11 xext xrandr
+USE_GL=		glu
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	compile.sh
 ALL_TARGET=	x11
 INSTALL_TARGET=	x11-install
+USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-pre-configure:
-	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/compile.sh
 
-do-configure:
-	@(cd ${WRKSRC} &&		\
-	${SETENV} CC="${CC}"		\
-		  CFLAGS="${CFLAGS}"	\
-		  PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ${SH} compile.sh)
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	include/GL/glfw.h \
+		lib/libglfw.a \
+		lib/libglfw.so \
+		lib/libglfw.so.0 \
+		libdata/pkgconfig/libglfw.pc
+
+post-extract:
+	@${CHMOD} ${BINMODE} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|/usr/X11R6|${X11BASE}| ; \
+		 /CFLAGS_THREAD/s|"-pthread"|"${PTHREAD_CFLAGS}"| ; \
+		 /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' ${CONFIGURE_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
-.ifndef (NOPORTEXAMPLES)
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.x11 ${EXAMPLESDIR}/makefile
 	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.tga ${EXAMPLESDIR}
 .endif
-.ifndef (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/glfw/distinfo graphics/glfw/distinfo
--- /usr/ports/graphics/glfw/distinfo	2011-07-04 02:04:42.000000000 +0900
+++ graphics/glfw/distinfo	2011-08-13 17:07:28.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (glfw-2.6.tar.bz2) = 1b86ca8c5678fbf6999a0bfbe50de121f8aec9c07bf2383306819caebe3edfca
-SIZE (glfw-2.6.tar.bz2) = 886843
+SHA256 (glfw-2.7.2.tar.bz2) = c328f43351a1f935661d95970730a551d3207d6067260809155efb1a67eab537
+SIZE (glfw-2.7.2.tar.bz2) = 902680
diff -urN /usr/ports/graphics/glfw/files/patch-compile.sh graphics/glfw/files/patch-compile.sh
--- /usr/ports/graphics/glfw/files/patch-compile.sh	2008-06-16 13:00:31.000000000 +0900
+++ graphics/glfw/files/patch-compile.sh	1970-01-01 09:00:00.000000000 +0900
@@ -1,73 +0,0 @@
---- compile.sh.orig	2007-07-01 11:46:46.000000000 +0200
-+++ compile.sh	2008-06-14 23:22:27.000000000 +0200
-@@ -63,7 +63,7 @@
-   CC=cc
- fi
- 
--CFLAGS=
-+#CFLAGS=
- LFLAGS=
- LDFLAGS=
- INCS=
-@@ -164,10 +164,10 @@
- fi
- rm -f conftest*
- 
--echo " Using GNU C: ""$use_gcc" 1>&6
--if [ "x$use_gcc" = xyes ]; then
--  CC=gcc
--fi
-+#echo " Using GNU C: ""$use_gcc" 1>&6
-+#if [ "x$use_gcc" = xyes ]; then
-+#  CC=gcc
-+#fi
- echo " " 1>&6
- 
- 
-@@ -254,11 +254,11 @@
- EOF
- 
- # Try -pthread (most systems)
--CFLAGS_THREAD="-pthread"
-+CFLAGS_THREAD="$PTHREAD_CFLAGS"
- CFLAGS_OLD="$CFLAGS"
- CFLAGS="$CFLAGS $CFLAGS_THREAD"
- LIBS_OLD="$LIBS"
--LIBS="$LIBS -pthread"
-+LIBS="$LIBS ${PTHREAD_LIBS}"
- if { (eval echo $config_script: \"$link\") 1>&5; (eval $link) 2>&5; }; then
-   rm -rf conftest*
-   has_pthread=yes
-@@ -267,20 +267,6 @@
-   cat conftest.c >&5
- fi
- 
--# Try -lpthread 
--if [ "x$has_pthread" = xno ]; then
--  CFLAGS_THREAD="-D_REENTRANT"
--  CFLAGS="$CFLAGS_OLD $CFLAGS_THREAD" 
--  LIBS="$LIBS_OLD -lpthread"
--  if { (eval echo $config_script: \"$link\") 1>&5; (eval $link) 2>&5; }; then
--    rm -rf conftest*
--    has_pthread=yes
--  else
--    echo "$config_script: failed program was:" >&5
--    cat conftest.c >&5
--  fi
--fi
--
- # Try -lsocket (e.g. QNX)
- if [ "x$has_pthread" = xno ]; then
-   CFLAGS="$CFLAGS_OLD" 
-@@ -534,9 +520,9 @@
- # Post fixups
- ##########################################################################
- if [ "x$use_gcc" = xyes ]; then
--  CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O3 -ffast-math -Wall"
-+  CFLAGS_SPEED="-c -I. -I.. $CFLAGS -ffast-math -Wall"
-   CFLAGS="-c -I. -I.. $CFLAGS -Os -Wall"
--  CFLAGS_LINK="$INCS -O3 -ffast-math -Wall"
-+  CFLAGS_LINK="$INCS -ffast-math -Wall"
- else
-   CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O"
-   CFLAGS="-c -I. -I.. $CFLAGS -O"
diff -urN /usr/ports/graphics/glfw/files/patch-lib_x11_Makefile.x11.in graphics/glfw/files/patch-lib_x11_Makefile.x11.in
--- /usr/ports/graphics/glfw/files/patch-lib_x11_Makefile.x11.in	2008-06-16 05:17:03.000000000 +0900
+++ graphics/glfw/files/patch-lib_x11_Makefile.x11.in	1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- lib/x11/Makefile.x11.in.orig	2007-07-01 11:46:46.000000000 +0200
-+++ lib/x11/Makefile.x11.in	2008-06-15 00:35:56.000000000 +0200
-@@ -29,8 +29,8 @@
- 	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
- 	$(INSTALL) -d $(PREFIX)/include/GL
- 	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
--	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
--	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
-+	$(INSTALL) -d $(PREFIX)/libdata/pkgconfig
-+	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/libdata/pkgconfig/libglfw.pc
- 
- 
- ##########################################################################
diff -urN /usr/ports/graphics/glfw/pkg-descr graphics/glfw/pkg-descr
--- /usr/ports/graphics/glfw/pkg-descr	2009-12-21 15:22:49.000000000 +0900
+++ graphics/glfw/pkg-descr	2011-08-13 17:03:47.000000000 +0900
@@ -3,4 +3,4 @@
 for handling operating system specific tasks, such as opening an OpenGL
 window, reading keyboard and mouse input, creating threads, and much more.
 
-WWW:	http://glfw.sourceforge.net/
+WWW: http://www.glfw..org/
diff -urN /usr/ports/graphics/glfw/pkg-plist graphics/glfw/pkg-plist
--- /usr/ports/graphics/glfw/pkg-plist	2008-06-16 13:00:31.000000000 +0900
+++ graphics/glfw/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,29 +0,0 @@
-include/GL/glfw.h
-lib/libglfw.a
-lib/libglfw.so
-lib/libglfw.so.0
-libdata/pkgconfig/libglfw.pc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boing.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gears.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/keytest.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%%%%EXAMPLESDIR%%/makefile
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list