5 files changed, 13 insertions, 75 deletions

diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index 4d613a062ac3..691d6bb4a341 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -6,38 +6,22 @@
 #
 
 PORTNAME=	libGLw
-PORTVERSION=	6.5.3
+PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	 mesa3d
-DISTNAME=	MesaLib-${PORTVERSION}
 
-MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL widgets library
 
-CONFLICTS=	XFree86-libraries-* xorg-libraries-6.*
-
+BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
 LIB_DEPENDS+=	Xm.3:${PORTSDIR}/x11-toolkits/open-motif
 
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-USE_XORG=	xt
 USE_GL=		gl
+USE_XORG=	xt
 
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glw/
-
-ALL_TARGET=	libGLw.so
-GLWHEADERS=	GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h
-
-post-patch:
-	${CP} ${FILESDIR}/config ${WRKDIR}/Mesa-${PORTVERSION}/configs/current
+CFLAGS+=	-D__GLX_MOTIF=1
+SRCDIR=		glw
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libGLw.so.1 ${PREFIX}/lib
-	${LN} -sf libGLw.so.1 ${PREFIX}/lib/libGLw.so
-.for i in ${GLWHEADERS}
-	${INSTALL_DATA} ${WRKDIR}/Mesa-${PORTVERSION}/src/glw/$i ${PREFIX}/include/GL
-.endfor
+HEADERS=	GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h
+HEADERSDIR=	src/glw
 
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
index 127cae9262ef..e647bcdc7c92 100644
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-6.5.3.tar.bz2) = 46359457147c469745f24b5074a186f0
-SHA256 (MesaLib-6.5.3.tar.bz2) = f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
-SIZE (MesaLib-6.5.3.tar.bz2) = 3351899
+MD5 (MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad
+SHA256 (MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
+SIZE (MesaLib-7.0.1.tar.bz2) = 3343538
diff --git a/graphics/libGLw/files/config b/graphics/libGLw/files/config
deleted file mode 100644
index c586636adcf0..000000000000
--- a/graphics/libGLw/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/libGLw/files/Attic/config,v 1.2 2007-07-30 07:49:42 pav 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 -D__GLX_MOTIF=1 $(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
-
-GLW_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/libGLw/files/patch-glw-GLwDrawA.c b/graphics/libGLw/files/patch-glw-GLwDrawA.c
index 3f5db5eb769c..fac6f15b4823 100644
--- a/graphics/libGLw/files/patch-glw-GLwDrawA.c
+++ b/graphics/libGLw/files/patch-glw-GLwDrawA.c
@@ -1,5 +1,5 @@
---- GLwDrawA.c.orig	Tue Mar 13 21:11:41 2007
-+++ GLwDrawA.c	Tue Mar 13 21:12:38 2007
+--- src/glw/GLwDrawA.c.orig	Tue Mar 13 21:11:41 2007
++++ src/glw/GLwDrawA.c	Tue Mar 13 21:12:38 2007
 @@ -668,7 +668,7 @@
  #endif
  
diff --git a/graphics/libGLw/files/patch-glw-Makefile b/graphics/libGLw/files/patch-glw-Makefile
deleted file mode 100644
index 03f9d3687549..000000000000
--- a/graphics/libGLw/files/patch-glw-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	Thu Dec  7 19:46:44 2006
-+++ Makefile	Thu Dec  7 19:47:07 2006
-@@ -37,10 +37,10 @@
- 
- 
- # Make the library
--$(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-+$(GLW_LIB_NAME): $(OBJECTS)
- 	$(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
- 		-major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
--		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
-+		$(MKLIB_OPTIONS) \
- 		$(GLW_LIB_DEPS) $(OBJECTS)
- 
-