Mesa-6.0 packages now use LIBTOOL and finally build

6 files changed, 14 insertions, 78 deletions

diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 7d8561109f6..f961afcf858 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,28 +1,22 @@
-# $NetBSD: Makefile,v 1.26 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/22 13:00:55 adam Exp $
+#
 
-PKGNAME=		${DISTNAME:S/MesaLib/glut/}
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
-MAINTAINER=		rh@NetBSD.org
-COMMENT=		GLUT Graphics library similar to SGI's OpenGL
+PKGNAME=	${DISTNAME:S/MesaLib/glut/}
+COMMENT=	GLUT Graphics library similar to SGI's OpenGL
 
-CONFLICTS+=		Mesa-glx-[0-9]*
-CONFLICTS+=		Mesa<3.2.1
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+CONFLICTS+=	Mesa-glx-[0-9]*
+CONFLICTS+=	Mesa<3.2.1
 
 .include "../../graphics/Mesa/Makefile.common"
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		yes
-USE_X11=		yes
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-INSTLIBS=		libglut.so.3.7
+
+INSTLIBS=	${WRKSRC}/src/glut/glx/libglut.la
 
 pre-build:
-	${RM} -fr ${WRKSRC}/src/mesa ${WRKSRC}/src/glw 			\
-		${WRKSRC}/src/glu ${WRKSRC}/progs
+	cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index 5ecb6ba2ee4..aa39fe127c4 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2004/01/20 02:48:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/01/22 13:00:55 adam Exp $
 include/GL/glut.h
 include/GL/glutf90.h
+lib/libglut.a
+lib/libglut.la
 lib/libglut.so
 lib/libglut.so.3
 lib/libglut.so.3.7
-lib/libglut_pic.a
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/patches/patch-aa b/graphics/glut/patches/patch-aa
deleted file mode 100755
index 721fc3a80a3..00000000000
--- a/graphics/glut/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/07/15 23:31:23 jschauma Exp $
-
---- src-glut/glutint.h.orig	2003-07-11 19:33:42.000000000 +0000
-+++ src-glut/glutint.h	2003-07-11 19:33:45.000000000 +0000
-@@ -33,6 +33,10 @@
- #include <gl/mesa_wgl.h>
- #endif
- 
-+#ifdef GL_VERSION_1_4
-+#include <GL/glxext.h>
-+#endif
-+
- #ifndef _WIN32
- /* added by BrianP: */
- #ifndef APIENTRY
diff --git a/graphics/glut/patches/patch-ab b/graphics/glut/patches/patch-ab
deleted file mode 100644
index b36f8eae0cd..00000000000
--- a/graphics/glut/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/11/09 02:23:18 jschauma Exp $
-
---- configure.orig	2003-11-08 19:10:36.000000000 -0500
-+++ configure	2003-11-08 19:10:53.000000000 -0500
-@@ -7121,7 +7121,7 @@
- if test "x$enable_optim" = xyes; then
-     if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then
-     if test "x$GCC" = xyes; then
--      CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing"
-+      CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing"
-       case "$host" in
-       i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";;
-       esac
diff --git a/graphics/glut/patches/patch-ad b/graphics/glut/patches/patch-ad
deleted file mode 100644
index 345892d2e74..00000000000
--- a/graphics/glut/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/11/18 16:10:56 jschauma Exp $
-
---- src-glut/Makefile.am.orig	2003-11-07 11:36:19.000000000 -0500
-+++ src-glut/Makefile.am	2003-11-17 23:48:12.000000000 -0500
-@@ -8,8 +8,7 @@
- lib_LTLIBRARIES = libglut.la
- EXTRA_PROGRAMS = capturexfont
- 
--#libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
--libglut_la_LDFLAGS = -L../@GLU_DIR@
-+libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
- libglut_la_LIBADD = -lGLU
- libglut_la_SOURCES = \
- 	glutwin32.h \
diff --git a/graphics/glut/patches/patch-ae b/graphics/glut/patches/patch-ae
deleted file mode 100644
index d5f41da33a8..00000000000
--- a/graphics/glut/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:56 jschauma Exp $
-
---- src/GGI/Makefile.am.orig	2003-11-13 21:47:55.000000000 -0500
-+++ src/GGI/Makefile.am	2003-11-13 21:48:04.000000000 -0500
-@@ -7,10 +7,10 @@
- ggimesaconfdatadir = ${sysconfdir}/ggi
- ggimesaconfdata_DATA = ggimesa.conf
- 
--INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
-+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
- 	-I$(top_srcdir)/src $(GGI_CFLAGS)
- 
--DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
-+DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
- 
- if HAVE_GGI
- # Build a libtool convenience library.