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.

2 files changed, 29 insertions, 56 deletions

diff --git a/graphics/mesa-demos/files/config b/graphics/mesa-demos/files/config
new file mode 100644
index 000000000000..82ff79624131
--- /dev/null
+++ 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
+
diff --git a/graphics/mesa-demos/files/patch-demos-Makefile b/graphics/mesa-demos/files/patch-demos-Makefile
deleted file mode 100644
index 6c3e48495d4b..000000000000
--- a/graphics/mesa-demos/files/patch-demos-Makefile
+++ /dev/null
@@ -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)