- Refactor MesaLib ports.

- Update graphics/libGLw to 7.0.1.

3 files changed, 6 insertions, 68 deletions

diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index 32fd048db7af..e808d6ac3e3e 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -6,32 +6,17 @@
 #
 
 PORTNAME=	libGLU
-PORTVERSION=	7.0.1
+PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	 mesa3d
-DISTNAME=	MesaLib-${PORTVERSION}
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL utility library
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
-
-USE_BZIP2=	yes
-USE_LDCONFIG= yes
 USE_GL=		gl
+USE_XORG=	xmu xi
 
-USE_X_PREFIX=   yes
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glu/sgi
-
-ALL_TARGET=	libGLU.so
-
-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
+SRCDIR=		glu/sgi
+HEADERS=	glu.h
+HEADERSDIR=	include/GL
 
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
diff --git a/graphics/libGLU/files/config b/graphics/libGLU/files/config
deleted file mode 100644
index 2d3520d90dfe..000000000000
--- a/graphics/libGLU/files/config
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-Makefile b/graphics/libGLU/files/patch-glu-Makefile
deleted file mode 100644
index 7c8b5ea2120c..000000000000
--- a/graphics/libGLU/files/patch-glu-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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)
- 
-