diff options
author | jtb <jtb> | 2002-05-03 23:14:52 +0000 |
---|---|---|
committer | jtb <jtb> | 2002-05-03 23:14:52 +0000 |
commit | 9f7ce4eea96e4a3380b545258a39936f00ebb07d (patch) | |
tree | d8ea0706ea4e36effaf6b066f1d6c32071fea46d /devel | |
parent | 9ad66861251945ec7404a371dbd83cd2ded1970f (diff) | |
download | pkgsrc-9f7ce4eea96e4a3380b545258a39936f00ebb07d.tar.gz |
Update to version 4.1r5.
New Features and Changes:
========================
o The following Vdata routines were added:
VSsetblocksize/vsfsetblsz -- sets the block size of the
linked-block element.
VSsetnumblocks/vsfsetnmbl -- sets the number of blocks for
a linked-block element.
VSgetblockinfo/vsfgetblinfo -- retrieves the block size and the number
of blocks of a linked-block element.
o Two routines were added to get compression information for the SD and
GR interfaces, including chunked elements: SDgetcompress/sfgcompress
and GRgetcompress/mggcompress.
Note:
- For a JPEG image, GRgetcompress only returns the compression type, not
the compression information (i.e, quantity and force_baseline). This
information is not currently retrievable.
- Getting compression type for JPEG chunked images is not working yet.
o "hdp dumpgr" has a new option, -pd, to print palette data only. Also,
whenever option -p or -pd is given, only palettes are printed, and no
images or file attributes.
o A new FORTRAN function, heprntf (HEprint), was added. It takes two
arguments: file name and level. If the file name string has 0 length,
then error messages will be printed to standard output.
o A memory leak in the netCDF portion of the HDF/mfhdf distribution
was fixed.
o The "#define NULL" was removed since ANSI C compilers are required to
define NULL.
o When using "hdp dumpgr", data was being printed in the range of 0-250
when it should have been between 0-168. This problem is now fixed.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/hdf/Makefile | 54 | ||||
-rw-r--r-- | devel/hdf/PLIST | 6 | ||||
-rw-r--r-- | devel/hdf/buildlink.mk | 91 | ||||
-rw-r--r-- | devel/hdf/distinfo | 25 | ||||
-rw-r--r-- | devel/hdf/patches/patch-ad | 11 | ||||
-rw-r--r-- | devel/hdf/patches/patch-ae | 10 | ||||
-rw-r--r-- | devel/hdf/patches/patch-af | 4 | ||||
-rw-r--r-- | devel/hdf/patches/patch-ah | 11 | ||||
-rw-r--r-- | devel/hdf/patches/patch-ai | 13 | ||||
-rw-r--r-- | devel/hdf/patches/patch-aj | 11 | ||||
-rw-r--r-- | devel/hdf/patches/patch-al | 15 | ||||
-rw-r--r-- | devel/hdf/patches/patch-am | 22 | ||||
-rw-r--r-- | devel/hdf/patches/patch-an | 11 | ||||
-rw-r--r-- | devel/hdf/patches/patch-at | 11 |
14 files changed, 168 insertions, 127 deletions
diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile index 1318ee09ca5..3d673c28307 100644 --- a/devel/hdf/Makefile +++ b/devel/hdf/Makefile @@ -1,54 +1,30 @@ -# $NetBSD: Makefile,v 1.11 2001/05/03 22:16:50 jtb Exp $ +# $NetBSD: Makefile,v 1.12 2002/05/03 23:14:52 jtb Exp $ -DISTNAME= HDF4.1r4 -PKGNAME= hdf-4.1r4 -CATEGORIES= devel -MASTER_SITES= ftp://hdf.ncsa.uiuc.edu/HDF/HDF/HDF_Current/tar/ \ - ftp://sunsite.doc.ic.ac.uk/packages/HDF/HDF/HDF_Current/tar/ +DISTNAME= HDF4.1r5 +PKGNAME= hdf-4.1r5 +CATEGORIES= devel +MASTER_SITES= ftp://hdf.ncsa.uiuc.edu/HDF/HDF4.1r5/tar/ -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html -COMMENT= NCSA Hierarchical Data Format +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html +COMMENT= NCSA Hierarchical Data Format -DEPENDS+= jpeg-[0-9]*:../../graphics/jpeg +USE_FORTRAN= # defined +USE_BUILDLINK_ONLY= # defined -USE_FORTRAN= #defined - -JPEGBASE_DEFAULT=${LOCALBASE} -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 \ - libsrc/cdftest.c libsrc/globdef.c libsrc/local_nc.h \ - libsrc/xdrposix.c libsrc/xdrstdio.c ncdump/dumplib.c \ - ncdump/vardata.c ncgen/generate.c ncgen/ncgen.h \ - libsrc/mfhdf.h nctest/add.c nctest/atttests.c \ - nctest/cdftests.c nctest/dimtests.c nctest/driver.c \ - nctest/error.c nctest/misctest.c nctest/rec.c \ - nctest/slabs.c nctest/val.c nctest/vardef.c \ - nctest/varget.c nctest/vargetg.c nctest/varput.c \ - nctest/varputg.c nctest/vartests.c nctest/vputget.c \ - nctest/vputgetg.c; do \ - ${SED} -e 's:"netcdf.h":"netcdf_hdf.h":g' \ - -e 's:\<netcdf.h\>:\<netcdf_hdf.h\>:g' \ - ${WRKSRC}/mfhdf/$$i > ${WRKSRC}/mfhdf/$$i.tmp \ - && ${MV} -f ${WRKSRC}/mfhdf/$$i.tmp \ - ${WRKSRC}/mfhdf/$$i; \ - done ${MV} -f ${WRKSRC}/mfhdf/libsrc/netcdf.h.in \ - ${WRKSRC}/mfhdf/libsrc/netcdf_hdf.h + ${WRKSRC}/mfhdf/libsrc/netcdf.h ${MV} -f ${WRKSRC}/mfhdf/fortran/config/netcdf-fbsd.inc \ - ${WRKSRC}/mfhdf/fortran/netcdf_hdf.inc + ${WRKSRC}/mfhdf/fortran/netcdf.inc ${MV} -f ${WRKSRC}/mfhdf/ncdump/ncdump.1 \ ${WRKSRC}/mfhdf/ncdump/hdfncdump.1 ${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1 \ ${WRKSRC}/mfhdf/ncgen/hdfncgen.1 post-install: - ${INSTALL_DATA} ${WRKSRC}/mfhdf/fortran/netcdf_hdf.inc \ - ${PREFIX}/include/hdf + ${INSTALL_DATA} ${WRKSRC}/mfhdf/fortran/netcdf.inc \ + ${PREFIX}/include/hdf test: build @cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE} @@ -58,4 +34,6 @@ test: build @cd ${WRKSRC}/mfhdf/ncdump && ${SETENV} ${MAKE_ENV} ${MAKE} test @cd ${WRKSRC}/mfhdf/nctest && ${SETENV} ${MAKE_ENV} ${MAKE} test +.include "../../devel/zlib/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/hdf/PLIST b/devel/hdf/PLIST index 6f361c8e529..2690a9c255a 100644 --- a/devel/hdf/PLIST +++ b/devel/hdf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:08 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/05/03 23:14:52 jtb Exp $ bin/fp2hdf bin/hdf24to8 bin/hdf2jpeg @@ -66,8 +66,8 @@ include/hdf/mfan.h include/hdf/mfhdf.h include/hdf/mfgr.h include/hdf/mstdio.h -include/hdf/netcdf_hdf.h -include/hdf/netcdf_hdf.inc +include/hdf/netcdf.h +include/hdf/netcdf.inc include/hdf/patchlevel.h include/hdf/src.inc include/hdf/sys_dir_mac.h diff --git a/devel/hdf/buildlink.mk b/devel/hdf/buildlink.mk new file mode 100644 index 00000000000..b83700852d1 --- /dev/null +++ b/devel/hdf/buildlink.mk @@ -0,0 +1,91 @@ +# $NetBSD: buildlink.mk,v 1.1 2002/05/03 23:14:52 jtb Exp $ +# +# This Makefile fragment is included by packages that use hdf. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.hdf to the dependency pattern +# for the version of hdf desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(HDF_BUILDLINK_MK) +HDF_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.hdf?= hdf>=4.1r5 +BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.hdf}:../../devel/hdf + +EVAL_PREFIX+= BUILDLINK_PREFIX.hdf=hdf +BUILDLINK_PREFIX.hdf_DEFAULT= ${LOCALBASE} + +BUILDLINK_FILES.hdf= include/hdf/atom.h +BUILDLINK_FILES.hdf+= include/hdf/bitvect.h +BUILDLINK_FILES.hdf+= include/hdf/cdeflate.h +BUILDLINK_FILES.hdf+= include/hdf/cnbit.h +BUILDLINK_FILES.hdf+= include/hdf/cnone.h +BUILDLINK_FILES.hdf+= include/hdf/crle.h +BUILDLINK_FILES.hdf+= include/hdf/cskphuff.h +BUILDLINK_FILES.hdf+= include/hdf/df.h +BUILDLINK_FILES.hdf+= include/hdf/dfan.h +BUILDLINK_FILES.hdf+= include/hdf/dfconvrt.h +BUILDLINK_FILES.hdf+= include/hdf/dffunc.inc +BUILDLINK_FILES.hdf+= include/hdf/dfgr.h +BUILDLINK_FILES.hdf+= include/hdf/dfi.h +BUILDLINK_FILES.hdf+= include/hdf/dfivms.h +BUILDLINK_FILES.hdf+= include/hdf/dfrig.h +BUILDLINK_FILES.hdf+= include/hdf/dfsd.h +BUILDLINK_FILES.hdf+= include/hdf/dfstubs.h +BUILDLINK_FILES.hdf+= include/hdf/dfufp2i.h +BUILDLINK_FILES.hdf+= include/hdf/dir_mac.h +BUILDLINK_FILES.hdf+= include/hdf/dynarray.h +BUILDLINK_FILES.hdf+= include/hdf/glist.h +BUILDLINK_FILES.hdf+= include/hdf/hbitio.h +BUILDLINK_FILES.hdf+= include/hdf/hchunks.h +BUILDLINK_FILES.hdf+= include/hdf/hcomp.h +BUILDLINK_FILES.hdf+= include/hdf/hcompi.h +BUILDLINK_FILES.hdf+= include/hdf/hconv.h +BUILDLINK_FILES.hdf+= include/hdf/hdf.h +BUILDLINK_FILES.hdf+= include/hdf/hdf.inc +BUILDLINK_FILES.hdf+= include/hdf/hdf2netcdf.h +BUILDLINK_FILES.hdf+= include/hdf/hdfi.h +BUILDLINK_FILES.hdf+= include/hdf/herr.h +BUILDLINK_FILES.hdf+= include/hdf/hfile.h +BUILDLINK_FILES.hdf+= include/hdf/hkit.h +BUILDLINK_FILES.hdf+= include/hdf/hlimits.h +BUILDLINK_FILES.hdf+= include/hdf/hntdefs.h +BUILDLINK_FILES.hdf+= include/hdf/hproto.h +BUILDLINK_FILES.hdf+= include/hdf/hqueue.h +BUILDLINK_FILES.hdf+= include/hdf/htags.h +BUILDLINK_FILES.hdf+= include/hdf/linklist.h +BUILDLINK_FILES.hdf+= include/hdf/local_nc.h +BUILDLINK_FILES.hdf+= include/hdf/maldebug.h +BUILDLINK_FILES.hdf+= include/hdf/mcache.h +BUILDLINK_FILES.hdf+= include/hdf/mfan.h +BUILDLINK_FILES.hdf+= include/hdf/mfhdf.h +BUILDLINK_FILES.hdf+= include/hdf/mfgr.h +BUILDLINK_FILES.hdf+= include/hdf/mstdio.h +BUILDLINK_FILES.hdf+= include/hdf/netcdf.h +BUILDLINK_FILES.hdf+= include/hdf/netcdf.inc +BUILDLINK_FILES.hdf+= include/hdf/patchlevel.h +BUILDLINK_FILES.hdf+= include/hdf/src.inc +BUILDLINK_FILES.hdf+= include/hdf/sys_dir_mac.h +BUILDLINK_FILES.hdf+= include/hdf/tbbt.h +BUILDLINK_FILES.hdf+= include/hdf/trace.h +BUILDLINK_FILES.hdf+= include/hdf/vattr.h +BUILDLINK_FILES.hdf+= include/hdf/vg.h +BUILDLINK_FILES.hdf+= include/hdf/vgint.h +BUILDLINK_FILES.hdf+= lib/libdf.* +BUILDLINK_FILES.hdf+= lib/libmfhdf.* + +BUILDLINK_TARGETS.hdf= hdf-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.hdf} + +pre-configure: ${BUILDLINK_TARGETS.hdf} +hdf-buildlink: _BUILDLINK_USE + +.endif # HDF_BUILDLINK_MK diff --git a/devel/hdf/distinfo b/devel/hdf/distinfo index 3b251c0f3ca..bdb76d89e63 100644 --- a/devel/hdf/distinfo +++ b/devel/hdf/distinfo @@ -1,24 +1,23 @@ -$NetBSD: distinfo,v 1.3 2001/04/21 00:44:23 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/05/03 23:14:52 jtb Exp $ -SHA1 (HDF4.1r4.tar.gz) = 3440807b3037caa3ba4ee541402600eb1dcc67e7 -Size (HDF4.1r4.tar.gz) = 4371391 bytes +SHA1 (HDF4.1r5.tar.gz) = e284b3d14c5a1e6ca75ca581aa7bfa33a27208fb +Size (HDF4.1r5.tar.gz) = 4423795 bytes SHA1 (patch-aa) = dd9c4c44423a8d93226e72331d921b0911cd0e62 SHA1 (patch-ab) = bc3dcc046aee99ec219d2e01b98dc314f63e25b6 SHA1 (patch-ac) = 45ba44cbdf00ac0b4b7101d2c1514e34a57dd024 -SHA1 (patch-ad) = 4d3dec99064f5ae3202502fcd71d5499ccee7b08 -SHA1 (patch-ae) = da73e042272bf318e6f631e4ed91cc21897a5711 -SHA1 (patch-af) = 2b50002362a058f2b053293a50d779bb1b7a032c +SHA1 (patch-ad) = 193fadfb544d876041e636707e54c348e485794b +SHA1 (patch-ae) = 20cf3ec7d97dc12720e9fdb60c913d729d6e97f2 +SHA1 (patch-af) = d788f52dbc0534310ffa9bffefc5f685206042c5 SHA1 (patch-ag) = 1a3143fc8508213690a6e5953b30b915b64bf910 -SHA1 (patch-ah) = 50700dada74d56632c49481b05fa5b9313b77cf7 -SHA1 (patch-ai) = 6e7a52ff516eb86caf15441f91c598b2d1d64c95 -SHA1 (patch-aj) = 081f1632289ead661328c7df73ddeb2dff2eb2eb +SHA1 (patch-ah) = 0b0f14b8f281674e73479c33908c578340f9435b +SHA1 (patch-ai) = a7b075cd42b28613d98c93e4ecc68818845386a4 +SHA1 (patch-aj) = 86c18e35cc0079ec99982075f1f528cbac975b6e SHA1 (patch-ak) = d29cd29382e6775f3bfb353dd745c78ac85b2e1b -SHA1 (patch-al) = 7ac77a10cab7df20976d912aa8f4aeea9210f3cc -SHA1 (patch-am) = b51a0705d1130c799663cbf75a938af0cbd0f599 -SHA1 (patch-an) = 3fba432a5bf700b502ecff4ac6c54ca285d740a2 +SHA1 (patch-al) = 719419d45c33134b51105fa63a0e4aad7c05ed03 +SHA1 (patch-an) = d098b92a0bbd78daa979ead386e0d81f12e5f6dd SHA1 (patch-ao) = 7b3e02fd7003bc7915c144433151b1eb878effdc SHA1 (patch-ap) = 5f6cd95f18ae6cb0c4da1155180abcedfb02abe0 SHA1 (patch-aq) = 92412e45cf9d85e0c46dbcb7f5b9aa40d2b36991 SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06 SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de -SHA1 (patch-at) = 1a4c29206fff6b7dc774372ede52e41a9ae2be4e +SHA1 (patch-at) = 10348b63c21218eb6336358f756df0ec86b0d95e diff --git a/devel/hdf/patches/patch-ad b/devel/hdf/patches/patch-ad index f871d84f7b7..44c5b002538 100644 --- a/devel/hdf/patches/patch-ad +++ b/devel/hdf/patches/patch-ad @@ -1,14 +1,13 @@ -$NetBSD: patch-ad,v 1.4 2001/03/25 01:09:50 jtb Exp $ +$NetBSD: patch-ad,v 1.5 2002/05/03 23:14:52 jtb Exp $ ---- /dev/null Sun Mar 25 00:37:46 2001 -+++ hdf/src/Makefile -@@ -0,0 +1,43 @@ +--- /dev/null Wed May 1 14:00:57 2002 ++++ hdf/src/Makefile Wed May 1 14:01:38 2002 +@@ -0,0 +1,42 @@ +LIB= df + +LIBDIR= ${PREFIX}/lib + +CPPFLAGS+= -Dunix -DMEM_LIST -+CPPFLAGS+= -I${JPEGBASE}/include + +NOLINT= 1 +MKPIC= no @@ -17,7 +16,7 @@ $NetBSD: patch-ad,v 1.4 2001/03/25 01:09:50 jtb Exp $ + +NOGCCERROR= 1 + -+SRCS= atom.c bitvect.c cdeflate.c cnbit.c cnone.c crle.c cskphuff.c \ ++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 \ + dfknat.c dfkswap.c dfkvms.c dfp.c dfpf.c dfr8.c dfr8f.c dfrle.c \ diff --git a/devel/hdf/patches/patch-ae b/devel/hdf/patches/patch-ae index ef84211a3d2..f25f350c3f7 100644 --- a/devel/hdf/patches/patch-ae +++ b/devel/hdf/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.4 2001/04/19 00:56:34 jtb Exp $ +$NetBSD: patch-ae,v 1.5 2002/05/03 23:14:52 jtb Exp $ ---- /dev/null Thu Apr 19 00:39:33 2001 -+++ hdf/util/Makefile +--- /dev/null Wed May 1 14:04:01 2002 ++++ hdf/util/Makefile Wed May 1 14:07:48 2002 @@ -0,0 +1,82 @@ +UTILS= hdf24to8 hdfcomp hdfed hdfls hdfpack hdftopal hdftor8 \ + paltohdf r8tohdf ristosds vmake vshow hdf8to24 \ @@ -14,10 +14,10 @@ $NetBSD: patch-ae,v 1.4 2001/04/19 00:56:34 jtb Exp $ + +CPPFLAGS+= -Dunix +CPPFLAGS+= -I${.CURDIR}/../src -+CPPFLAGS+= -I${JPEGBASE}/include + +LDFLAGS+= -L${.CURDIR}/../src -+LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib + +LDADD+= -ldf -ljpeg -lz + diff --git a/devel/hdf/patches/patch-af b/devel/hdf/patches/patch-af index 7cebb6a5bf4..6db630bcc65 100644 --- a/devel/hdf/patches/patch-af +++ b/devel/hdf/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.6 2001/04/19 00:56:34 jtb Exp $ +$NetBSD: patch-af,v 1.7 2002/05/03 23:14:52 jtb Exp $ --- mfhdf/libsrc/Makefile.orig Thu Apr 19 00:17:24 2001 +++ mfhdf/libsrc/Makefile @@ -25,7 +25,7 @@ $NetBSD: patch-af,v 1.6 2001/04/19 00:56:34 jtb Exp $ + +afterinstall: + ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/hdf -+ for f in hdf2netcdf.h local_nc.h mfhdf.h netcdf_hdf.h; do \ ++ for f in hdf2netcdf.h local_nc.h mfhdf.h netcdf.h; do \ + ${BSD_INSTALL_DATA} $$f ${PREFIX}/include/hdf/; \ + done + diff --git a/devel/hdf/patches/patch-ah b/devel/hdf/patches/patch-ah index 0ec38b9ab8a..5a8b1559d36 100644 --- a/devel/hdf/patches/patch-ah +++ b/devel/hdf/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.5 2001/04/19 00:56:34 jtb Exp $ +$NetBSD: patch-ah,v 1.6 2002/05/03 23:14:52 jtb Exp $ ---- /dev/null Sun Mar 25 00:38:33 2001 -+++ mfhdf/dumper/Makefile -@@ -0,0 +1,22 @@ +--- /dev/null Wed May 1 14:04:01 2002 ++++ mfhdf/dumper/Makefile Wed May 1 14:10:17 2002 +@@ -0,0 +1,23 @@ +PROG= hdp + +SRCS= hdp.c hdp_list.c hdp_sds.c hdp_util.c hdp_vd.c hdp_vg.c \ @@ -17,7 +17,8 @@ $NetBSD: patch-ah,v 1.5 2001/04/19 00:56:34 jtb Exp $ + +LDFLAGS+= -L${.CURDIR}/../libsrc +LDFLAGS+= -L${.CURDIR}/../../hdf/src -+LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib + +LDADD+= -lmfhdf -ldf -ljpeg -lz -lm + diff --git a/devel/hdf/patches/patch-ai b/devel/hdf/patches/patch-ai index cfcfbb71bd5..1ffa00ef507 100644 --- a/devel/hdf/patches/patch-ai +++ b/devel/hdf/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2001/04/19 00:56:34 jtb Exp $ +$NetBSD: patch-ai,v 1.6 2002/05/03 23:14:52 jtb Exp $ ---- /dev/null Thu Apr 19 00:41:39 2001 -+++ mfhdf/ncdump/Makefile -@@ -0,0 +1,33 @@ +--- /dev/null Wed May 1 14:20:26 2002 ++++ mfhdf/ncdump/Makefile Wed May 1 14:24:12 2002 +@@ -0,0 +1,34 @@ +PROG= ncdump +PROGNAME= hdfncdump + @@ -13,12 +13,13 @@ $NetBSD: patch-ai,v 1.5 2001/04/19 00:56:34 jtb Exp $ +BINDIR= ${PREFIX}/bin +LIBDIR= ${PREFIX}/lib +MANDIR= ${PREFIX}/man -+ ++CFLAGS= -g +CPPFLAGS+= -I${.CURDIR}/../libsrc + +LDFLAGS+= -L${.CURDIR}/../libsrc +LDFLAGS+= -L${.CURDIR}/../../hdf/src -+LDFLAGS+= -Wl,-R${JPEGBASE} -L${JPEGBASE} ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib + +LDADD+= -lmfhdf -ldf -ljpeg -lz + diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj index 08b81b9a5e0..371e5f143ac 100644 --- a/devel/hdf/patches/patch-aj +++ b/devel/hdf/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.4 2001/04/19 00:56:34 jtb Exp $ +$NetBSD: patch-aj,v 1.5 2002/05/03 23:14:52 jtb Exp $ ---- /dev/null Thu Apr 19 00:41:46 2001 -+++ mfhdf/ncgen/Makefile -@@ -0,0 +1,34 @@ +--- /dev/null Wed May 1 14:04:01 2002 ++++ mfhdf/ncgen/Makefile Wed May 1 14:11:52 2002 +@@ -0,0 +1,35 @@ +PROG= ncgen +PROGNAME= hdfncgen + @@ -21,7 +21,8 @@ $NetBSD: patch-aj,v 1.4 2001/04/19 00:56:34 jtb Exp $ + +LDFLAGS+= -L${.CURDIR}/../libsrc +LDFLAGS+= -L${.CURDIR}/../../hdf/src -+LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib + +LDADD+= -lmfhdf -ldf -ljpeg -lz + diff --git a/devel/hdf/patches/patch-al b/devel/hdf/patches/patch-al index c43dc492faa..386b8d20c22 100644 --- a/devel/hdf/patches/patch-al +++ b/devel/hdf/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.2 2001/03/25 01:09:51 jtb Exp $ +$NetBSD: patch-al,v 1.3 2002/05/03 23:14:52 jtb Exp $ ---- /dev/null Sun Mar 25 00:38:11 2001 -+++ hdf/test/Makefile -@@ -0,0 +1,60 @@ +--- /dev/null Wed May 1 14:04:01 2002 ++++ hdf/test/Makefile Wed May 1 14:13:47 2002 +@@ -0,0 +1,61 @@ +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 \ @@ -23,8 +23,9 @@ $NetBSD: patch-al,v 1.2 2001/03/25 01:09:51 jtb Exp $ +CPPFLAGS+= -Dunix +CPPFLAGS+= -I${.CURDIR}/../src + -+LDFLAGS+= -Wl,-R${.CURDIR}/../src -L${.CURDIR}/../src -+LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib ++LDFLAGS+= -L${.CURDIR}/../src ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib + +LDADD+= -ldf -ljpeg -lz -lm + @@ -57,7 +58,7 @@ $NetBSD: patch-al,v 1.2 2001/03/25 01:09:51 jtb Exp $ + ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD} + +clean: -+ -rm -f testhdf ${COBJS} ${FOBJS} ${FTESTS} \ ++ ${RM} testhdf ${COBJS} ${FOBJS} ${FTESTS} \ + core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg ${TESTDIR}/* \ + .depend + diff --git a/devel/hdf/patches/patch-am b/devel/hdf/patches/patch-am deleted file mode 100644 index 66e517db24e..00000000000 --- a/devel/hdf/patches/patch-am +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-am,v 1.1 2001/03/22 23:19:17 jtb Exp $ - ---- mfhdf/ncgen/generate.c.orig Tue Dec 8 21:38:02 1998 -+++ mfhdf/ncgen/generate.c -@@ -101,7 +101,7 @@ - int ntypes = (sizeof ctypes) / (sizeof ctypes[0]); - - /* wrap in main program */ -- cline("#include \"netcdf.h\""); -+ cline("#include \"netcdf_hdf.h\""); - cline(""); - cline("int"); - sprintf(stmnt, "main() {\t\t\t/* create %s */", filename); -@@ -413,7 +413,7 @@ - #ifdef MSDOS - printf("$include: \"netcdf.inc\"\n"); - #else -- fline("include 'netcdf.inc'"); -+ fline("include 'netcdf_hdf.inc'"); - #endif - - /* create necessary declarations */ diff --git a/devel/hdf/patches/patch-an b/devel/hdf/patches/patch-an index cec19a09653..1567a0136c9 100644 --- a/devel/hdf/patches/patch-an +++ b/devel/hdf/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.2 2001/03/25 01:09:51 jtb Exp $ +$NetBSD: patch-an,v 1.3 2002/05/03 23:14:53 jtb Exp $ ---- /dev/null Sun Mar 25 00:39:12 2001 -+++ mfhdf/nctest/Makefile -@@ -0,0 +1,25 @@ +--- /dev/null Wed May 1 14:04:01 2002 ++++ mfhdf/nctest/Makefile Wed May 1 14:14:41 2002 +@@ -0,0 +1,26 @@ +PROG= nctest + +SRCS = varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \ @@ -15,7 +15,8 @@ $NetBSD: patch-an,v 1.2 2001/03/25 01:09:51 jtb Exp $ + +LDFLAGS+= -L${.CURDIR}/../libsrc +LDFLAGS+= -L${.CURDIR}/../../hdf/src -+LDFLAGS+= -Wl,-R${JPEGBASE}/lib -L${JPEGBASE}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib ++LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib + +LDADD+= -lmfhdf -ldf -ljpeg -lz -lm + diff --git a/devel/hdf/patches/patch-at b/devel/hdf/patches/patch-at index 5983cc5c806..d88669119af 100644 --- a/devel/hdf/patches/patch-at +++ b/devel/hdf/patches/patch-at @@ -1,4 +1,4 @@ -$NetBSD: patch-at,v 1.1 2001/04/19 00:56:34 jtb Exp $ +$NetBSD: patch-at,v 1.2 2002/05/03 23:14:53 jtb Exp $ --- mfhdf/libsrc/xdrposix.c.orig Thu Apr 19 00:27:10 2001 +++ mfhdf/libsrc/xdrposix.c @@ -16,12 +16,3 @@ $NetBSD: patch-at,v 1.1 2001/04/19 00:56:34 jtb Exp $ #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)) |