- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

7 files changed, 68 insertions, 37 deletions

diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 6fb773da7d22..56df5de64162 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -6,27 +6,32 @@
 #
 
 PORTNAME=	libGLU
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	6.5.3
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R6.8.1/tars
-DISTNAME=	X11R6.8.1-src1
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	 mesa3d
+DISTNAME=	MesaLib-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
 
-LIB_DEPENDS=	GL.1:${PORTSDIR}/x11/libGL
+CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
 
-CONFLICTS=	XFree86-libraries-*
+USE_BZIP2=	yes
+USE_LDCONFIG= yes
+USE_GL=		gl
 
-EXTRA_PATCHES=	${CF_PATCHES}
+USE_X_PREFIX=   yes
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glu/sgi
 
-XBUILD_DIRS=	lib/GLU
-INSTALLS_SHLIB=	yes
+ALL_TARGET=	libGLU.so
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/include/GL/glu.h ${PREFIX}/include/GL
+post-patch:
+	${CP} ${FILESDIR}/config ${WRKDIR}/Mesa-${PORTVERSION}/configs/current
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1 ${PREFIX}/lib
+	${LN} -sf libGLU.so.1 ${PREFIX}/lib/libGLU.so
+	${INSTALL_DATA} ${WRKDIR}/Mesa-${PORTVERSION}/include/GL/glu.h ${PREFIX}/include/GL
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index c5664d26e546..127cae9262ef 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
-SHA256 (xorg/X11R6.8.1-src1.tar.gz) = cba581759249a292996ae552e98c7803ef1692ce81c1b06bed472f3b3d465b70
-SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
+SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
+SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
diff --git a/graphics/libGLU/files/config b/graphics/libGLU/files/config
new file mode 100644
index 000000000000..2d3520d90dfe
--- /dev/null
+++ b/graphics/libGLU/files/config
@@ -0,0 +1,31 @@
+# Configuration for mesa-demos port for FreeBSD
+# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
+# $FreeBSD: /tmp/pcvs/ports/graphics/libGLU/files/Attic/config,v 1.1 2007-05-19 20:09:44 flz Exp $
+#
+
+# 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
+
+GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
diff --git a/graphics/libGLU/files/patch-GLU-Imakefile b/graphics/libGLU/files/patch-GLU-Imakefile
deleted file mode 100644
index 78fa9f847194..000000000000
--- a/graphics/libGLU/files/patch-GLU-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GLU/Imakefile.orig	Sun May  9 16:24:25 2004
-+++ lib/GLU/Imakefile	Sun May  9 16:24:53 2004
-@@ -47,7 +47,7 @@
- #define CplusplusSource
- 
- #ifdef SharedGLUReqs
--REQUIREDLIBS = SharedGLUReqs
-+REQUIREDLIBS = -L$(USRLIBDIR) SharedGLUReqs
- #endif
- 
- #ifndef SeparateSharedCompile
diff --git a/graphics/libGLU/files/patch-glu-Makefile b/graphics/libGLU/files/patch-glu-Makefile
new file mode 100644
index 000000000000..7c8b5ea2120c
--- /dev/null
+++ b/graphics/libGLU/files/patch-glu-Makefile
@@ -0,0 +1,16 @@
+--- Makefile.orig	Wed Jul 12 19:43:20 2006
++++ Makefile	Tue Oct  3 00:22:56 2006
+@@ -135,10 +135,10 @@
+ 	-mkdir $(TOP)/$(LIB_DIR)
+ 
+ # Make the library:
+-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
+-	$(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
++$(GLU_LIB_NAME): $(OBJECTS)
++	${TOP}/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
+ 		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+-		-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
++		-cplusplus $(MKLIB_OPTIONS) \
+ 		$(GLU_LIB_DEPS) $(OBJECTS)
+ 
+ 
diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist
index ba0970e3ba25..addb2a1722dc 100644
--- a/graphics/libGLU/pkg-plist
+++ b/graphics/libGLU/pkg-plist
@@ -1,4 +1,3 @@
 include/GL/glu.h
-lib/libGLU.a
 lib/libGLU.so
 lib/libGLU.so.1
diff --git a/graphics/libGLU/scripts/configure b/graphics/libGLU/scripts/configure
deleted file mode 100644
index d95275797c01..000000000000
--- a/graphics/libGLU/scripts/configure
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen