diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-11-18 16:10:55 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-11-18 16:10:55 +0000 |
| commit | 87938dc3b74f8bb786d671c27ef7ac1b29893675 (patch) | |
| tree | 2bb68f730e1b8885e40673667ec8b888cc17ebc3 /graphics/Mesa | |
| parent | 34d0358cbb98de0832373ff41337e235a6c0abb8 (diff) | |
| download | pkgsrc-87938dc3b74f8bb786d671c27ef7ac1b29893675.tar.gz | |
Finally update Mesa and friends after the distfile changed on the website
without a version bump. Changes made, according to the website, for
libtool/autofoo fixes.
Some changes from Ron Roskens:
glut depends upon graphics/glu (otherwise its linked against X11R6 libs)
MesaDemos:
rather than using the pre-built distribution makefiles,
use the automake/configure built makefiles which have
the build dependencies all setup.
This closes PR pkg/23476.
Diffstat (limited to 'graphics/Mesa')
| -rw-r--r-- | graphics/Mesa/Makefile | 7 | ||||
| -rw-r--r-- | graphics/Mesa/Makefile.common | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index bab6c4d83ac..aaca98fc55b 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2003/09/29 21:30:28 jschauma Exp $ +# $NetBSD: Makefile,v 1.53 2003/11/18 16:10:55 jschauma Exp $ # PKGNAME= Mesa-${MESA_VERSION} @@ -12,8 +12,6 @@ CONFLICTS= Mesa-glx-[0-9]* pre-patch: # empty -.include "Makefile.common" - USE_BUILDLINK2= yes USE_X11BASE= yes @@ -22,8 +20,11 @@ NO_CONFIGURE= yes NO_BUILD= yes EXTRACT_ONLY= # empty +post-patch: # empty do-install: # empty +.include "Makefile.common" + .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glu/buildlink2.mk" .include "../../graphics/glut/buildlink2.mk" diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 54b6faa165b..3857950ef64 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2003/09/29 21:30:28 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.20 2003/11/18 16:10:55 jschauma Exp $ DISTNAME?= MesaLib-${MESA_VERSION} CATEGORIES?= graphics @@ -8,16 +8,17 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= tech-pkg@NetBSD.org HOMEPAGE?= http://www.mesa3d.org/ -AUTOMAKE_REQD= 1.4 +AUTOMAKE_REQD= 1.7 USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE?= yes CONFIGURE_ARGS+= --enable-static +DIST_SUBDIR= Mesa-${MESA_VERSION} -.if !target(pre-patch) -pre-patch: +.if !target(post-patch) +post-patch: cd ${WRKSRC} && ${ACLOCAL} && ${AUTOMAKE} .endif |