diff options
| author | hubertf <hubertf@pkgsrc.org> | 2001-04-12 20:38:25 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2001-04-12 20:38:25 +0000 |
| commit | 31f5ce665c0ccd045b02817a1bc55c6c5a524f2c (patch) | |
| tree | 1277e4e3f20b813f525ebdfbf1464a53173625b8 /graphics | |
| parent | af0dd9c4d62f9a4f227f94a6b002bf43a4a634bc (diff) | |
| download | pkgsrc-31f5ce665c0ccd045b02817a1bc55c6c5a524f2c.tar.gz | |
Trivia - What's wrong in this picture:
smaug% grep 'MesaLib.*3.4' */*/Makefile*
graphics/Mesa/Makefile:DEPENDS+= MesaLib-3.4:../../graphics/MesaLib
graphics/MesaLib/Makefile:DISTNAME= MesaLib-3.4.1
Invent a variable MESA_VERSION in Mesa/Makefile.common and use it.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Mesa/Makefile | 12 | ||||
| -rw-r--r-- | graphics/Mesa/Makefile.common | 1 | ||||
| -rw-r--r-- | graphics/MesaLib/Makefile | 6 | ||||
| -rw-r--r-- | graphics/glu/Makefile | 6 | ||||
| -rw-r--r-- | graphics/glut/Makefile | 6 |
5 files changed, 20 insertions, 11 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index 083954c614e..7989d2a7f56 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2001/03/23 12:36:53 drochner Exp $ +# $NetBSD: Makefile,v 1.39 2001/04/12 20:38:25 hubertf Exp $ # -DISTNAME= Mesa-3.4.1 +.include "Makefile.common" + +DISTNAME= Mesa-${MESA_VERSION} CATEGORIES= graphics MASTER_SITES= # empty DISTFILES= # empty @@ -10,8 +12,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ssec.wisc.edu/~brianp/Mesa.html COMMENT= Graphics library meta package, similar to SGI's OpenGL -DEPENDS+= glu-3.4.1:../../graphics/glu -DEPENDS+= glut-3.4.1:../../graphics/glut +DEPENDS+= glu-${MESA_VERSION}:../../graphics/glu +DEPENDS+= glut-${MESA_VERSION}:../../graphics/glut CONFLICTS= Mesa-glx-* @@ -19,7 +21,7 @@ CHECK_MESA= yes .include "../../mk/bsd.prefs.mk" .if ${HAVE_BUILTIN_MESA} == "NO" -DEPENDS+= MesaLib-3.4.1:../../graphics/MesaLib +DEPENDS+= MesaLib-${MESA_VERSION}:../../graphics/MesaLib .endif USE_X11BASE= yes diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common new file mode 100644 index 00000000000..ca63800941d --- /dev/null +++ b/graphics/Mesa/Makefile.common @@ -0,0 +1 @@ +MESA_VERSION= 3.4.1 diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 285f1e38da5..324d4de19cf 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2001/03/23 12:36:54 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2001/04/12 20:38:26 hubertf Exp $ # -DISTNAME= MesaLib-3.4.1 +.include "../Mesa/Makefile.common" + +DISTNAME= MesaLib-${MESA_VERSION} WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} CATEGORIES= graphics MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index e585bfb6e35..0a7bee54be9 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2001/03/23 12:36:54 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2001/04/12 20:38:26 hubertf Exp $ # -DISTNAME= MesaLib-3.4.1 +.include "../Mesa/Makefile.common" + +DISTNAME= MesaLib-${MESA_VERSION} PKGNAME= ${DISTNAME:C/MesaLib/glu/} CATEGORIES= graphics MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 094bd73564a..d81d7bd7adf 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2001/03/23 12:36:55 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2001/04/12 20:38:26 hubertf Exp $ # -DISTNAME= Mesa-3.4.1 +.include "../Mesa/Makefile.common" + +DISTNAME= Mesa-${MESA_VERSION} PKGNAME= ${DISTNAME:S/Mesa/glut/} CATEGORIES= graphics MASTER_SITES= ftp://ftp.mesa3d.org/mesa/ \ |