Mesa-6.0 packages now use LIBTOOL and finally build

4 files changed, 14 insertions, 44 deletions

diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 46d8e44f1b2..6a80f413b81 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,25 +1,24 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/22 13:00:00 adam Exp $
+#
 
-PKGNAME=		${DISTNAME:C/MesaLib/glu/}
-MAINTAINER=		rh@NetBSD.org
-COMMENT=		GLU polygon tesselation facility for Mesa
+PKGNAME=	${DISTNAME:C/MesaLib/glu/}
+COMMENT=	GLU polygon tesselation facility for Mesa
 
-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:C/Lib//}
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		yes
-USE_X11=		yes
-INSTLIBS=		libGLU.so.1.3
+
+INSTLIBS=	${WRKSRC}/src/glu/sgi/libGLU.la
 
 .include "../../mk/bsd.prefs.mk"
 
 pre-build:
-	${RM} -fr ${WRKSRC}/src/mesa ${WRKSRC}/src/glw
+	cd ${WRKSRC} && ${RM} -fr src/mesa src/glut src/glw progs
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index ddefdf21819..9c34871abce 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2004/01/20 02:48:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/01/22 13:00:00 adam Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
-lib/libGLU_pic.a
+lib/libGLU.a
+lib/libGLU.la
 lib/libGLU.so
 lib/libGLU.so.1
 lib/libGLU.so.1.3
diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa
deleted file mode 100644
index de4a2cc7cd3..00000000000
--- a/graphics/glu/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.10 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/glu/patches/patch-ae b/graphics/glu/patches/patch-ae
deleted file mode 100644
index d5f41da33a8..00000000000
--- a/graphics/glu/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.