diff options
| author | jtb <jtb@pkgsrc.org> | 2001-02-26 22:22:49 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2001-02-26 22:22:49 +0000 |
| commit | b94b14dbfbe121e2c0ffd034709218b199f98260 (patch) | |
| tree | aaee32add6220f5f27e14a558482aa42642d6e3f | |
| parent | ac2223fc0936b1bde524e0cd58d5569b4f5ccbad (diff) | |
| download | pkgsrc-b94b14dbfbe121e2c0ffd034709218b199f98260.tar.gz | |
Don't add -Dunix to CPPFLAGS, undoing part of last change.
| -rw-r--r-- | graphics/plplot/Makefile | 5 | ||||
| -rw-r--r-- | graphics/plplot/files/patch-sum | 4 | ||||
| -rw-r--r-- | graphics/plplot/patches/patch-ab | 18 |
3 files changed, 14 insertions, 13 deletions
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile index 732bdeae704..0441319c23f 100644 --- a/graphics/plplot/Makefile +++ b/graphics/plplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/02/26 21:42:16 jtb Exp $ +# $NetBSD: Makefile,v 1.11 2001/02/26 22:22:49 jtb Exp $ DISTNAME= plplot-5.0.2 CATEGORIES= graphics @@ -48,9 +48,6 @@ CONFIGURE_ARGS+="--disable-python" CONFIGURE_ARGS+="--disable-itcl" CONFIGURE_ARGS+="--disable-dp" -CPPFLAGS+= -Dunix -CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}" - post-patch: for f in ${WRKSRC}/src/plctrl.c ; do \ ${SED} -e 's:@PREFIX@:'${PREFIX}':g' \ diff --git a/graphics/plplot/files/patch-sum b/graphics/plplot/files/patch-sum index 49517938f77..6886392c6f4 100644 --- a/graphics/plplot/files/patch-sum +++ b/graphics/plplot/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.8 2001/02/26 21:42:16 jtb Exp $ +$NetBSD: patch-sum,v 1.9 2001/02/26 22:22:50 jtb Exp $ -MD5 (patch-ab) = 4505a2adb49257a615bcee6198aa7806 +MD5 (patch-ab) = ba3252051151a429d1c29e00f6a952cb MD5 (patch-ac) = ae72234724c290fd1a3600554b8f1630 MD5 (patch-ad) = a0de2d4f3c7c649d6299aa03f71113cc MD5 (patch-ae) = 26912afb861085e6e249e63909b7e6d0 diff --git a/graphics/plplot/patches/patch-ab b/graphics/plplot/patches/patch-ab index a66d503923e..abd3f96606f 100644 --- a/graphics/plplot/patches/patch-ab +++ b/graphics/plplot/patches/patch-ab @@ -1,18 +1,22 @@ -$NetBSD: patch-ab,v 1.2 2001/02/26 21:42:16 jtb Exp $ +$NetBSD: patch-ab,v 1.3 2001/02/26 22:22:50 jtb Exp $ --- include/plplot.h.orig Fri Feb 9 21:57:38 2001 +++ include/plplot.h -@@ -81,6 +81,9 @@ - #endif - #endif +@@ -75,11 +75,8 @@ + * + \*--------------------------------------------------------------------------*/ +-#ifdef unix /* the old way */ +-#ifndef __unix +-#define __unix +-#endif +-#endif +#include <sys/types.h> +#include <sys/param.h> -+ + /* Make sure Unix systems define "__unix" */ - #if defined(SX) || /* NEC Super-UX */ \ -@@ -89,7 +92,8 @@ +@@ -89,7 +86,8 @@ defined(sun) || /* SUN */ \ defined(CRAY) || /* Cray */ \ defined(__convexc__) || /* CONVEX */ \ |