summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/hdf/Makefile19
-rw-r--r--devel/hdf/files/patch-sum23
-rw-r--r--devel/hdf/patches/patch-ad29
-rw-r--r--devel/hdf/patches/patch-ae20
-rw-r--r--devel/hdf/patches/patch-af28
-rw-r--r--devel/hdf/patches/patch-ah18
-rw-r--r--devel/hdf/patches/patch-ai16
-rw-r--r--devel/hdf/patches/patch-aj18
-rw-r--r--devel/hdf/patches/patch-al24
-rw-r--r--devel/hdf/patches/patch-an22
-rw-r--r--devel/hdf/patches/patch-ao88
-rw-r--r--devel/hdf/patches/patch-ap13
-rw-r--r--devel/hdf/patches/patch-aq22
-rw-r--r--devel/hdf/patches/patch-ar13
-rw-r--r--devel/hdf/patches/patch-as13
-rw-r--r--devel/hdf/pkg/PLIST8
16 files changed, 241 insertions, 133 deletions
diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile
index 44373a68c39..02cb939fc54 100644
--- a/devel/hdf/Makefile
+++ b/devel/hdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/03/22 23:19:16 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/25 01:09:49 jtb Exp $
DISTNAME= HDF4.1r4
PKGNAME= hdf-4.1r4
@@ -10,18 +10,13 @@ MAINTAINER= jtb@netbsd.org
HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html
COMMENT= NCSA Hierarchical Data Format
-DEPENDS+= f2c-[0-9]*:../../lang/f2c
DEPENDS+= jpeg-[0-9]*:../../graphics/jpeg
USE_FORTRAN= #defined
-F2CBASE_DEFAULT=${LOCALBASE}
-EVAL_PREFIX+= JPEGBASE=jpeg F2CBASE=f2c
-
-.if (${MACHINE_ARCH} == "alpha")
-MAKE_ENV+="CPPFLAGS=-DDEC_ALPHA"
-.endif
+EVAL_PREFIX+= JPEGBASE=jpeg
+# This is ugly, but saves 31 patches
post-patch:
for i in fortran/config/jackets-fbsd.c \
fortran/fort_ps/mfhdfp.h fortran/jackets.src \
@@ -50,14 +45,6 @@ post-patch:
${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1 \
${WRKSRC}/mfhdf/ncgen/hdfncgen.1
-pre-build:
- (cd ${WRKSRC}/hdf/src; for i in *.f; do \
- ${F2CBASE}/bin/f2c $$i; \
- done)
- (cd ${WRKSRC}/mfhdf/fortran; for i in *.f; do \
- ${F2CBASE}/bin/f2c $$i; \
- done)
-
pre-configure:
${CC} ${FILESDIR}/bytesex.c -o ${WRKSRC}/bytesex
diff --git a/devel/hdf/files/patch-sum b/devel/hdf/files/patch-sum
index 1b25ef5050e..139d4d3a068 100644
--- a/devel/hdf/files/patch-sum
+++ b/devel/hdf/files/patch-sum
@@ -1,16 +1,21 @@
-$NetBSD: patch-sum,v 1.5 2001/03/22 23:19:17 jtb Exp $
+$NetBSD: patch-sum,v 1.6 2001/03/25 01:09:50 jtb Exp $
SHA1 (patch-aa) = dd9c4c44423a8d93226e72331d921b0911cd0e62
SHA1 (patch-ab) = bc3dcc046aee99ec219d2e01b98dc314f63e25b6
SHA1 (patch-ac) = 45ba44cbdf00ac0b4b7101d2c1514e34a57dd024
-SHA1 (patch-ad) = f4d626d3b1ab48677d1ffadfe14700e53255a469
-SHA1 (patch-ae) = 0a098f3068d1f1e029abda19955665553f2df456
-SHA1 (patch-af) = 675659b915a07b7352dd291c39155136889cd32a
+SHA1 (patch-ad) = 4d3dec99064f5ae3202502fcd71d5499ccee7b08
+SHA1 (patch-ae) = 8580b53fb73835783276af5f8e7e9a4593ebd7fb
+SHA1 (patch-af) = b8cc832ff30d85eeb5731f398fd614c87566a379
SHA1 (patch-ag) = 1a3143fc8508213690a6e5953b30b915b64bf910
-SHA1 (patch-ah) = 42f1f926c78fbd4781c699932a948bcac3873b21
-SHA1 (patch-ai) = 97d799f4b3c9da70e68fa674bb9019e34f85c453
-SHA1 (patch-aj) = 6a3d24528b7a7deeeeefdbe7688851a8691ea456
+SHA1 (patch-ah) = 99915039daa7da22f799e49790846c2786e4f22f
+SHA1 (patch-ai) = bfea427dd004af41ee68842b8ceb8e4898ab39a3
+SHA1 (patch-aj) = 2055d95f79deaa2aed2f8faa5692b9651a16f685
SHA1 (patch-ak) = d29cd29382e6775f3bfb353dd745c78ac85b2e1b
-SHA1 (patch-al) = b4d1ceb6ad28c5492c10e657bc8de9faa33e7ff8
+SHA1 (patch-al) = 7ac77a10cab7df20976d912aa8f4aeea9210f3cc
SHA1 (patch-am) = b51a0705d1130c799663cbf75a938af0cbd0f599
-SHA1 (patch-an) = 4628f98d94710ab953a7386d0d97fe3201c244fd
+SHA1 (patch-an) = 3fba432a5bf700b502ecff4ac6c54ca285d740a2
+SHA1 (patch-ao) = f84b9ed5eb48f3ef98468dca9da541fe3350169f
+SHA1 (patch-ap) = 5f6cd95f18ae6cb0c4da1155180abcedfb02abe0
+SHA1 (patch-aq) = efc3c5be99facc04e8a77e02862765a849a7c1fc
+SHA1 (patch-ar) = 3c70fe3dd860858665269edfbc413bf055c84dcb
+SHA1 (patch-as) = d692dacecf38316a49966c2a46b8ddd820dd2451
diff --git a/devel/hdf/patches/patch-ad b/devel/hdf/patches/patch-ad
index 72143292f62..f871d84f7b7 100644
--- a/devel/hdf/patches/patch-ad
+++ b/devel/hdf/patches/patch-ad
@@ -1,30 +1,17 @@
-$NetBSD: patch-ad,v 1.3 2001/03/19 13:37:29 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2001/03/25 01:09:50 jtb Exp $
---- /dev/null Fri Mar 9 22:24:17 2001
+--- /dev/null Sun Mar 25 00:37:46 2001
+++ hdf/src/Makefile
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,43 @@
+LIB= df
+
-+SHLIB_MAJOR= 0
-+SHLIB_MINOR= 0
-+
+LIBDIR= ${PREFIX}/lib
+
-+JPEGLIB= -R${JPEGBASE}/lib -L${JPEGBASE}/lib -ljpeg
-+JPEGINC= -I${JPEGBASE}/include
-+ZLIB= -lz
-+F2CLIB= -L${F2CBASE}/lib -lf2c
-+F2CINC= -I${F2CBASE}/include
-+
-+CPPFLAGS+= -Dunix -DMEM_LIST ${JPEGINC} ${F2CINC}
-+
-+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64")
-+CPPFLAGS+= -DBIG_LONGS
-+.endif
-+
-+LDADD+= ${JPEGLIB} ${ZLIB} ${F2CLIB} -lm
++CPPFLAGS+= -Dunix -DMEM_LIST
++CPPFLAGS+= -I${JPEGBASE}/include
+
+NOLINT= 1
++MKPIC= no
+MKPICINSTALL= no
+MKPROFILE= no
+
@@ -40,8 +27,8 @@ $NetBSD: patch-ad,v 1.3 2001/03/19 13:37:29 dmcmahill Exp $
+ hfile.c hfiledd.c hfilef.c hkit.c linklist.c mcache.c \
+ mfan.c mfanf.c mfgr.c mfgrf.c mstdio.c tbbt.c vattr.c vattrf.c \
+ vconv.c vg.c vgf.c vgp.c vhi.c vio.c vparse.c vrw.c vsfld.c \
-+ df24ff.c dfanff.c dfff.c dfpff.c dfr8ff.c dfsdff.c dfufp2if.c \
-+ hfileff.c mfgrff.c vattrff.c vgff.c
++ df24ff.f dfanff.f dfff.f dfpff.f dfr8ff.f dfsdff.f dfufp2if.f \
++ hfileff.f mfgrff.f vattrff.f vgff.f
+
+INCLUDES= atom.h bitvect.h cdeflate.h cnbit.h cnone.h crle.h cskphuff.h \
+ df.h dfan.h dfconvrt.h dffunc.inc dfgr.h dfi.h dfivms.h dfrig.h \
diff --git a/devel/hdf/patches/patch-ae b/devel/hdf/patches/patch-ae
index 311d3c7e770..0d12ca700de 100644
--- a/devel/hdf/patches/patch-ae
+++ b/devel/hdf/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2001/03/09 22:47:44 jtb Exp $
+$NetBSD: patch-ae,v 1.3 2001/03/25 01:09:50 jtb Exp $
---- /dev/null Fri Mar 9 22:24:22 2001
+--- /dev/null Sun Mar 25 00:37:57 2001
+++ hdf/util/Makefile
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,82 @@
+UTILS= hdf24to8 hdfcomp hdfed hdfls hdfpack hdftopal hdftor8 \
+ paltohdf r8tohdf ristosds vmake vshow hdf8to24 \
+ hdf2jpeg jpeg2hdf fp2hdf hdfunpac vcompat
@@ -12,17 +12,15 @@ $NetBSD: patch-ae,v 1.2 2001/03/09 22:47:44 jtb Exp $
+BINDIR= ${PREFIX}/bin
+LIBDIR= ${PREFIX}/lib
+
-+HDFLIB= -L${.CURDIR}/../src
-+JPEGLIB= -R${JPEGBASE}/lib -L${JPEGBASE}/lib
-+JPEGINC= -I${JPEGBASE}/include
-+ZLIB= -lz
++CPPFLAGS+= -Dunix
++CPPFLAGS+= -I${.CURDIR}/../src
++CPPFLAGS+= -I${JPEGBASE}/include
+
-+LDFLAGS+= -Wl,-R${LIBDIR} ${HDFLIB} ${JPEGLIB}
++LDFLAGS+= -L${.CURDIR}/../src
++LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
+
+LDADD+= -ldf -ljpeg -lz -lm
+
-+CPPFLAGS+= -Dunix ${JPEGINC} -I${.CURDIR}/../src
-+
+NOGCCERROR= 1
+
+fp2hdf: fp2hdf.o
@@ -86,4 +84,4 @@ $NetBSD: patch-ae,v 1.2 2001/03/09 22:47:44 jtb Exp $
+ done
+
+clean:
-+ rm -f *.o ${UTILS}
++ -rm -f *.o ${UTILS}
diff --git a/devel/hdf/patches/patch-af b/devel/hdf/patches/patch-af
index 599cec4f9e8..d0bb5827768 100644
--- a/devel/hdf/patches/patch-af
+++ b/devel/hdf/patches/patch-af
@@ -1,37 +1,23 @@
-$NetBSD: patch-af,v 1.4 2001/03/19 13:37:29 dmcmahill Exp $
+$NetBSD: patch-af,v 1.5 2001/03/25 01:09:50 jtb Exp $
---- /dev/null Fri Mar 9 22:17:51 2001
+--- /dev/null Sun Mar 25 00:38:24 2001
+++ mfhdf/libsrc/Makefile
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,27 @@
+.PATH: ${.CURDIR} ${.CURDIR}/../fortran ${.CURDIR}/../fortran/config
+
+LIB= mfhdf
+
-+SHLIB_MAJOR= 0
-+SHLIB_MINOR= 0
-+
+LIBDIR= ${PREFIX}/lib
+
+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 xdrstdio.c jackets-fbsd.c mfsdf.c mfsdff.f
-+
-+HDFLIB= -L${.CURDIR}/../../hdf/src -ldf
-+HDFINC= -I${.CURDIR}/../../hdf/src
-+F2CLIB= -L${F2CBASE}/lib -lf2c
-+F2CINC= -I${F2CBASE}/include
-+
-+LDFLAGS+= ${HDFLIB} ${F2CLIB} -lm
-+
-+CPPFLAGS+= -Dunix -DHDF -DNDEBUG @SWAP@ -DUSE_XDRNCSTDIO
-+
-+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64")
-+CPPFLAGS+= -DBIG_LONGS
-+.endif
++ nssdc.c xdrposix.c jackets-fbsd.c mfsdf.c mfsdff.f
+
-+CPPFLAGS+= ${HDFINC} ${F2CINC} -I${.CURDIR}
++CPPFLAGS+= -Dunix -DHDF -DNDEBUG @SWAP@
++CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../hdf/src
+
+NOLINT= 1
++MKPIC= no
+MKPICINSTALL= no
+MKPROFILE= no
+
diff --git a/devel/hdf/patches/patch-ah b/devel/hdf/patches/patch-ah
index 36a6be78da2..d2ccff1d6ee 100644
--- a/devel/hdf/patches/patch-ah
+++ b/devel/hdf/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2001/03/19 13:37:29 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.4 2001/03/25 01:09:50 jtb Exp $
---- /dev/null Fri Mar 9 22:24:34 2001
+--- /dev/null Sun Mar 25 00:38:33 2001
+++ mfhdf/dumper/Makefile
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
+PROG= hdp
+
+SRCS= hdp.c hdp_list.c hdp_sds.c hdp_util.c hdp_vd.c hdp_vg.c \
@@ -11,13 +11,15 @@ $NetBSD: patch-ah,v 1.3 2001/03/19 13:37:29 dmcmahill Exp $
+BINDIR= ${PREFIX}/bin
+LIBDIR= ${PREFIX}/lib
+
-+JPEGLIB= -R${JPEGBASE}/lib -L${JPEGBASE}/lib -ljpeg
-+HDFLIB= -L${.CURDIR}/../../hdf/src -ldf
-+MFHDFLIB= -L${.CURDIR}/../libsrc -lmfhdf
++CPPFLAGS+= -Dunix @SWAP@
++CPPFLAGS+= -I${.CURDIR}/../libsrc
++CPPFLAGS+= -I${.CURDIR}/../../hdf/src
+
-+LDFLAGS+= -Wl,-R{LIBDIR} ${HDFLIB} ${MFHDFLIB} ${JPEGLIB}
++LDFLAGS+= -L${.CURDIR}/../libsrc
++LDFLAGS+= -L${.CURDIR}/../../hdf/src
++LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
+
-+CPPFLAGS+= -Dunix @SWAP@ -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src
++LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
+
+NOMAN= 1
+NOGCCERROR= 1
diff --git a/devel/hdf/patches/patch-ai b/devel/hdf/patches/patch-ai
index 95da51f5928..e216998ea9b 100644
--- a/devel/hdf/patches/patch-ai
+++ b/devel/hdf/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.3 2001/03/22 23:19:17 jtb Exp $
+$NetBSD: patch-ai,v 1.4 2001/03/25 01:09:51 jtb Exp $
---- /dev/null Thu Mar 22 20:12:43 2001
+--- /dev/null Sun Mar 25 00:38:45 2001
+++ mfhdf/ncdump/Makefile
@@ -0,0 +1,34 @@
+PROG= ncdump
@@ -14,14 +14,14 @@ $NetBSD: patch-ai,v 1.3 2001/03/22 23:19:17 jtb Exp $
+LIBDIR= ${PREFIX}/lib
+MANDIR= ${PREFIX}/man
+
-+JPEGLIB= -Wl,-R${JPEGBASE} -L${JPEGBASE} -ljpeg
-+HDFLIB= -L${.CURDIR}/../../hdf/src -ldf
-+MFHDFLIB= -L${.CURDIR}/../libsrc -lmfhdf
-+MFHDFINC= -I${.CURDIR}/../libsrc
++CPPFLAGS+= -I${.CURDIR}/../libsrc
++CPPFLAGS+= @SWAP@
+
-+LDFLAGS+= -Wl,-R${LIBDIR} ${MFHDFLIB} ${HDFLIB} ${JPEGLIB}
++LDFLAGS+= -L${.CURDIR}/../libsrc
++LDFLAGS+= -L${.CURDIR}/../../hdf/src
++LDFLAGS+= -Wl,-R${JPEGBASE} -L${JPEGBASE}
+
-+CPPFLAGS+= ${MFHDFINC} @SWAP@
++LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
+
+NOGCCERROR= 1
+
diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj
index f18aaa67c21..45b7c52e392 100644
--- a/devel/hdf/patches/patch-aj
+++ b/devel/hdf/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2001/03/09 22:47:44 jtb Exp $
+$NetBSD: patch-aj,v 1.3 2001/03/25 01:09:51 jtb Exp $
---- /dev/null Fri Mar 9 22:24:52 2001
+--- /dev/null Sun Mar 25 00:39:00 2001
+++ mfhdf/ncgen/Makefile
@@ -0,0 +1,34 @@
+PROG= ncgen
@@ -15,15 +15,15 @@ $NetBSD: patch-aj,v 1.2 2001/03/09 22:47:44 jtb Exp $
+LIBDIR= ${PREFIX}/lib
+MANDIR= ${PREFIX}/man
+
-+MFHDFLIB= -L${.CURDIR}/../libsrc -lmfhdf
-+MFHDFINC= -I${.CURDIR}/../libsrc
-+HDFLIB= -L${.CURDIR}/../../hdf/src -ldf
-+HDFINC= -I${.CURDIR}/../../hdf/src
-+JPEGLIB= -R${JPEGBASE}/lib -L${JPEGBASE}/lib -ljpeg
++CPPFLAGS+= -Dunix -DNDEBUG @SWAP@
++CPPFLAGS+= -I${.CURDIR}/../libsrc
++CPPFLAGS+= -I${.CURDIR}/../../hdf/src
+
-+LDFLAGS+= -Wl,-R{LIBDIR} ${MFHDFLIB} ${HDFLIB} ${JPEGLIB}
++LDFLAGS+= -L${.CURDIR}/../libsrc
++LDFLAGS+= -L${.CURDIR}/../../hdf/src
++LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
+
-+CPPFLAGS+= -Dunix -DNDEBUG @SWAP@ ${MFHDFINC} ${HDFINC}
++LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
+
+NOGCCERROR= 1
+
diff --git a/devel/hdf/patches/patch-al b/devel/hdf/patches/patch-al
index af35c9bc7b7..c43dc492faa 100644
--- a/devel/hdf/patches/patch-al
+++ b/devel/hdf/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2001/03/22 23:19:17 jtb Exp $
+$NetBSD: patch-al,v 1.2 2001/03/25 01:09:51 jtb Exp $
---- /dev/null Thu Mar 22 19:52:41 2001
+--- /dev/null Sun Mar 25 00:38:11 2001
+++ hdf/test/Makefile
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,60 @@
+CSRCS= rig.c sdstr.c blocks.c an.c anfile.c extelt.c file.c file1.c \
+ vers.c sdmms.c sdnmms.c slab.c litend.c tvset.c comp.c bitio.c \
+ tree.c macros.c conv.c nbit.c man.c mgr.c testhdf.c tbv.c \
@@ -20,11 +20,13 @@ $NetBSD: patch-al,v 1.1 2001/03/22 23:19:17 jtb Exp $
+ tsdmmsf.o tsdnmmsf.o tsdnntf.o tsdntf.o tsdstrf.o tstubsf.o \
+ tvsetf.o tvattrf.o
+
-+HDFLIB = -Wl,-R${.CURDIR}/../src -L${.CURDIR}/../src -ldf
-+JPEGLIB= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib -ljpeg
-+ZLIB= -lz
++CPPFLAGS+= -Dunix
++CPPFLAGS+= -I${.CURDIR}/../src
+
-+CPPFLAGS+= -Dunix -I${.CURDIR}/../src
++LDFLAGS+= -Wl,-R${.CURDIR}/../src -L${.CURDIR}/../src
++LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
++
++LDADD+= -ldf -ljpeg -lz -lm
+
+FTESTS = fortest fortestF
+
@@ -42,17 +44,17 @@ $NetBSD: patch-al,v 1.1 2001/03/22 23:19:17 jtb Exp $
+ -rm -f *.hdf
+
+testhdf: ${COBJS}
-+ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${HDFLIB} ${JPEGLIB} ${ZLIB} -lm
++ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+ test -d ${TESTDIR} || mkdir ${TESTDIR}
+
+fortestF: ${FOBJS}
-+ ${FC} ${FFLAGS} -o $@ $? ${LDFLAGS} ${HDFLIB} ${JPEGLIB} ${ZLIB}
++ ${FC} ${FFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+
+fortest: fortest.o
-+ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${HDFLIB} ${JPEGLIB} ${ZLIB} -lm
++ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+
+gentest: gentest.o
-+ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${HDFLIB} ${JPEGLIB} ${ZLIB} -lm
++ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+
+clean:
+ -rm -f testhdf ${COBJS} ${FOBJS} ${FTESTS} \
diff --git a/devel/hdf/patches/patch-an b/devel/hdf/patches/patch-an
index f2c92a35b76..cec19a09653 100644
--- a/devel/hdf/patches/patch-an
+++ b/devel/hdf/patches/patch-an
@@ -1,25 +1,23 @@
-$NetBSD: patch-an,v 1.1 2001/03/22 23:19:17 jtb Exp $
+$NetBSD: patch-an,v 1.2 2001/03/25 01:09:51 jtb Exp $
---- /dev/null Thu Mar 22 22:34:52 2001
+--- /dev/null Sun Mar 25 00:39:12 2001
+++ mfhdf/nctest/Makefile
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,25 @@
+PROG= nctest
+
+SRCS = varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \
+ vputget.c vputgetg.c driver.c cdftests.c dimtests.c rec.c \
+ atttests.c misctest.c add.c error.c emalloc.c val.c slabs.c
+
-+MFHDFLIB= -L${.CURDIR}/../libsrc -lmfhdf
-+MFHDFINC= -I${.CURDIR}/../libsrc
++CPPFLAGS+= -Dunix -DNDEBUG
++CPPFLAGS+= -I${.CURDIR}/../../hdf/src
++CPPFLAGS+= -I${.CURDIR}/../libsrc
+
-+HDFLIB= -L${.CURDIR}/../../hdf/src -ldf
-+HDFINC= -I${.CURDIR}/../../hdf/src
++LDFLAGS+= -L${.CURDIR}/../libsrc
++LDFLAGS+= -L${.CURDIR}/../../hdf/src
++LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib
+
-+JPEGLIB= -R${JPEGBASE}/lib -L${JPEGBASE}/lib -ljpeg
-+
-+LDFLAGS+= -Wl,-R{LIBDIR} ${MFHDFLIB} ${HDFLIB} ${JPEGLIB}
-+
-+CPPFLAGS+= -Dunix -DNDEBUG ${MFHDFINC} ${HDFINC}
++LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
+
+NOMAN= 1
+
diff --git a/devel/hdf/patches/patch-ao b/devel/hdf/patches/patch-ao
new file mode 100644
index 00000000000..f12197ab730
--- /dev/null
+++ b/devel/hdf/patches/patch-ao
@@ -0,0 +1,88 @@
+$NetBSD: patch-ao,v 1.1 2001/03/25 01:09:52 jtb Exp $
+
+--- hdf/src/hdfi.h.orig Sat Mar 24 20:12:19 2001
++++ hdf/src/hdfi.h
+@@ -151,6 +151,8 @@
+ * Define options for each platform
+ *-------------------------------------------------------------------------*/
+
++#ifndef __NetBSD__
++
+ /*
+ * Meaning of each defined macros (not completed yet)
+ *
+@@ -1253,6 +1255,74 @@
+ #endif
+
+ #endif /* IA64 */
++
++#endif /* NetBSD */
++
++#ifdef __NetBSD__
++
++#ifdef GOT_MACHINE
++If you get an error on this line more than one machine type has been defined.
++Please check your Makefile.
++#endif
++#define GOT_MACHINE
++
++#include <sys/file.h> /* for unbuffered i/o stuff */
++#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)
++#define DF_MT DFMT_MOTOROLA
++#else
++#ifndef vax
++#define DF_MT DFMT_ALPHA
++#endif
++#endif
++typedef void VOID;
++typedef void *VOIDP;
++typedef char *_fcd;
++typedef char char8;
++typedef unsigned char uchar8;
++typedef char int8;
++typedef unsigned char uint8;
++typedef short int int16;
++typedef unsigned short int uint16;
++#ifndef __rpc_types_h
++typedef int int32;
++typedef unsigned int uint32;
++#endif /* __rpc_types_h */
++typedef int intn;
++typedef unsigned int uintn;
++typedef int intf; /* size of INTEGERs in Fortran compiler */
++typedef float float32;
++typedef double float64;
++#if defined(alpha) || defined(sparc64)
++typedef long hdf_pint_t; /* an integer the same size as a pointer */
++#else
++typedef int hdf_pint_t; /* an integer the same size as a pointer */
++#endif
++#define FNAME_POST_UNDERSCORE
++#define _fcdtocp(desc) (desc)
++#ifdef HAVE_FMPOOL
++#define FILELIB PAGEBUFIO /* enable page buffering */
++#else
++#define FILELIB UNIXBUFIO
++#endif
++
++/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
++
++/* Determine the memory manager we are going to use. Valid values are: */
++/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */
++/* what each does */
++#define JMEMSYS MEM_ANSI
++
++#ifdef __GNUC__
++#define HAVE_STDC
++#define INCLUDES_ARE_ANSI
++#endif
++
++#endif /* NetBSD */
++
+
+ #ifndef GOT_MACHINE
+ No machine type has been defined. Your Makefile needs to have someing like
diff --git a/devel/hdf/patches/patch-ap b/devel/hdf/patches/patch-ap
new file mode 100644
index 00000000000..d2e15b83b5f
--- /dev/null
+++ b/devel/hdf/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2001/03/25 01:09:52 jtb Exp $
+
+--- hdf/src/hconv.h.orig Sat Mar 24 20:43:34 2001
++++ hdf/src/hconv.h
+@@ -63,7 +63,7 @@
+ /* CONSTANT DEFINITIONS */
+ /*****************************************************************************/
+ /* Generally Big-Endian machines */
+-#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !defined(IA64)
++#if BYTE_ORDER == BIG_ENDIAN
+ # if !defined(UNICOS)
+ # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */
+ # define UI8_OUT DFKnb1b
diff --git a/devel/hdf/patches/patch-aq b/devel/hdf/patches/patch-aq
new file mode 100644
index 00000000000..19e40098432
--- /dev/null
+++ b/devel/hdf/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2001/03/25 01:09:53 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)
diff --git a/devel/hdf/patches/patch-ar b/devel/hdf/patches/patch-ar
new file mode 100644
index 00000000000..d25dae67172
--- /dev/null
+++ b/devel/hdf/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2001/03/25 01:09:53 jtb Exp $
+
+--- hdf/test/mgr.c.orig Thu Nov 16 15:41:36 2000
++++ hdf/test/mgr.c
+@@ -181,7 +181,7 @@
+ static intn
+ fuzzy_memcmp(const void *s1, const void *s2, int32 len, intn fuzz_factor);
+
+-#ifdef DEC_ALPHA
++#if defined(DEC_ALPHA) || defined(alpha)
+ #define JPEG_FUZZ 13
+ #else
+ #define JPEG_FUZZ 1
diff --git a/devel/hdf/patches/patch-as b/devel/hdf/patches/patch-as
new file mode 100644
index 00000000000..d4934ecc7d8
--- /dev/null
+++ b/devel/hdf/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2001/03/25 01:09:54 jtb Exp $
+
+--- hdf/test/rig.c.orig Tue Dec 8 21:37:51 1998
++++ hdf/test/rig.c
+@@ -875,7 +875,7 @@
+ }
+ } /* end fuzzy_memcmp() */
+
+-#ifdef DEC_ALPHA
++#if defined(DEC_ALPHA) || defined(alpha)
+ #define JPEG_FUZZ 13
+ #else
+ #define JPEG_FUZZ 1
diff --git a/devel/hdf/pkg/PLIST b/devel/hdf/pkg/PLIST
index e1df5ff2ae0..a54933c2ec1 100644
--- a/devel/hdf/pkg/PLIST
+++ b/devel/hdf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/28 22:18:39 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/25 01:09:54 jtb Exp $
bin/fp2hdf
bin/hdf24to8
bin/hdf2jpeg
@@ -77,13 +77,7 @@ include/hdf/vattr.h
include/hdf/vg.h
include/hdf/vgint.h
lib/libdf.a
-lib/libdf.so
-lib/libdf.so.0
-lib/libdf.so.0.0
lib/libmfhdf.a
-lib/libmfhdf.so
-lib/libmfhdf.so.0
-lib/libmfhdf.so.0.0
man/cat1/hdf.0
man/cat1/hdfncdump.0
man/cat1/hdfncgen.0
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-04 20:06:10 +0000