diff options
| author | adam <adam> | 2004-01-22 13:02:33 +0000 |
|---|---|---|
| committer | adam <adam> | 2004-01-22 13:02:33 +0000 |
| commit | 7883e9df91e7b2eff6568d66aa3c8725ea36b89c (patch) | |
| tree | b7b5d911af57452d57041111b489ec3544d4d374 /graphics/MesaDemos | |
| parent | ac764450c06479ca5ba501ef86be25cc10aa82b6 (diff) | |
| download | pkgsrc-7883e9df91e7b2eff6568d66aa3c8725ea36b89c.tar.gz | |
MesaDemos-6.0 fixed linking problem
Diffstat (limited to 'graphics/MesaDemos')
| -rw-r--r-- | graphics/MesaDemos/Makefile | 14 | ||||
| -rw-r--r-- | graphics/MesaDemos/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaDemos/patches/patch-ab | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index 8c9b7a93bf3..1ec38edf56b 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,24 +1,20 @@ -# $NetBSD: Makefile,v 1.12 2004/01/20 12:18:15 agc Exp $ +# $NetBSD: Makefile,v 1.13 2004/01/22 13:02:33 adam Exp $ +# -PKGNAME= MesaDemos-${MESA_VERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX} -MAINTAINER= jschauma@NetBSD.org -COMMENT= OpenGL examples and Demos +PKGNAME= MesaDemos-${MESA_VERSION} +COMMENT= OpenGL examples and Demos PATCHDIR= ${.CURDIR}/patches DISTINFO_FILE= ${.CURDIR}/distinfo .include "../Mesa/Makefile.common" -WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} USE_BUILDLINK2= yes -USE_X11= yes MAKE_FLAGS+= LIB_DEP="" pre-build: - ${RM} -fr ${WRKSRC}/src + cd ${WRKSRC} && ${RM} -fr src do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo index 8762ae1f9f8..e187680aebb 100644 --- a/graphics/MesaDemos/distinfo +++ b/graphics/MesaDemos/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.7 2004/01/20 02:48:33 jschauma Exp $ +$NetBSD: distinfo,v 1.8 2004/01/22 13:02:33 adam Exp $ SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes SHA1 (Mesa-6.0/MesaDemos-6.0.tar.bz2) = f57a76d0b9b4f70197860eda15f5241a02017a91 Size (Mesa-6.0/MesaDemos-6.0.tar.bz2) = 915060 bytes SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0 -SHA1 (patch-ab) = 0426be52c00f40b9a631813d3cbdf2cee47c39cb +SHA1 (patch-ab) = 19ec1a6d36654185ae57abddc1bd00b62d6ad4fc SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4 SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab index f6735d9230a..0cc9cd47b9f 100644 --- a/graphics/MesaDemos/patches/patch-ab +++ b/graphics/MesaDemos/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2004/01/20 02:48:33 jschauma Exp $ +$NetBSD: patch-ab,v 1.7 2004/01/22 13:02:33 adam Exp $ --- Make-config.orig 2004-01-15 09:23:54.000000000 -0500 +++ Make-config 2004-01-19 18:29:14.000000000 -0500 @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2004/01/20 02:48:33 jschauma Exp $ - "CXXFLAGS = -O2 -fPIC" \ - "GLUT_CFLAGS = -fexceptions" \ - "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" -+ "APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm" ++ "APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm" openbsd: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ |