From 1555f6320fb41bd589ea616f0e1b046a839a0d5c Mon Sep 17 00:00:00 2001 From: cube Date: Tue, 11 Nov 2008 16:19:23 +0000 Subject: [PATCH] Buildlink glut, bump package version and required dependency. --- pkgtools/x11-links/Makefile | 4 ++-- pkgtools/x11-links/buildlink3.mk | 4 ++-- pkgtools/x11-links/files/xorg.glut | 9 +++++++++ pkgtools/x11-links/xorg.mk | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 pkgtools/x11-links/files/xorg.glut diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index fb0c89b0eb2a..8e5553f86480 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.96 2008/10/29 21:14:01 cube Exp $ +# $NetBSD: Makefile,v 1.97 2008/11/11 16:19:23 cube Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, # usually the most recent. -DISTNAME= x11-links-0.40 +DISTNAME= x11-links-0.41 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 65c0937e4829..f83ed82e26d8 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/10/29 21:14:01 cube Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2008/11/11 16:19:23 cube Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -18,7 +18,7 @@ BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES} BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links .if !empty(X11_LINKS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.40 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.41 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build diff --git a/pkgtools/x11-links/files/xorg.glut b/pkgtools/x11-links/files/xorg.glut new file mode 100644 index 000000000000..86ee7d2ea56a --- /dev/null +++ b/pkgtools/x11-links/files/xorg.glut @@ -0,0 +1,9 @@ +# $NetBSD: xorg.glut,v 1.1 2008/11/11 16:19:23 cube Exp $ +# +include/GL/glut.h +include/GL/glutf90.h +lib/libglut.a +lib/libglut.so +lib/libglut.so.3 +lib/libglut.so.3.7.1 +lib/pkgconfig/glut.pc diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 7010655ef236..c391e1d4cd6f 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.12 2008/10/29 21:14:01 cube Exp $ +# $NetBSD: xorg.mk,v 1.13 2008/11/11 16:19:23 cube Exp $ # # This is for X.org, but use "xfree" files also. @@ -11,6 +11,7 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" +.include "../../graphics/glut/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../x11/bigreqsproto/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk"