diff options
| author | dmcmahill <dmcmahill> | 2001-05-08 19:48:45 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2001-05-08 19:48:45 +0000 |
| commit | 760bfe99f123da3299be5e92345fdf256aa704df (patch) | |
| tree | 81e3a5181e3c7bda05688f909e69b311ab5844c7 /graphics | |
| parent | c7af32e026702b9130027b47d3e00185447d2f38 (diff) | |
| download | pkgsrc-760bfe99f123da3299be5e92345fdf256aa704df.tar.gz | |
make sure the build doesn't pick up a bad ARCH from the users
environment.
Also, `uname -p` == "alpha" is not a check for OSF...
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/dx/Makefile | 6 | ||||
| -rw-r--r-- | graphics/dx/distinfo | 4 | ||||
| -rw-r--r-- | graphics/dx/patches/patch-ab | 17 |
3 files changed, 19 insertions, 8 deletions
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile index 1903c6fbc78..c428b9b991f 100644 --- a/graphics/dx/Makefile +++ b/graphics/dx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 15:22:17 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/05/08 19:48:45 dmcmahill Exp $ DISTNAME= dx-4.1.0 CATEGORIES= graphics @@ -15,4 +15,8 @@ USE_MESA= yes GNU_CONFIGURE= yes USE_GMAKE= yes +#override ARCH to avoid picking up a bad ${ARCH} during the build +MAKE_ENV+= ARCH="" +CONFIGURE_ENV+= ARCH="" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/dx/distinfo b/graphics/dx/distinfo index 037120b67b6..47c1cb45274 100644 --- a/graphics/dx/distinfo +++ b/graphics/dx/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:10 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/05/08 19:48:45 dmcmahill Exp $ SHA1 (dx-4.1.0.tar.gz) = 2440390af3904206e671fca9bc7eba60cf284cb6 Size (dx-4.1.0.tar.gz) = 9055565 bytes SHA1 (patch-aa) = dcb0c34ae37f0c8a9ca7302c3aab5608c65ac1b5 -SHA1 (patch-ab) = 646d18a2a475e71b54a7a8ba2a97a9203ef93e35 +SHA1 (patch-ab) = 7108213392e5ec922745417519da11f16f847540 SHA1 (patch-ac) = 94bdc8d49d0f575181ccdc15e867844db3c72ac4 SHA1 (patch-ad) = 771272edcb61a0229865086b0df04265a74dc242 SHA1 (patch-ae) = a906f9c42b5c0747749dac1f1a871096c0d9f304 diff --git a/graphics/dx/patches/patch-ab b/graphics/dx/patches/patch-ab index 3126e176eec..c6239d88cf1 100644 --- a/graphics/dx/patches/patch-ab +++ b/graphics/dx/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $ ---- configure.orig Sun Sep 26 22:13:17 1999 -+++ configure Sun Sep 26 22:13:41 1999 -@@ -901,6 +901,9 @@ - if test $unameS = "FreeBSD" ; then +$NetBSD: patch-ab,v 1.2 2001/05/08 19:48:46 dmcmahill Exp $ + +--- configure.orig Fri Mar 31 15:07:21 2000 ++++ configure Tue May 8 14:46:58 2001 +@@ -1258,4 +1258,7 @@ ARCH=freebsd fi + if test $unameS = "NetBSD" ; then @@ -10,4 +10,11 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/10/01 11:23:15 drochner Exp $ + fi if test `echo $unameS | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` = "yes" ; then ARCH=cygwin +@@ -1269,7 +1272,4 @@ + if test $unameS = "AIX" ; then + ARCH=ibm6000 +- fi +- if test $unameM = "alpha" ; then +- ARCH=alphax fi + if test $unameS = "HP-UX" ; then |