diff options
| author | richard <richard@pkgsrc.org> | 2013-05-16 05:28:13 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-05-16 05:28:13 +0000 |
| commit | 44dd1ff6074d822a7088a48d375f9b8518735f02 (patch) | |
| tree | 9c24517c41bb4058deed6f23fff36ea185572bc8 /graphics | |
| parent | ffdf511e47b37a498a4192d3bf7e48055fb19861 (diff) | |
| download | pkgsrc-44dd1ff6074d822a7088a48d375f9b8518735f02.tar.gz | |
upgrade to glut-7.11.2
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/glut/Makefile | 28 | ||||
| -rw-r--r-- | graphics/glut/PLIST | 5 | ||||
| -rw-r--r-- | graphics/glut/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/glut/hacks.mk | 6 |
4 files changed, 22 insertions, 21 deletions
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 1ee2f6aa884..d2ee4d18b97 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,17 +1,13 @@ -# $NetBSD: Makefile,v 1.53 2009/08/25 07:29:18 hasso Exp $ +# $NetBSD: Makefile,v 1.54 2013/05/16 05:28:13 richard Exp $ PKGNAME= glut-${MESA_PKGVERSION} -PKGREVISION= 1 COMMENT= GLUT Graphics library similar to SGI's OpenGL CONFLICTS+= Mesa-glx-[0-9]* CONFLICTS+= Mesa<3.2.1 -MESA_HEADERS= glut.h glutf90.h PKGCONFIG_OVERRIDE+= src/glut/glx/glut.pc.in -# no configure stage -PKGCONFIG_OVERRIDE_STAGE= pre-build .include "../../graphics/Mesa/Makefile.lib" @@ -23,11 +19,21 @@ BUILDLINK_API_DEPENDS.glu+= glu>=${MESA_PKGVERSION} .include "../../x11/libXi/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -pre-build: - cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glx src/glw progs -### XXX why is this needed? - mkdir -p ${WRKSRC}/src/glut/lib +CONFIGURE_ARGS+= --enable-glu +CONFIGURE_ARGS+= --enable-glut +CONFIGURE_ARGS+= --disable-glw +CONFIGURE_ARGS+= --with-dri-drivers="" + +BUILD_DIRS= src/glut/glx +BUILD_TARGET= default + +INSTALL_DIRS= src/glut/glx +INSTALLATION_DIRS+= include/GL + +post-install: + ${INSTALL_DATA} ${WRKSRC}/include/GL/glut.h \ + ${DESTDIR}${PREFIX}/include/GL/glut.h + ${INSTALL_DATA} ${WRKSRC}/include/GL/glutf90.h \ + ${DESTDIR}${PREFIX}/include/GL/glutf90.h -# no configure phase -.include "../../mk/configure/pkg-config-override.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST index ad1cf98a0dd..e492256b57f 100644 --- a/graphics/glut/PLIST +++ b/graphics/glut/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:59:15 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2013/05/16 05:28:13 richard Exp $ include/GL/glut.h include/GL/glutf90.h -lib/libglut.la +lib/libglut.so +lib/libglut.so.3 lib/pkgconfig/glut.pc diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk index aa86eb02921..0b6e34791fb 100644 --- a/graphics/glut/buildlink3.mk +++ b/graphics/glut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:24:39 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2013/05/16 05:28:13 richard Exp $ BUILDLINK_TREE+= glut @@ -6,7 +6,7 @@ BUILDLINK_TREE+= glut GLUT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.glut+= glut>=3.4.2 -BUILDLINK_ABI_DEPENDS.glut+= glut>=7.0.3 +BUILDLINK_ABI_DEPENDS.glut+= glut>=7.11.2 BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/graphics/glut/hacks.mk b/graphics/glut/hacks.mk deleted file mode 100644 index de123b57334..00000000000 --- a/graphics/glut/hacks.mk +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2008/04/24 07:40:24 bjs Exp $ -# -.if !defined(GLUT_HACKS_MK) -GLUT_HACKS_MK= # defined -. include "../../graphics/MesaLib/hacks.mk" -.endif |