Add -DNETLONG=int to CPPFLAGS instead of using a patch. Only link

executables with libm when truly necessary.  Add sparc64 and powerpc support.
Determine endianness at compile time rather than at configuration.

11 files changed, 76 insertions, 86 deletions

diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile
index 5dc71df178e..ea302d437e1 100644
--- a/devel/hdf/Makefile
+++ b/devel/hdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/14 21:43:41 jtb Exp $
+# $NetBSD: Makefile,v 1.10 2001/04/19 00:56:33 jtb Exp $
 
 DISTNAME=	HDF4.1r4
 PKGNAME=	hdf-4.1r4
@@ -45,21 +45,6 @@ post-patch:
 	${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1			\
 	${WRKSRC}/mfhdf/ncgen/hdfncgen.1
 
-# XXX Don't compile this file with optimization.
-pre-configure:
-	${CC} ${FILESDIR}/bytesex.c -o ${WRKSRC}/bytesex
-
-SWAP=	`${WRKSRC}/bytesex`
-
-do-configure:
-	@for f in libsrc dumper ncgen ncdump; do		\
-		${SED} -e 's:@SWAP@:'${SWAP}':g'		\
-		${WRKSRC}/mfhdf/$$f/Makefile >			\
-		${WRKSRC}/mfhdf/$$f/Makefile.tmp		\
-		&& ${MV} ${WRKSRC}/mfhdf/$$f/Makefile.tmp	\
-		${WRKSRC}/mfhdf/$$f/Makefile;			\
-	done
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/mfhdf/fortran/netcdf_hdf.inc \
 	${PREFIX}/include/hdf
diff --git a/devel/hdf/distinfo b/devel/hdf/distinfo
index 5fac8b96d9d..bc2d03138e2 100644
--- a/devel/hdf/distinfo
+++ b/devel/hdf/distinfo
@@ -1,22 +1,24 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 11:07:03 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/04/19 00:56:33 jtb Exp $
 
-MD5 (HDF4.1r4.tar.gz) = cd67c8ffa8d39aa471f9209907681bed
+SHA1 (HDF4.1r4.tar.gz) = 3440807b3037caa3ba4ee541402600eb1dcc67e7
+Size (HDF4.1r4.tar.gz) = 4371391 bytes
 SHA1 (patch-aa) = dd9c4c44423a8d93226e72331d921b0911cd0e62
 SHA1 (patch-ab) = bc3dcc046aee99ec219d2e01b98dc314f63e25b6
 SHA1 (patch-ac) = 45ba44cbdf00ac0b4b7101d2c1514e34a57dd024
 SHA1 (patch-ad) = 4d3dec99064f5ae3202502fcd71d5499ccee7b08
-SHA1 (patch-ae) = 8580b53fb73835783276af5f8e7e9a4593ebd7fb
-SHA1 (patch-af) = b8cc832ff30d85eeb5731f398fd614c87566a379
+SHA1 (patch-ae) = da73e042272bf318e6f631e4ed91cc21897a5711
+SHA1 (patch-af) = 2b50002362a058f2b053293a50d779bb1b7a032c
 SHA1 (patch-ag) = 1a3143fc8508213690a6e5953b30b915b64bf910
-SHA1 (patch-ah) = 99915039daa7da22f799e49790846c2786e4f22f
-SHA1 (patch-ai) = bfea427dd004af41ee68842b8ceb8e4898ab39a3
-SHA1 (patch-aj) = 2055d95f79deaa2aed2f8faa5692b9651a16f685
+SHA1 (patch-ah) = 50700dada74d56632c49481b05fa5b9313b77cf7
+SHA1 (patch-ai) = 6e7a52ff516eb86caf15441f91c598b2d1d64c95
+SHA1 (patch-aj) = 081f1632289ead661328c7df73ddeb2dff2eb2eb
 SHA1 (patch-ak) = d29cd29382e6775f3bfb353dd745c78ac85b2e1b
 SHA1 (patch-al) = 7ac77a10cab7df20976d912aa8f4aeea9210f3cc
 SHA1 (patch-am) = b51a0705d1130c799663cbf75a938af0cbd0f599
 SHA1 (patch-an) = 3fba432a5bf700b502ecff4ac6c54ca285d740a2
-SHA1 (patch-ao) = a0a98ad17509f87bd81af9c75637a19530f77d3f
+SHA1 (patch-ao) = 7b3e02fd7003bc7915c144433151b1eb878effdc
 SHA1 (patch-ap) = 5f6cd95f18ae6cb0c4da1155180abcedfb02abe0
-SHA1 (patch-aq) = efc3c5be99facc04e8a77e02862765a849a7c1fc
+SHA1 (patch-aq) = 92412e45cf9d85e0c46dbcb7f5b9aa40d2b36991
 SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06
 SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de
+SHA1 (patch-at) = 1a4c29206fff6b7dc774372ede52e41a9ae2be4e
diff --git a/devel/hdf/files/bytesex.c b/devel/hdf/files/bytesex.c
deleted file mode 100644
index b51c0d666ae..00000000000
--- a/devel/hdf/files/bytesex.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-union {long Long;
-  char Char[sizeof(long)];
-} u;
-
-int
-main()
-{
-  u.Long = 1;
-  if (u.Char[0] == 1)                       /* little-endian */
-    printf("-DSWAP\n");
-  else if (u.Char[sizeof(long) - 1] == 1)   /* big-endian */
-    printf("\n");
-  else exit(1);
-  return 0;
-}
diff --git a/devel/hdf/patches/patch-ae b/devel/hdf/patches/patch-ae
index 0d12ca700de..ef84211a3d2 100644
--- a/devel/hdf/patches/patch-ae
+++ b/devel/hdf/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2001/03/25 01:09:50 jtb Exp $
+$NetBSD: patch-ae,v 1.4 2001/04/19 00:56:34 jtb Exp $
 
---- /dev/null	Sun Mar 25 00:37:57 2001
+--- /dev/null	Thu Apr 19 00:39:33 2001
 +++ hdf/util/Makefile
 @@ -0,0 +1,82 @@
 +UTILS= hdf24to8 hdfcomp hdfed hdfls hdfpack hdftopal hdftor8	\
@@ -19,12 +19,12 @@ $NetBSD: patch-ae,v 1.3 2001/03/25 01:09:50 jtb Exp $
 +LDFLAGS+= -L${.CURDIR}/../src
 +LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
 +
-+LDADD+= -ldf -ljpeg -lz -lm
++LDADD+= -ldf -ljpeg -lz
 +
 +NOGCCERROR= 1
 +
 +fp2hdf: fp2hdf.o
-+	${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
++	${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -lm -o $@
 +
 +hdf24to8: hdf24to8.o
 +	${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
diff --git a/devel/hdf/patches/patch-af b/devel/hdf/patches/patch-af
index d0bb5827768..7cebb6a5bf4 100644
--- a/devel/hdf/patches/patch-af
+++ b/devel/hdf/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.5 2001/03/25 01:09:50 jtb Exp $
+$NetBSD: patch-af,v 1.6 2001/04/19 00:56:34 jtb Exp $
 
---- /dev/null	Sun Mar 25 00:38:24 2001
+--- mfhdf/libsrc/Makefile.orig	Thu Apr 19 00:17:24 2001
 +++ mfhdf/libsrc/Makefile
 @@ -0,0 +1,27 @@
 +.PATH: ${.CURDIR} ${.CURDIR}/../fortran ${.CURDIR}/../fortran/config
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.5 2001/03/25 01:09:50 jtb Exp $
 +	putget.c putgetg.c sharray.c string.c var.c hdfsds.c mfsd.c	\
 +	nssdc.c xdrposix.c jackets-fbsd.c mfsdf.c mfsdff.f
 +
-+CPPFLAGS+= -Dunix -DHDF -DNDEBUG @SWAP@
++CPPFLAGS+= -Dunix -DHDF -DNDEBUG -DNETLONG=int
 +CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../hdf/src
 +
 +NOLINT= 1
diff --git a/devel/hdf/patches/patch-ah b/devel/hdf/patches/patch-ah
index d2ccff1d6ee..0ec38b9ab8a 100644
--- a/devel/hdf/patches/patch-ah
+++ b/devel/hdf/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2001/03/25 01:09:50 jtb Exp $
+$NetBSD: patch-ah,v 1.5 2001/04/19 00:56:34 jtb Exp $
 
 --- /dev/null	Sun Mar 25 00:38:33 2001
 +++ mfhdf/dumper/Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.4 2001/03/25 01:09:50 jtb Exp $
 +BINDIR= ${PREFIX}/bin
 +LIBDIR= ${PREFIX}/lib
 +
-+CPPFLAGS+= -Dunix @SWAP@
++CPPFLAGS+= -Dunix
 +CPPFLAGS+= -I${.CURDIR}/../libsrc
 +CPPFLAGS+= -I${.CURDIR}/../../hdf/src
 +
diff --git a/devel/hdf/patches/patch-ai b/devel/hdf/patches/patch-ai
index e216998ea9b..cfcfbb71bd5 100644
--- a/devel/hdf/patches/patch-ai
+++ b/devel/hdf/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2001/03/25 01:09:51 jtb Exp $
+$NetBSD: patch-ai,v 1.5 2001/04/19 00:56:34 jtb Exp $
 
---- /dev/null	Sun Mar 25 00:38:45 2001
+--- /dev/null	Thu Apr 19 00:41:39 2001
 +++ mfhdf/ncdump/Makefile
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,33 @@
 +PROG= ncdump
 +PROGNAME= hdfncdump
 +
@@ -15,13 +15,12 @@ $NetBSD: patch-ai,v 1.4 2001/03/25 01:09:51 jtb Exp $
 +MANDIR= ${PREFIX}/man
 +
 +CPPFLAGS+= -I${.CURDIR}/../libsrc
-+CPPFLAGS+= @SWAP@
 +
 +LDFLAGS+= -L${.CURDIR}/../libsrc
 +LDFLAGS+= -L${.CURDIR}/../../hdf/src
 +LDFLAGS+= -Wl,-R${JPEGBASE} -L${JPEGBASE}
 +
-+LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
++LDADD+= -lmfhdf -ldf -ljpeg -lz
 +
 +NOGCCERROR= 1
 +
diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj
index 45b7c52e392..08b81b9a5e0 100644
--- a/devel/hdf/patches/patch-aj
+++ b/devel/hdf/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.3 2001/03/25 01:09:51 jtb Exp $
+$NetBSD: patch-aj,v 1.4 2001/04/19 00:56:34 jtb Exp $
 
---- /dev/null	Sun Mar 25 00:39:00 2001
+--- /dev/null	Thu Apr 19 00:41:46 2001
 +++ mfhdf/ncgen/Makefile
 @@ -0,0 +1,34 @@
 +PROG= ncgen
@@ -15,7 +15,7 @@ $NetBSD: patch-aj,v 1.3 2001/03/25 01:09:51 jtb Exp $
 +LIBDIR= ${PREFIX}/lib
 +MANDIR= ${PREFIX}/man
 +
-+CPPFLAGS+= -Dunix -DNDEBUG @SWAP@
++CPPFLAGS+= -Dunix -DNDEBUG
 +CPPFLAGS+= -I${.CURDIR}/../libsrc
 +CPPFLAGS+= -I${.CURDIR}/../../hdf/src
 +
@@ -23,7 +23,7 @@ $NetBSD: patch-aj,v 1.3 2001/03/25 01:09:51 jtb Exp $
 +LDFLAGS+= -L${.CURDIR}/../../hdf/src
 +LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
 +
-+LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
++LDADD+= -lmfhdf -ldf -ljpeg -lz
 +
 +NOGCCERROR= 1
 +
diff --git a/devel/hdf/patches/patch-ao b/devel/hdf/patches/patch-ao
index 02021df0742..025d8f44c42 100644
--- a/devel/hdf/patches/patch-ao
+++ b/devel/hdf/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.4 2001/03/25 23:37:06 jtb Exp $
+$NetBSD: patch-ao,v 1.5 2001/04/19 00:56:34 jtb Exp $
 
 --- hdf/src/hdfi.h.orig	Tue Aug 22 20:26:57 2000
 +++ hdf/src/hdfi.h
@@ -29,11 +29,11 @@ $NetBSD: patch-ao,v 1.4 2001/03/25 23:37:06 jtb Exp $
 +#include <sys/file.h>               /* for unbuffered i/o stuff */
 +#include <sys/stat.h>
 +#ifdef __vax__
-+#define DF_MT             DFMT_VAX
-+#elif defined(__m68k__)
-+#define DF_MT             DFMT_MOTOROLA
++#define DF_MT             0x2221
++#elif defined(__m68k__) || defined(__sparc__) || defined(__sparc64__) || defined(__powerpc__)
++#define DF_MT             0x1111
 +#else
-+#define DF_MT             DFMT_ALPHA
++#define DF_MT             0x4441
 +#endif
 +typedef void              VOID;
 +typedef void              *VOIDP;
diff --git a/devel/hdf/patches/patch-aq b/devel/hdf/patches/patch-aq
index 19e40098432..a22f2a36288 100644
--- a/devel/hdf/patches/patch-aq
+++ b/devel/hdf/patches/patch-aq
@@ -1,22 +1,16 @@
-$NetBSD: patch-aq,v 1.1 2001/03/25 01:09:53 jtb Exp $
+$NetBSD: patch-aq,v 1.2 2001/04/19 00:56:34 jtb Exp $
 
---- mfhdf/libsrc/xdrposix.c.orig	Sun Mar 25 01:00:57 2001
-+++ mfhdf/libsrc/xdrposix.c
-@@ -300,7 +300,7 @@
- #if (_MIPS_SZLONG == 64)
- static long *    xdrposix_inline();
- #else
--static netlong *    xdrposix_inline();
-+static int *    xdrposix_inline();
- #endif
- #endif
- static void xdrposix_destroy();
-@@ -542,7 +542,7 @@
- #if (_MIPS_SZLONG == 64)
- static long *
- #else
--static netlong *
-+static int *
- #endif
- #endif
- xdrposix_inline(xdrs, len)
+--- mfhdf/libsrc/array.c.orig	Thu Apr 19 00:27:02 2001
++++ mfhdf/libsrc/array.c
+@@ -6,6 +6,11 @@
+ 
+ #include	<string.h>
++#include        <sys/endian.h>
+ #include	"local_nc.h"
+ #include	"alloc.h"
++
++#if BYTE_ORDER == LITTLE_ENDIAN
++#define SWAP 1
++#endif
+ 
+ #ifdef NO_MEM_FUNCTS
diff --git a/devel/hdf/patches/patch-at b/devel/hdf/patches/patch-at
new file mode 100644
index 00000000000..5983cc5c806
--- /dev/null
+++ b/devel/hdf/patches/patch-at
@@ -0,0 +1,27 @@
+$NetBSD: patch-at,v 1.1 2001/04/19 00:56:34 jtb Exp $
+
+--- mfhdf/libsrc/xdrposix.c.orig	Thu Apr 19 00:27:10 2001
++++ mfhdf/libsrc/xdrposix.c
+@@ -20,6 +20,13 @@
+  * x_getlong() and x_putlong(), so, on that platform, it doesn't matter if
+  * the following isn't 32-bits):
+  */
++
++#include <sys/endian.h>
++
++#if BYTE_ORDER == LITTLE_ENDIAN
++#define SWAP 1
++#endif
++
+ #ifdef CRAY
+ #   undef  NETLONG
+ #   define NETLONG  long
+@@ -58,7 +65,7 @@
+ #include "local_nc.h" /* prototypes for NCadvis, nc_error */
+ 		      /* also obtains <stdio.h>, <rpc/types.h>, &
+ 		       * <rpc/xdr.h> */
+-#include "netcdf.h" /* NC_ */
++#include "netcdf_hdf.h" /* NC_ */
+ #include "mfhdf.h"
+ 
+ #if !(defined DOS_FS || defined(macintosh) || defined (SYMANTEC_C))