Define DEC_ALPHA and BIG_LONGS on Alpha platform. Added NOGCCERROR=1

to all of the Makefiles (for the moment).

8 files changed, 53 insertions, 31 deletions

diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile
index 82ed326d639..f8f0e4ac864 100644
--- a/devel/hdf/Makefile
+++ b/devel/hdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/03/08 21:15:45 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/09 22:47:43 jtb Exp $
 
 DISTNAME=	HDF4.1r4
 PKGNAME=	hdf-4.1r4
@@ -17,6 +17,10 @@ USE_FORTRAN=	#defined
 
 EVAL_PREFIX+=	JPEGBASE=jpeg F2CBASE=f2c
 
+.if (${MACHINE_ARCH} == "alpha")
+MAKE_ENV+="CPPFLAGS=-DDEC_ALPHA"
+.endif
+
 post-patch:
 	for i in fortran/config/jackets-fbsd.c			\
 	fortran/fort_ps/mfhdfp.h fortran/jackets.src		\
diff --git a/devel/hdf/files/patch-sum b/devel/hdf/files/patch-sum
index 5f05b6e1623..21ed27271cd 100644
--- a/devel/hdf/files/patch-sum
+++ b/devel/hdf/files/patch-sum
@@ -1,13 +1,13 @@
-$NetBSD: patch-sum,v 1.2 2001/03/08 21:15:45 jtb Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/09 22:47:44 jtb Exp $
 
 SHA1 (patch-aa) = dd9c4c44423a8d93226e72331d921b0911cd0e62
 SHA1 (patch-ab) = bc3dcc046aee99ec219d2e01b98dc314f63e25b6
 SHA1 (patch-ac) = 45ba44cbdf00ac0b4b7101d2c1514e34a57dd024
-SHA1 (patch-ad) = 030ef5cacab07180c9307df19b62862ec8353f02
-SHA1 (patch-ae) = 463485de589bbd2da1723cf7d99872e8a0a4b448
-SHA1 (patch-af) = 318518ef9a2bc3e4a2947b2f619de2d86c024784
+SHA1 (patch-ad) = b7dbe8960c3f2bc8b837315630ce7fd10c11299e
+SHA1 (patch-ae) = 0a098f3068d1f1e029abda19955665553f2df456
+SHA1 (patch-af) = 6820db76bd6d60e6e2393341efd1bcc40ed52a6c
 SHA1 (patch-ag) = 1a3143fc8508213690a6e5953b30b915b64bf910
-SHA1 (patch-ah) = 02b8cbf1489a8b29b17828014af91c8dd227c1a7
-SHA1 (patch-ai) = 3c0439d79fc6421f948a51e25a02e580930bc260
-SHA1 (patch-aj) = 05f876744a32bce5ed528d05c9775ec8178ffd25
+SHA1 (patch-ah) = cad01df04183eb5662c6a5f5cbf942ea821477dd
+SHA1 (patch-ai) = 3a089b352e5049d70deeb90f537c1fd807936869
+SHA1 (patch-aj) = 6a3d24528b7a7deeeeefdbe7688851a8691ea456
 SHA1 (patch-ak) = d29cd29382e6775f3bfb353dd745c78ac85b2e1b
diff --git a/devel/hdf/patches/patch-ad b/devel/hdf/patches/patch-ad
index 04cf4afc2ac..1bf4a295fea 100644
--- a/devel/hdf/patches/patch-ad
+++ b/devel/hdf/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2001/03/09 22:47:44 jtb Exp $
 
---- /dev/null	Wed Feb 28 22:06:41 2001
+--- /dev/null	Fri Mar  9 22:24:17 2001
 +++ hdf/src/Makefile
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,56 @@
 +LIB= df
 +
 +SHLIB_MAJOR= 0
@@ -18,12 +18,18 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
 +
 +CPPFLAGS+= -Dunix -DMEM_LIST ${JPEGINC} ${F2CINC}
 +
++.if (${MACHINE_ARCH} == "alpha")
++CPPFLAGS+= -DBIG_LONGS
++.endif
++
 +LDADD+= ${JPEGLIB} ${ZLIB} ${F2CLIB} -lm
 +
 +NOLINT= 1
 +MKPICINSTALL= no
 +MKPROFILE= no
 +
++NOGCCERROR= 1
++
 +SRCS= atom.c bitvect.c cdeflate.c cnbit.c cnone.c crle.c cskphuff.c	\
 +	df24.c df24f.c dfan.c dfanf.c dfcomp.c dfconv.c dff.c dfgr.c	\
 +	dfgroup.c dfimcomp.c dfjpeg.c dfkconv.c dfkcray.c dfkfuji.c	\
diff --git a/devel/hdf/patches/patch-ae b/devel/hdf/patches/patch-ae
index 0277913120a..311d3c7e770 100644
--- a/devel/hdf/patches/patch-ae
+++ b/devel/hdf/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
+$NetBSD: patch-ae,v 1.2 2001/03/09 22:47:44 jtb Exp $
 
---- /dev/null	Wed Feb 28 21:02:46 2001
+--- /dev/null	Fri Mar  9 22:24:22 2001
 +++ hdf/util/Makefile
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,84 @@
 +UTILS= hdf24to8 hdfcomp hdfed hdfls hdfpack hdftopal hdftor8	\
 +	paltohdf r8tohdf ristosds vmake vshow hdf8to24		\
 +	hdf2jpeg jpeg2hdf fp2hdf hdfunpac vcompat
@@ -23,6 +23,8 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
 +
 +CPPFLAGS+= -Dunix ${JPEGINC} -I${.CURDIR}/../src
 +
++NOGCCERROR= 1
++
 +fp2hdf: fp2hdf.o
 +	${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
 +
@@ -80,9 +82,8 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
 +
 +install: ${UTILS}
 +	@for f in ${UTILS}; do					\
-+		i="${BSD_INSTALL_PROGRAM} $$f ${BINDIR}";	\
-+		${ECHO} $$i; $$i;				\
++	${BSD_INSTALL_PROGRAM} $$f ${BINDIR};			\
 +	done
 +
 +clean:
-+	rm -f *.o ${UTILS} hdfed
++	rm -f *.o ${UTILS}
diff --git a/devel/hdf/patches/patch-af b/devel/hdf/patches/patch-af
index 7ccd50d28d0..6a915b19bd0 100644
--- a/devel/hdf/patches/patch-af
+++ b/devel/hdf/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2001/03/08 21:15:45 jtb Exp $
+$NetBSD: patch-af,v 1.3 2001/03/09 22:47:44 jtb Exp $
 
---- /dev/null	Thu Mar  8 21:08:50 2001
+--- /dev/null	Fri Mar  9 22:17:51 2001
 +++ mfhdf/libsrc/Makefile
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,41 @@
 +.PATH: ${.CURDIR} ${.CURDIR}/../fortran ${.CURDIR}/../fortran/config
 +
 +LIB= mfhdf
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.2 2001/03/08 21:15:45 jtb Exp $
 +
 +SRCS= array.c attr.c cdf.c dim.c file.c iarray.c error.c globdef.c	\
 +	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
++	nssdc.c xdrstdio.c jackets-fbsd.c mfsdf.c mfsdff.f
 +
 +HDFLIB= -L${.CURDIR}/../../hdf/src -ldf
 +HDFINC= -I${.CURDIR}/../../hdf/src
@@ -23,7 +23,13 @@ $NetBSD: patch-af,v 1.2 2001/03/08 21:15:45 jtb Exp $
 +
 +LDFLAGS+= ${HDFLIB} ${F2CLIB} -lm
 +
-+CPPFLAGS+= -Dunix -DHDF -DNDEBUG @SWAP@ ${HDFINC} ${F2CINC} -I${.CURDIR}
++CPPFLAGS+= -Dunix -DHDF -DNDEBUG @SWAP@ -DUSE_XDRNCSTDIO
++
++.if (${MACHINE_ARCH} == "alpha")
++CPPFLAGS+= -DBIG_LONGS
++.endif
++
++CPPFLAGS+= ${HDFINC} ${F2CINC} -I${.CURDIR}
 +
 +NOLINT= 1
 +MKPICINSTALL= no
diff --git a/devel/hdf/patches/patch-ah b/devel/hdf/patches/patch-ah
index 39d1e5a3308..e6303e38563 100644
--- a/devel/hdf/patches/patch-ah
+++ b/devel/hdf/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
+$NetBSD: patch-ah,v 1.2 2001/03/09 22:47:44 jtb Exp $
 
---- /dev/null	Wed Feb 28 13:48:26 2001
+--- /dev/null	Fri Mar  9 22:24:34 2001
 +++ mfhdf/dumper/Makefile
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,20 @@
 +PROG= hdp
 +
 +SRCS= hdp.c hdp_list.c hdp_sds.c hdp_util.c hdp_vd.c hdp_vg.c	\
@@ -20,5 +20,6 @@ $NetBSD: patch-ah,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
 +CPPFLAGS+= -Dunix @SWAP@ -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src
 +
 +NOMAN= 1
++NOGCCERROR= 1
 +
 +.include <bsd.prog.mk>
diff --git a/devel/hdf/patches/patch-ai b/devel/hdf/patches/patch-ai
index 2ff7a5120d2..aade744ff52 100644
--- a/devel/hdf/patches/patch-ai
+++ b/devel/hdf/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2001/03/09 22:47:44 jtb Exp $
 
---- /dev/null	Wed Feb 28 02:22:10 2001
+--- /dev/null	Fri Mar  9 22:24:45 2001
 +++ mfhdf/ncdump/Makefile
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,23 @@
 +PROG= ncdump
 +PROGNAME= hdfncdump
 +
@@ -23,4 +23,6 @@ $NetBSD: patch-ai,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
 +
 +CPPFLAGS+= ${MFHDFINC} @SWAP@
 +
++NOGCCERROR= 1
++
 +.include <bsd.prog.mk>
diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj
index b4510fc7771..f18aaa67c21 100644
--- a/devel/hdf/patches/patch-aj
+++ b/devel/hdf/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2001/03/09 22:47:44 jtb Exp $
 
---- /dev/null	Wed Feb 28 02:22:03 2001
+--- /dev/null	Fri Mar  9 22:24:52 2001
 +++ mfhdf/ncgen/Makefile
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,34 @@
 +PROG= ncgen
 +PROGNAME= hdfncgen
 +
@@ -25,6 +25,8 @@ $NetBSD: patch-aj,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
 +
 +CPPFLAGS+= -Dunix -DNDEBUG @SWAP@ ${MFHDFINC} ${HDFINC}
 +
++NOGCCERROR= 1
++
 +ncgenyy.c: ncgen.l
 +	${LEX} ${LFLAGS} ncgen.l
 +	mv lex.yy.c ncgenyy.c