Update to 6.2.1.

This gains compatibility with X.Org 6.8, but breaks it with XFree86 4.4, so flip the IGNORE switch. Since there is no "install" target we can use, installation is done in do-install of port. For that we need the list of files to install which is conveniently used to generate plist, so static pkg-plist is dropped.
svn path=/head/; revision=127668
2025-07-18 01:39:16 -04:00 · 2005-01-29 23:15:49 +00:00 · 2005-01-29 23:15:49 +00:00 · b971dd6c3c · 2021-03-31 03:12:20 +00:00
commit b971dd6c3c
parent f6ac06c92c
5 changed files with 89 additions and 143 deletions
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@ -6,16 +6,13 @@
 #

 PORTNAME=	demos
-PORTVERSION=	5.0.2
-PORTREVISION=	1
+PORTVERSION=	6.2.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	mesa3d/:sf \
-			anholt/:local
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mesa3d/
 PKGNAMEPREFIX=	mesa-
-DISTFILES=	MesaDemos-${PORTVERSION}${EXTRACT_SUFX}:sf \
-		MesaLib-${PORTVERSION}${EXTRACT_SUFX}:sf
+DISTFILES=	MesaDemos-${PORTVERSION}${EXTRACT_SUFX} \
+		MesaLib-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
@ -26,32 +23,60 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-MAKEFILE=	Makefile.X11
-ALL_TARGET=	targets
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/demos
-SHAREDIR=	${PREFIX}/share/mesa-demos
+ALL_TARGET=
+MAKE_ARGS=	SUBDIRS=progs/demos
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
+DATADIR=	${PREFIX}/share/mesa-demos
+
+DEMO_PROGS=	bounce clearspd cubemap drawpix fire gamma gears geartrain \
+		glinfo gloss gltestperf glutfx ipers isosurf lodbias morph3d \
+		multiarb occlude osdemo paltex pixeltex pointblast ray \
+		readpix reflect renormal shadowtex spectex stex3d teapot \
+		terrain tessdemo texcyl texdown texenv texobj trispd tunnel \
+		tunnel2
+DEMO_IMAGES=	bw.rgb girl.rgb reflect.rgb s128.rgb tile.rgb tree2.rgba \
+		tree3.rgb wrs_logo.rgb
+DEMO_DATA=	geartrain.dat isosurf.dat terrain.dat
+
+# Generate packing list
+.for prog in ${DEMO_PROGS}
+PLIST_FILES+=	bin/${prog}
+.endfor
+.for img in ${DEMO_IMAGES}
+PLIST_FILES+=	share/mesa-demos/images/${img}
+.endfor
+.for dat in ${DEMO_DATA}
+PLIST_FILES+=	share/mesa-demos/data/${dat}
+.endfor
+PLIST_DIRS=	share/mesa-demos/images share/mesa-demos/data share/mesa-demos
+
+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
+
+do-install:
+	@for prog in ${DEMO_PROGS}; do \
+		${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
+			${PREFIX}/bin ; \
+	done
+	${MKDIR} ${PREFIX}/share/mesa-demos/images
+	${MKDIR} ${PREFIX}/share/mesa-demos/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

 .include <bsd.port.pre.mk>

-.if ${X_WINDOW_SYSTEM:L} == xorg
-IGNORE=		does not build with X.Org
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE=         does not build with XFree86
 .endif

-post-extract:
-	${REINPLACE_CMD} -e 's|../images/|${SHAREDIR}/images/|g' \
-		-e 's|geartrain.dat|${SHAREDIR}/data/geartrain.dat|g' \
-		-e 's|terrain.dat|${SHAREDIR}/data/terrain.dat|g' \
-		-e 's|isosurf.dat|${SHAREDIR}/data/isosurf.dat|g' \
-		${WRKSRC}/*.c
-
-post-install:
-	${MKDIR} ${PREFIX}/share/mesa-demos/images
-	${MKDIR} ${PREFIX}/share/mesa-demos/data
-	@for img in `${LS} ${WRKDIR}/Mesa-${PORTVERSION}/images/*.rgb`; do \
-		${INSTALL_DATA} $$img ${SHAREDIR}/images ; \
-	done
-	@for dat in `${LS} ${WRKSRC}/*.dat`; do \
-		${INSTALL_DATA} $$dat ${SHAREDIR}/data ; \
-	done
-
 .include <bsd.port.post.mk>
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@ -1,4 +1,4 @@
-MD5 (MesaDemos-5.0.2.tar.bz2) = b81fafff90995025d2f25ea02b786642
-SIZE (MesaDemos-5.0.2.tar.bz2) = 901632
-MD5 (MesaLib-5.0.2.tar.bz2) = 7b4bf9261657c2fca03796d4955e6f50
-SIZE (MesaLib-5.0.2.tar.bz2) = 1719544
+MD5 (MesaDemos-6.2.1.tar.bz2) = 3cac74667b50bcbd4f67f594fb4224a2
+SIZE (MesaDemos-6.2.1.tar.bz2) = 1004511
+MD5 (MesaLib-6.2.1.tar.bz2) = f43228cd2bf70f583ef3275c1c545421
+SIZE (MesaLib-6.2.1.tar.bz2) = 1627520
--- a/graphics/mesa-demos/files/config
+++ b/graphics/mesa-demos/files/config
@ -0,0 +1,29 @@
+# Configuration for mesa-demos port for FreeBSD
+# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
+# $FreeBSD$
+#
+
+# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
+# overriden in default include
+
+_CC := $(CC)
+_CXX := $(CXX)
+_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS)
+_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = FreeBSD
+
+# Now reset compiler and flags
+CC = $(_CC)
+CXX = $(_CXX)
+CFLAGS = $(_CFLAGS)
+CXXFLAGS = $(_CXXFLAGS)
+
+GLUT_CFLAGS = -fexceptions
+
+LIB_DIR = $(X11BASE)/lib
+
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
--- a/graphics/mesa-demos/files/patch-demos-Makefile
+++ b/graphics/mesa-demos/files/patch-demos-Makefile
@ -1,56 +0,0 @@
--- Makefile.X11.orig	Mon Apr 21 07:04:00 2003
-+++ Makefile.X11	Sun Sep 14 16:58:01 2003
-@@ -12,11 +12,12 @@
- INCDIR = ../include
- LIBDIR = ../lib
- 
-GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL $(APP_LIB_DEPS)
-+GL_LIBS = -L$(X11BASE)/lib -lglut -lGLU -lGL $(APP_LIB_DEPS) ${PTHREAD_LIBS}
- 
-OSMESA_LIBS = -L$(LIBDIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
-+OSMESA_LIBS = -L$(X11BASE)/lib -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) ${PTHREAD_LIBS}
- 
- LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
-+CFLAGS += -DGL_ARB_point_parameters=0 ${PTHREAD_CFLAGS}
- 
- PROGS = bounce \
- 	clearspd \
-@@ -56,8 +57,8 @@
- 	texobj \
- 	trispd \
- 	tunnel \
-	tunnel2 \
-	winpos
-+	tunnel2
-+#	winpos
- 
- 
- ##### RULES #####
-@@ -67,12 +68,12 @@
- 
- 
- # make executable from .c file:
-.c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
-+.c:
-+	$(CC) -I$(X11BASE)/include -I../util $(CFLAGS) $< $(GL_LIBS) -o $@
- 
- # special case: need the -lOSMesa library:
- osdemo: osdemo.c
-	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
-+	$(CC) -I$(X11BASE)/include $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
- 
- 
- ##### TARGETS #####
-@@ -97,6 +98,11 @@
- readtex.h:
- 	cp ../util/readtex.h .
- 
-+install:
-+	@for prog in $(PROGS) ;	do		\
-+		install $$prog ${PREFIX}/bin;	\
-+	done
-+	
- 
- # execute all programs
- exec: $(PROGS)
--- a/graphics/mesa-demos/pkg-plist
+++ b/graphics/mesa-demos/pkg-plist
@ -1,52 +0,0 @@
-bin/bounce
-bin/clearspd
-bin/cubemap
-bin/drawpix
-bin/fire
-bin/gamma
-bin/gears
-bin/geartrain
-bin/glinfo
-bin/gloss
-bin/gltestperf
-bin/glutfx
-bin/ipers
-bin/isosurf
-bin/lodbias
-bin/morph3d
-bin/multiarb
-bin/occlude
-bin/osdemo
-bin/paltex
-bin/pixeltex
-bin/pointblast
-bin/ray
-bin/readpix
-bin/reflect
-bin/renormal
-bin/shadowtex
-bin/spectex
-bin/stex3d
-bin/teapot
-bin/terrain
-bin/tessdemo
-bin/texcyl
-bin/texdown
-bin/texenv
-bin/texobj
-bin/trispd
-bin/tunnel
-bin/tunnel2
-share/mesa-demos/data/geartrain.dat
-share/mesa-demos/data/isosurf.dat
-share/mesa-demos/data/terrain.dat
-share/mesa-demos/images/bw.rgb
-share/mesa-demos/images/girl.rgb
-share/mesa-demos/images/reflect.rgb
-share/mesa-demos/images/s128.rgb
-share/mesa-demos/images/tile.rgb
-share/mesa-demos/images/tree3.rgb
-share/mesa-demos/images/wrs_logo.rgb
-@dirrm share/mesa-demos/images
-@dirrm share/mesa-demos/data
-@dirrm share/mesa-demos