pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/hdf update to 4.2r0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1d78f6db759
branches:  trunk
changeset: 473539:c1d78f6db759
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Apr 20 18:14:37 2004 +0000

description:
update to 4.2r0
changes:
-configuration changes
-support "szip" compression
-some utilities added
-fp2hdf replaced by hdfimport
-USE_BUILDLINK3

diffstat:

 devel/hdf/Makefile         |  38 ++++++++-----------
 devel/hdf/PLIST            |  38 ++++++++-----------
 devel/hdf/distinfo         |  28 ++++----------
 devel/hdf/patches/patch-aa |   8 ----
 devel/hdf/patches/patch-ab |   8 ----
 devel/hdf/patches/patch-ac |   8 ----
 devel/hdf/patches/patch-ad |  47 ------------------------
 devel/hdf/patches/patch-ae |  87 ----------------------------------------------
 devel/hdf/patches/patch-af |  32 ----------------
 devel/hdf/patches/patch-ag |  10 -----
 devel/hdf/patches/patch-ah |  28 --------------
 devel/hdf/patches/patch-ai |  85 ++++++++++++++++++++++++--------------------
 devel/hdf/patches/patch-aj |  69 +++++++++++++++--------------------
 devel/hdf/patches/patch-ak |  13 ------
 devel/hdf/patches/patch-al |  66 ----------------------------------
 devel/hdf/patches/patch-an |  31 ----------------
 devel/hdf/patches/patch-ao |  18 ++++----
 devel/hdf/patches/patch-ap |   8 ++--
 devel/hdf/patches/patch-aq |  16 --------
 devel/hdf/patches/patch-at |  18 ---------
 devel/hdf/patches/patch-ba |  12 ++++++
 21 files changed, 142 insertions(+), 526 deletions(-)

diffs (truncated from 872 to 300 lines):

diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/Makefile
--- a/devel/hdf/Makefile        Tue Apr 20 18:06:56 2004 +0000
+++ b/devel/hdf/Makefile        Tue Apr 20 18:14:37 2004 +0000
@@ -1,39 +1,33 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:31:04 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/20 18:14:37 drochner Exp $
 
-DISTNAME=              HDF4.1r5
-PKGNAME=               hdf-4.1r5
+DISTNAME=              HDF4.2r0
+PKGNAME=               hdf-4.2r0
 CATEGORIES=            devel
-MASTER_SITES=          ftp://hdf.ncsa.uiuc.edu/HDF/HDF4.1r5/tar/
+MASTER_SITES=          ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.2r0/src/
 
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
 HOMEPAGE=              http://hdf.ncsa.uiuc.edu/hdf4.html
 COMMENT=               NCSA Hierarchical Data Format
 
 USE_FORTRAN=           # defined
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                # defined
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-szlib
+CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/hdf
 
 post-patch:
-       ${MV} -f ${WRKSRC}/mfhdf/libsrc/netcdf.h.in             \
-       ${WRKSRC}/mfhdf/libsrc/netcdf.h
-       ${MV} -f ${WRKSRC}/mfhdf/fortran/config/netcdf-fbsd.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.inc      \
-               ${PREFIX}/include/hdf
+do-test:
+       @cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE} check
+       @cd ${WRKSRC}/mfhdf/dumper && ${SH} testhdp.sh
+       @cd ${WRKSRC}/mfhdf/ncdump && ${SETENV} ${MAKE_ENV} ${MAKE} check
+       @cd ${WRKSRC}/mfhdf/nctest && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
-do-test:
-       @cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE}
-       @cd ${WRKSRC}/hdf/test && ./testhdf
-       @cd ${WRKSRC}/hdf/test && ./fortest
-       @cd ${WRKSRC}/mfhdf/dumper && ${SH} testhdp.sh
-       @cd ${WRKSRC}/mfhdf/ncdump && ${SETENV} ${MAKE_ENV} ${MAKE} test
-       @cd ${WRKSRC}/mfhdf/nctest && ${SETENV} ${MAKE_ENV} ${MAKE} test
-
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../archivers/szip/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/PLIST
--- a/devel/hdf/PLIST   Tue Apr 20 18:06:56 2004 +0000
+++ b/devel/hdf/PLIST   Tue Apr 20 18:14:37 2004 +0000
@@ -1,23 +1,29 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/03 23:14:52 jtb Exp $
-bin/fp2hdf
+@comment $NetBSD: PLIST,v 1.3 2004/04/20 18:14:37 drochner Exp $
+bin/gif2hdf
+bin/h4cc
+bin/h4fc
+bin/h4redeploy
 bin/hdf24to8
+bin/hdf2gif
 bin/hdf2jpeg
 bin/hdf8to24
 bin/hdfcomp
 bin/hdfed
+bin/hdfimport
 bin/hdfls
 bin/hdfpack
 bin/hdftopal
 bin/hdftor8
 bin/hdfunpac
+bin/hdiff
 bin/hdp
+bin/hrepack
 bin/jpeg2hdf
 bin/hdfncdump
 bin/hdfncgen
 bin/paltohdf
 bin/r8tohdf
 bin/ristosds
-bin/vcompat
 bin/vmake
 bin/vshow
 include/hdf/atom.h
@@ -27,25 +33,25 @@
 include/hdf/cnone.h
 include/hdf/crle.h
 include/hdf/cskphuff.h
+include/hdf/cszip.h
 include/hdf/df.h
 include/hdf/dfan.h
-include/hdf/dfconvrt.h
+include/hdf/dffunc.f90
 include/hdf/dffunc.inc
 include/hdf/dfgr.h
 include/hdf/dfi.h
-include/hdf/dfivms.h
 include/hdf/dfrig.h
 include/hdf/dfsd.h
 include/hdf/dfstubs.h
 include/hdf/dfufp2i.h
-include/hdf/dir_mac.h
 include/hdf/dynarray.h
-include/hdf/glist.h
+include/hdf/h4config.h
 include/hdf/hbitio.h
 include/hdf/hchunks.h
 include/hdf/hcomp.h
 include/hdf/hcompi.h
 include/hdf/hconv.h
+include/hdf/hdf.f90
 include/hdf/hdf.h
 include/hdf/hdf.inc
 include/hdf/hdf2netcdf.h
@@ -56,36 +62,24 @@
 include/hdf/hlimits.h
 include/hdf/hntdefs.h
 include/hdf/hproto.h
-include/hdf/hqueue.h
 include/hdf/htags.h
 include/hdf/linklist.h
 include/hdf/local_nc.h
-include/hdf/maldebug.h
-include/hdf/mcache.h
 include/hdf/mfan.h
+include/hdf/mfgr.h
 include/hdf/mfhdf.h
-include/hdf/mfgr.h
 include/hdf/mstdio.h
+include/hdf/netcdf.f90
 include/hdf/netcdf.h
 include/hdf/netcdf.inc
-include/hdf/patchlevel.h
-include/hdf/src.inc
-include/hdf/sys_dir_mac.h
 include/hdf/tbbt.h
-include/hdf/trace.h
 include/hdf/vattr.h
 include/hdf/vg.h
-include/hdf/vgint.h
 lib/libdf.a
 lib/libmfhdf.a
-man/cat1/hdf.0
-man/cat1/hdfncdump.0
-man/cat1/hdfncgen.0
-man/cat1/hdfunpac.0
-man/cat3/gr_chunk.0
+lib/libudport.a
 man/man1/hdf.1
 man/man1/hdfncdump.1
 man/man1/hdfncgen.1
 man/man1/hdfunpac.1
-man/man3/gr_chunk.3
 @dirrm include/hdf
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/distinfo
--- a/devel/hdf/distinfo        Tue Apr 20 18:06:56 2004 +0000
+++ b/devel/hdf/distinfo        Tue Apr 20 18:14:37 2004 +0000
@@ -1,23 +1,11 @@
-$NetBSD: distinfo,v 1.4 2002/05/03 23:14:52 jtb Exp $
+$NetBSD: distinfo,v 1.5 2004/04/20 18:14:37 drochner Exp $
 
-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) = 193fadfb544d876041e636707e54c348e485794b
-SHA1 (patch-ae) = 20cf3ec7d97dc12720e9fdb60c913d729d6e97f2
-SHA1 (patch-af) = d788f52dbc0534310ffa9bffefc5f685206042c5
-SHA1 (patch-ag) = 1a3143fc8508213690a6e5953b30b915b64bf910
-SHA1 (patch-ah) = 0b0f14b8f281674e73479c33908c578340f9435b
-SHA1 (patch-ai) = a7b075cd42b28613d98c93e4ecc68818845386a4
-SHA1 (patch-aj) = 86c18e35cc0079ec99982075f1f528cbac975b6e
-SHA1 (patch-ak) = d29cd29382e6775f3bfb353dd745c78ac85b2e1b
-SHA1 (patch-al) = 719419d45c33134b51105fa63a0e4aad7c05ed03
-SHA1 (patch-an) = d098b92a0bbd78daa979ead386e0d81f12e5f6dd
-SHA1 (patch-ao) = 7b3e02fd7003bc7915c144433151b1eb878effdc
-SHA1 (patch-ap) = 5f6cd95f18ae6cb0c4da1155180abcedfb02abe0
-SHA1 (patch-aq) = 92412e45cf9d85e0c46dbcb7f5b9aa40d2b36991
+SHA1 (HDF4.2r0.tar.gz) = 499d8c249a18a78ae81fe1d80095290ffc4d8b54
+Size (HDF4.2r0.tar.gz) = 3712651 bytes
+SHA1 (patch-ai) = ca2ea7f69d201fb5fd9b4b43201b96aec5c9c0d8
+SHA1 (patch-aj) = 848515c038b1c89abc3f4aaad7c816e4429a3780
+SHA1 (patch-ao) = 313ea577ddc7c6f55bd8536dc34625c232ebd168
+SHA1 (patch-ap) = b7d704321653cbf95d8784c6364b880bdc8d67df
 SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06
 SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de
-SHA1 (patch-at) = 10348b63c21218eb6336358f756df0ec86b0d95e
+SHA1 (patch-ba) = a54063eec83563a7ee785ad6120beba4e096ef1a
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/patches/patch-aa
--- a/devel/hdf/patches/patch-aa        Tue Apr 20 18:06:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/28 22:18:39 jtb Exp $
-
---- /dev/null  Mon Feb 26 17:25:58 2001
-+++ Makefile
-@@ -0,0 +1,3 @@
-+SUBDIR+= hdf man mfhdf
-+
-+.include <bsd.subdir.mk>
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/patches/patch-ab
--- a/devel/hdf/patches/patch-ab        Tue Apr 20 18:06:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/28 22:18:39 jtb Exp $
-
---- /dev/null  Mon Feb 26 17:27:24 2001
-+++ hdf/Makefile
-@@ -0,0 +1,3 @@
-+SUBDIR+= src util
-+
-+.include <bsd.subdir.mk>
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/patches/patch-ac
--- a/devel/hdf/patches/patch-ac        Tue Apr 20 18:06:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/28 22:18:39 jtb Exp $
-
---- /dev/null  Mon Feb 26 17:28:40 2001
-+++ mfhdf/Makefile
-@@ -0,0 +1,3 @@
-+SUBDIR+= libsrc dumper ncdump ncgen
-+
-+.include <bsd.subdir.mk>
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/patches/patch-ad
--- a/devel/hdf/patches/patch-ad        Tue Apr 20 18:06:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2002/05/03 23:14:52 jtb Exp $
-
---- /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
-+
-+NOLINT= 1
-+MKPIC= no
-+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     \
-+      dfknat.c dfkswap.c dfkvms.c dfp.c dfpf.c dfr8.c dfr8f.c dfrle.c \
-+      dfsd.c dfsdf.c dfstubs.c dfufp2i.c dfunjpeg.c dfutil.c dfutilf.c\
-+      dir_mac.c dynarray.c glist.c hbitio.c hblocks.c hbuffer.c       \
-+      hchunks.c hcomp.c hcompri.c hdfalloc.c herr.c herrf.c hextelt.c \
-+      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.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 \
-+      dfsd.h dfstubs.h dfufp2i.h dir_mac.h dynarray.h glist.h         \
-+      hbitio.h hchunks.h hcomp.h hcompi.h hconv.h hdf.h hdf.inc       \
-+      hdfi.h herr.h hfile.h hkit.h hlimits.h hntdefs.h hproto.h       \
-+      hqueue.h htags.h linklist.h maldebug.h mcache.h mfan.h mfgr.h   \
-+      mstdio.h patchlevel.h src.inc sys_dir_mac.h tbbt.h trace.h      \
-+      vattr.h vg.h vgint.h
-+
-+afterinstall:
-+      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/hdf
-+      for f in ${INCLUDES}; do                                        \
-+              ${BSD_INSTALL_DATA} $$f ${PREFIX}/include/hdf/$$f;      \
-+      done
-+
-+.include <bsd.lib.mk>
diff -r 01ae443085f5 -r c1d78f6db759 devel/hdf/patches/patch-ae
--- a/devel/hdf/patches/patch-ae        Tue Apr 20 18:06:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2002/05/03 23:14:52 jtb Exp $
-
---- /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          \
-+      hdf2jpeg jpeg2hdf fp2hdf hdfunpac vcompat
-+



Home | Main Index | Thread Index | Old Index