upgrade to glu-7.11.2

5 files changed, 22 insertions, 88 deletions

diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 58b3039d873..eeccda97fdb 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,32 +1,34 @@
-# $NetBSD: Makefile,v 1.57 2009/08/25 07:29:18 hasso Exp $
+# $NetBSD: Makefile,v 1.58 2013/05/16 05:25:02 richard Exp $
 
 PKGNAME=	glu-${MESA_PKGVERSION}
-PKGREVISION=	2
 COMMENT=	GLU polygon tessellation facility for Mesa
 
 CONFLICTS+=	Mesa-glx-[0-9]*
 CONFLICTS+=	Mesa<3.2.1
 
-MESA_HEADERS=	glu.h glu_mangle.h
 
 PKGCONFIG_OVERRIDE+=    src/glu/glu.pc.in
-# no configure stage
-PKGCONFIG_OVERRIDE_STAGE=       pre-build
+
+CONFIGURE_ARGS+=        --enable-glu
+CONFIGURE_ARGS+=        --disable-glut
+CONFIGURE_ARGS+=        --disable-glw
+CONFIGURE_ARGS+=        --with-dri-drivers=""
+
+BUILD_DIRS=             src/glu
+BUILD_TARGET=           default
+
+INSTALL_DIRS=           src/glu
+INSTALLATION_DIRS+=     include/GL
 
 .include "../../graphics/Mesa/Makefile.lib"
 
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=${MESA_VERSION}
 .include "../../graphics/MesaLib/buildlink3.mk"
 
-post-extract:
-	${GREP} '^[[:cntrl:]][g][l][u]' ${WRKSRC}/src/glu/sgi/glu.def \
-	| ${SED} -e 's,^[[:cntrl:]],,' > ${WRKSRC}/src/glu/sgi/glu.sym
-	${RM} ${WRKSRC}/src/glu/sgi/glu.exports
-	${CP} ${FILESDIR}/glu.exports.in ${WRKSRC}/src/glu/sgi/
-
-pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/glx src/mesa src/glut src/glw progs
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/include/GL/glu.h \
+		${DESTDIR}${PREFIX}/include/GL/glu.h
+	${INSTALL_DATA} ${WRKSRC}/include/GL/glu_mangle.h \
+		${DESTDIR}${PREFIX}/include/GL/glu_mangle.h
 
-# no configure phase
-.include "../../mk/configure/pkg-config-override.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index dbfab323bcd..324fa7094d6 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 17:59:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/05/16 05:25:02 richard Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
-lib/libGLU.la
+lib/libGLU.so
+lib/libGLU.so.1
 lib/pkgconfig/glu.pc
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index f019fc7bfe8..4a6fee65e6f 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2009/03/20 19:24:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2013/05/16 05:25:02 richard Exp $
 
 BUILDLINK_TREE+=	glu
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	glu
 GLU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.glu+=	glu>=3.4.2
-BUILDLINK_ABI_DEPENDS.glu+=	glu>=7.0.3
+BUILDLINK_ABI_DEPENDS.glu+=	glu>=7.11.2
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/glu/files/glu.exports.in b/graphics/glu/files/glu.exports.in
deleted file mode 100644
index 3e2661ec753..00000000000
--- a/graphics/glu/files/glu.exports.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#if defined(USE_MGL_NAMESPACE)
-# include "glu_mangle.h" /* mangle function names if needed */
-#endif
-
-	gluBeginCurve
-	gluBeginPolygon
-	gluBeginSurface
-	gluBeginTrim
-	gluBuild1DMipmapLevels
-	gluBuild1DMipmaps
-	gluBuild2DMipmapLevels
-	gluBuild2DMipmaps
-	gluBuild3DMipmapLevels
-	gluBuild3DMipmaps
-	gluCheckExtension
-	gluCylinder
-	gluDeleteNurbsRenderer
-	gluDeleteQuadric
-	gluDeleteTess
-	gluDisk
-	gluEndCurve
-	gluEndPolygon
-	gluEndSurface
-	gluEndTrim
-	gluErrorString
-	gluGetNurbsProperty
-	gluGetString
-	gluGetTessProperty
-	gluLoadSamplingMatrices
-	gluLookAt
-	gluNewNurbsRenderer
-	gluNewQuadric
-	gluNewTess
-	gluNextContour
-	gluNurbsCallback
-	gluNurbsCallbackData
-	gluNurbsCallbackDataEXT
-	gluNurbsCurve
-	gluNurbsProperty
-	gluNurbsSurface
-	gluOrtho2D
-	gluPartialDisk
-	gluPerspective
-	gluPickMatrix
-	gluProject
-	gluPwlCurve
-	gluQuadricCallback
-	gluQuadricDrawStyle
-	gluQuadricNormals
-	gluQuadricOrientation
-	gluQuadricTexture
-	gluScaleImage
-	gluSphere
-	gluTessBeginContour
-	gluTessBeginPolygon
-	gluTessCallback
-	gluTessEndContour
-	gluTessEndPolygon
-	gluTessNormal
-	gluTessProperty
-	gluTessVertex
-	gluUnProject
-	gluUnProject4
diff --git a/graphics/glu/hacks.mk b/graphics/glu/hacks.mk
deleted file mode 100644
index 48306f4ee64..00000000000
--- a/graphics/glu/hacks.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1 2008/04/24 07:40:24 bjs Exp $
-#
-.if !defined(GLU_HACKS_MK)
-GLU_HACKS_MK=	# defined
-.  include "../../graphics/MesaLib/hacks.mk"
-.endif