diff options
| author | jtb <jtb@pkgsrc.org> | 2001-03-25 01:32:09 +0000 |
|---|---|---|
| committer | jtb <jtb@pkgsrc.org> | 2001-03-25 01:32:09 +0000 |
| commit | f540c98dffabd6aaf1e5623c9aaed72cc0a56381 (patch) | |
| tree | 880926078adbce767491cf46270b82cf62840906 | |
| parent | 6338eb76748d87999f6e1b65c6262e387f17f1a9 (diff) | |
| download | pkgsrc-f540c98dffabd6aaf1e5623c9aaed72cc0a56381.tar.gz | |
Use less convoluted preprocessor logic.
| -rw-r--r-- | devel/hdf/files/patch-sum | 4 | ||||
| -rw-r--r-- | devel/hdf/patches/patch-ao | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/devel/hdf/files/patch-sum b/devel/hdf/files/patch-sum index 139d4d3a068..d617430a5af 100644 --- a/devel/hdf/files/patch-sum +++ b/devel/hdf/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.6 2001/03/25 01:09:50 jtb Exp $ +$NetBSD: patch-sum,v 1.7 2001/03/25 01:32:09 jtb Exp $ SHA1 (patch-aa) = dd9c4c44423a8d93226e72331d921b0911cd0e62 SHA1 (patch-ab) = bc3dcc046aee99ec219d2e01b98dc314f63e25b6 @@ -14,7 +14,7 @@ SHA1 (patch-ak) = d29cd29382e6775f3bfb353dd745c78ac85b2e1b SHA1 (patch-al) = 7ac77a10cab7df20976d912aa8f4aeea9210f3cc SHA1 (patch-am) = b51a0705d1130c799663cbf75a938af0cbd0f599 SHA1 (patch-an) = 3fba432a5bf700b502ecff4ac6c54ca285d740a2 -SHA1 (patch-ao) = f84b9ed5eb48f3ef98468dca9da541fe3350169f +SHA1 (patch-ao) = 3a8f17573c1f58b9ea7a08ee064604dd3cf727b1 SHA1 (patch-ap) = 5f6cd95f18ae6cb0c4da1155180abcedfb02abe0 SHA1 (patch-aq) = efc3c5be99facc04e8a77e02862765a849a7c1fc SHA1 (patch-ar) = 3c70fe3dd860858665269edfbc413bf055c84dcb diff --git a/devel/hdf/patches/patch-ao b/devel/hdf/patches/patch-ao index f12197ab730..98908a27458 100644 --- a/devel/hdf/patches/patch-ao +++ b/devel/hdf/patches/patch-ao @@ -1,6 +1,6 @@ -$NetBSD: patch-ao,v 1.1 2001/03/25 01:09:52 jtb Exp $ +$NetBSD: patch-ao,v 1.2 2001/03/25 01:32:10 jtb Exp $ ---- hdf/src/hdfi.h.orig Sat Mar 24 20:12:19 2001 +--- hdf/src/hdfi.h.orig Tue Aug 22 20:26:57 2000 +++ hdf/src/hdfi.h @@ -151,6 +151,8 @@ * Define options for each platform @@ -11,12 +11,12 @@ $NetBSD: patch-ao,v 1.1 2001/03/25 01:09:52 jtb Exp $ /* * Meaning of each defined macros (not completed yet) * -@@ -1253,6 +1255,74 @@ +@@ -1253,6 +1255,71 @@ #endif #endif /* IA64 */ + -+#endif /* NetBSD */ ++#endif /* ! NetBSD */ + +#ifdef __NetBSD__ + @@ -30,14 +30,11 @@ $NetBSD: patch-ao,v 1.1 2001/03/25 01:09:52 jtb Exp $ +#include <sys/stat.h> +#ifdef vax +#define DF_MT DFMT_VAX -+#endif -+#if defined(amigappc) || defined(bebox) || defined(luna68k) || defined(m68k) || defined(mac68k) || defined(macppc) || defined(mvme68k) || defined(news68k) || defined(next68k) || defined(next68k) || defined(powerpc) || defined(sun3) || defined(x68k) ++#elif defined(amigappc) || defined(bebox) || defined(luna68k) || defined(m68k) || defined(mac68k) || defined(macppc) || defined(mvme68k) || defined(news68k) || defined(next68k) || defined(next68k) || defined(powerpc) || defined(sun3) || defined(x68k) +#define DF_MT DFMT_MOTOROLA +#else -+#ifndef vax +#define DF_MT DFMT_ALPHA +#endif -+#endif +typedef void VOID; +typedef void *VOIDP; +typedef char *_fcd; |