[Midnightbsd-cvs] mports: graphics/mesa-demos: update for mesa 7.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Mar 30 18:27:49 EDT 2009


Log Message:
-----------
update for mesa 7.3

Modified Files:
--------------
    mports/graphics/mesa-demos:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.2 -> r1.3)
        pkg-descr (r1.1 -> r1.2)
    mports/graphics/mesa-demos/files:
        config (r1.1 -> r1.2)

Added Files:
-----------
    mports/graphics/mesa-demos/files:
        patch-bin__mklib (r1.1)

Removed Files:
-------------
    mports/graphics/mesa-demos/files:
        patch-progs-xdemos-glthreads.c

-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/graphics/mesa-demos/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/mesa-demos/pkg-descr -L graphics/mesa-demos/pkg-descr -u -r1.1 -r1.2
--- graphics/mesa-demos/pkg-descr
+++ graphics/mesa-demos/pkg-descr
@@ -7,4 +7,6 @@
 vendor.  This software is distributed under the terms of the GNU Library
 General Public License, see the LICENSE file for details.
 
+paulo at isr.uc.pt
+
 WWW: http://www.mesa3d.org/
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/mesa-demos/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/mesa-demos/Makefile -L graphics/mesa-demos/Makefile -u -r1.2 -r1.3
--- graphics/mesa-demos/Makefile
+++ graphics/mesa-demos/Makefile
@@ -2,94 +2,43 @@
 # Date created:         7 Nov 2003
 # Whom:                 anholt at FreeBSD.org
 #
-# $MidnightBSD$
-# $FreeBSD: ports/graphics/mesa-demos/Makefile,v 1.17 2007/07/02 16:54:01 jkim Exp $
+# $FreeBSD: ports/graphics/mesa-demos/Makefile,v 1.24 2009/01/24 21:45:05 rnoland Exp $
 #
 
 PORTNAME=	demos
-PORTVERSION=	7.0.2
+PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mesa3d/
 PKGNAMEPREFIX=	mesa-
-DISTFILES=	MesaDemos-${PORTVERSION}${EXTRACT_SUFX} \
-		MesaLib-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports at MidnightBSD.org
+MAINTAINER=	araujo at FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
-LICENSE=	lgpl
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glu glut
+USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-ALL_TARGET=
-MAKE_ARGS=	SUBDIRS="progs/demos progs/xdemos"
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
-DATADIR=	${PREFIX}/share/mesa-demos
-
-DEMO_PROGS=	arbfplight arbfslight arbocclude bounce clearspd cubemap \
-		drawpix engine fire fogcoord fplight fslight gamma gearbox \
-		gears geartrain glinfo gloss glslnoise gltestperf glutfx \
-		ipers isosurf lodbias morph3d multiarb paltex pointblast \
-		ray readpix reflect renormal shadowtex singlebuffer spectex \
-		spriteblast stex3d streaming_rect teapot terrain tessdemo \
-		texcyl texdown texenv texobj trispd tunnel tunnel2 vao_demo \
-		winpos
-
-DEMO_IMAGES=	arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \
-		tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb
-DEMO_DATA=	geartrain.dat isosurf.dat terrain.dat
-
-XDEMO_PROGS=	glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
-		glxheads glxinfo glxpbdemo glxpixmap glxswapcontrol manywin \
-		offset overlay pbdemo pbinfo wincopy xfont xrotfontdemo \
-		yuvrect_client
-
-# Generate packing list
-PLIST_FILES=
-.for prog in ${DEMO_PROGS}
-PLIST_FILES+=	bin/${prog}
-.endfor
-.for prog in ${XDEMO_PROGS}
-PLIST_FILES+=	bin/${prog}
-.endfor
-.for img in ${DEMO_IMAGES}
-PLIST_FILES+=	%%DATADIR%%/images/${img}
-.endfor
-.for dat in ${DEMO_DATA}
-PLIST_FILES+=	%%DATADIR%%/data/${dat}
-.endfor
-PLIST_DIRS=	%%DATADIR%%/images %%DATADIR%%/data %%DATADIR%%
-
-post-extract:
-	${CP} ${FILESDIR}/config ${WRKSRC}/configs/current
-	${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
-		-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
-		-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
-		-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
-		${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
+DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 
 do-install:
-	@for prog in ${DEMO_PROGS}; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
-			${PREFIX}/bin ; \
-	done
-	@for prog in ${XDEMO_PROGS}; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/$$prog \
-			${PREFIX}/bin ; \
+	@for i in demos xdemos; do \
+		cd ${WRKSRC}/progs/$$i; \
+		for j in `${MAKE} -V PROGS`; do \
+			echo ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+			${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+		done; \
 	done
 	${MKDIR} ${DATADIR}/images ${DATADIR}/data
-	@for img in ${DEMO_IMAGES}; do \
-		${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \
-			${DATADIR}/images ; \
-	done
-	@for dat in ${DEMO_DATA}; do \
-		${INSTALL_DATA} ${WRKSRC}/progs/demos/$$dat ${DATADIR}/data ; \
-	done
+	@cd ${WRKSRC}/progs/images; \
+		for i in `ls *.rgb*`; do \
+			echo ${INSTALL_DATA} $$i ${DATADIR}/images; \
+			${INSTALL_DATA} $$i ${DATADIR}/images; \
+		done
+	@cd ${WRKSRC}/progs/demos; \
+		for i in `ls *.dat`; do \
+			echo ${INSTALL_DATA} $$i ${DATADIR}/data; \
+			${INSTALL_DATA} $$i ${DATADIR}/data; \
+		done
 
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA_GL)
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/mesa-demos/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/mesa-demos/distinfo -L graphics/mesa-demos/distinfo -u -r1.2 -r1.3
--- graphics/mesa-demos/distinfo
+++ graphics/mesa-demos/distinfo
@@ -1,6 +1,8 @@
-MD5 (MesaDemos-7.0.2.tar.bz2) = 11a10410bae7be85cf25bc7119966468
-SHA256 (MesaDemos-7.0.2.tar.bz2) = ce39b26085acd8e5dffa8233618acac2605cc42203bc4f81c6e4504265f0ffaa
-SIZE (MesaDemos-7.0.2.tar.bz2) = 1341542
-MD5 (MesaLib-7.0.2.tar.bz2) = 93e6ed7924ff069a4f883b4fce5349dc
-SHA256 (MesaLib-7.0.2.tar.bz2) = 9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
-SIZE (MesaLib-7.0.2.tar.bz2) = 3353217
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+RMD160 (MesaLib-7.3.tar.bz2) = ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
+MD5 (MesaDemos-7.3.tar.bz2) = 3f0741394069bdf2329565a387396cda
+SHA256 (MesaDemos-7.3.tar.bz2) = f9f1d6d9e71e76eedf8f16b7150ccdd01d64f5e4a40cf1c2bba08cacf7eb6a60
+RMD160 (MesaDemos-7.3.tar.bz2) = 8f280404a19d3f214a4e1fc96dd6b502ba9d030a
+SIZE (MesaDemos-7.3.tar.bz2) = 1379457
--- graphics/mesa-demos/files/patch-progs-xdemos-glthreads.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- progs/xdemos/glthreads.c.orig	Fri May 18 20:28:57 2007
-+++ progs/xdemos/glthreads.c	Fri May 18 20:32:37 2007
-@@ -505,7 +505,7 @@
-    for (i = 0; i < numThreads; i++) {
-       pthread_create(&WinThreads[i].Thread, NULL, thread_function,
-                      (void*) &WinThreads[i]);
--      printf("glthreads: Created thread %u\n", (unsigned int) WinThreads[i].Thread);
-+      printf("glthreads: Created thread %lu\n", (unsigned long) WinThreads[i].Thread);
-    }
- 
-    if (MultiDisplays)
Index: config
===================================================================
RCS file: /home/cvs/mports/graphics/mesa-demos/files/config,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/mesa-demos/files/config -L graphics/mesa-demos/files/config -u -r1.1 -r1.2
--- graphics/mesa-demos/files/config
+++ graphics/mesa-demos/files/config
@@ -1,6 +1,4 @@
-# Configuration for mesa-demos port for FreeBSD
 # Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
-# $FreeBSD: ports/graphics/mesa-demos/files/config,v 1.3 2007/05/29 18:33:19 anholt Exp $
 #
 
 # Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
@@ -8,13 +6,13 @@
 
 _CC := $(CC)
 _CXX := $(CXX)
-_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \
+_CFLAGS := -fPIC -pedantic -I$(LOCALBASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS) \
 	-DPTHREADS $(PTHREAD_CFLAGS)
 _CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
 
 include $(TOP)/configs/default
 
-CONFIG_NAME = FreeBSD
+CONFIG_NAME = MidnightBSD
 
 # Now reset compiler and flags
 CC = $(_CC)
@@ -24,7 +22,7 @@
 
 GLUT_CFLAGS = -fexceptions
 
-LIB_DIR = $(X11BASE)/lib
+LIB_DIR = $(LOCALBASE)/lib
 
 APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm $(PTHREAD_LIBS)
 
--- /dev/null
+++ graphics/mesa-demos/files/patch-bin__mklib
@@ -0,0 +1,11 @@
+--- bin/mklib.bak	2009-03-15 15:22:11 -0400
++++ bin/mklib	2009-03-15 15:22:25 -0400
+@@ -420,7 +420,7 @@
+ 	fi
+ 	;;
+ 
+-    'FreeBSD')
++    'FreeBSD' | 'MidnightBSD')
+ 	# we assume gcc
+ 
+ 	if [ "x$LINK" = "x" ] ; then


More information about the Midnightbsd-cvs mailing list