diff options
Diffstat (limited to 'graphics/glut')
| -rw-r--r-- | graphics/glut/Makefile | 10 | ||||
| -rw-r--r-- | graphics/glut/buildlink3.mk | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 4f4d72601a9..db10ca59f36 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/02/24 06:36:18 veego Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:02:56 jlam Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} PKGREVISION= 2 @@ -9,10 +9,14 @@ CONFLICTS+= Mesa<3.2.1 .include "../Mesa/Makefile.common" -MESA_REQD+= ${MESA_VERSION} +BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION} +BUILDLINK_DEPENDS.glu+= glu>=${MESA_VERSION} INSTLIBS= ${WRKSRC}/src/glut/glx/libglut.la +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" + pre-build: cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs @@ -24,6 +28,4 @@ do-install: ${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL; \ done -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index 5ead1230395..0080e158dd3 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:14:51 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2005/06/01 18:02:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+ @@ -11,13 +11,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglut} BUILDLINK_PACKAGES+= glut .if !empty(GLUT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.glut+= glut>=${_MESA_REQD} +BUILDLINK_DEPENDS.glut+= glut>=3.4.2 BUILDLINK_RECOMMENDED.glut+= glut>=6.0.1nb1 BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut .endif # GLUT_BUILDLINK3_MK -MESA_REQD+= 6.0 - .include "../../graphics/MesaLib/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |