kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to 4.2r0

Browse source 
changes:
-configuration changes
-support "szip" compression
-some utilities added
-fp2hdf replaced by hdfimport
-USE_BUILDLINK3
This commit is contained in:
drochner 2004-04-20 18:14:37 +00:00
parent adcbc19ebd
commit 6277037b00
21 changed files with 140 additions and 524 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
devel/hdf/Makefile
View file

@ -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 DISTNAME= HDF4.2r0
PKGNAME= hdf-4.1r5 PKGNAME= hdf-4.2r0
CATEGORIES= devel 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 MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html
COMMENT= NCSA Hierarchical Data Format COMMENT= NCSA Hierarchical Data Format
USE_FORTRAN= # defined USE_FORTRAN= # defined
USE_BUILDLINK2= # defined USE_BUILDLINK3= # defined
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-szlib
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/hdf
post-patch: 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 \ ${MV} -f ${WRKSRC}/mfhdf/ncdump/ncdump.1 \
${WRKSRC}/mfhdf/ncdump/hdfncdump.1 ${WRKSRC}/mfhdf/ncdump/hdfncdump.1
${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1 \ ${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1 \
${WRKSRC}/mfhdf/ncgen/hdfncgen.1 ${WRKSRC}/mfhdf/ncgen/hdfncgen.1
post-install:
${INSTALL_DATA} ${WRKSRC}/mfhdf/fortran/netcdf.inc \
${PREFIX}/include/hdf
do-test: do-test:
@cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE} @cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE} check
@cd ${WRKSRC}/hdf/test && ./testhdf
@cd ${WRKSRC}/hdf/test && ./fortest
@cd ${WRKSRC}/mfhdf/dumper && ${SH} testhdp.sh @cd ${WRKSRC}/mfhdf/dumper && ${SH} testhdp.sh
@cd ${WRKSRC}/mfhdf/ncdump && ${SETENV} ${MAKE_ENV} ${MAKE} test @cd ${WRKSRC}/mfhdf/ncdump && ${SETENV} ${MAKE_ENV} ${MAKE} check
@cd ${WRKSRC}/mfhdf/nctest && ${SETENV} ${MAKE_ENV} ${MAKE} test @cd ${WRKSRC}/mfhdf/nctest && ${SETENV} ${MAKE_ENV} ${MAKE} check
.include "../../devel/zlib/buildlink2.mk" .include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/jpeg/buildlink3.mk"
.include "../../archivers/szip/buildlink3.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

38
devel/hdf/PLIST
View file

@ -1,23 +1,29 @@
@comment $NetBSD: PLIST,v 1.2 2002/05/03 23:14:52 jtb Exp $ @comment $NetBSD: PLIST,v 1.3 2004/04/20 18:14:37 drochner Exp $
bin/fp2hdf bin/gif2hdf
bin/h4cc
bin/h4fc
bin/h4redeploy
bin/hdf24to8 bin/hdf24to8
bin/hdf2gif
bin/hdf2jpeg bin/hdf2jpeg
bin/hdf8to24 bin/hdf8to24
bin/hdfcomp bin/hdfcomp
bin/hdfed bin/hdfed
bin/hdfimport
bin/hdfls bin/hdfls
bin/hdfpack bin/hdfpack
bin/hdftopal bin/hdftopal
bin/hdftor8 bin/hdftor8
bin/hdfunpac bin/hdfunpac
bin/hdiff
bin/hdp bin/hdp
bin/hrepack
bin/jpeg2hdf bin/jpeg2hdf
bin/hdfncdump bin/hdfncdump
bin/hdfncgen bin/hdfncgen
bin/paltohdf bin/paltohdf
bin/r8tohdf bin/r8tohdf
bin/ristosds bin/ristosds
bin/vcompat
bin/vmake bin/vmake
bin/vshow bin/vshow
include/hdf/atom.h include/hdf/atom.h
@ -27,25 +33,25 @@ include/hdf/cnbit.h
include/hdf/cnone.h include/hdf/cnone.h
include/hdf/crle.h include/hdf/crle.h
include/hdf/cskphuff.h include/hdf/cskphuff.h
include/hdf/cszip.h
include/hdf/df.h include/hdf/df.h
include/hdf/dfan.h include/hdf/dfan.h
include/hdf/dfconvrt.h include/hdf/dffunc.f90
include/hdf/dffunc.inc include/hdf/dffunc.inc
include/hdf/dfgr.h include/hdf/dfgr.h
include/hdf/dfi.h include/hdf/dfi.h
include/hdf/dfivms.h
include/hdf/dfrig.h include/hdf/dfrig.h
include/hdf/dfsd.h include/hdf/dfsd.h
include/hdf/dfstubs.h include/hdf/dfstubs.h
include/hdf/dfufp2i.h include/hdf/dfufp2i.h
include/hdf/dir_mac.h
include/hdf/dynarray.h include/hdf/dynarray.h
include/hdf/glist.h include/hdf/h4config.h
include/hdf/hbitio.h include/hdf/hbitio.h
include/hdf/hchunks.h include/hdf/hchunks.h
include/hdf/hcomp.h include/hdf/hcomp.h
include/hdf/hcompi.h include/hdf/hcompi.h
include/hdf/hconv.h include/hdf/hconv.h
include/hdf/hdf.f90
include/hdf/hdf.h include/hdf/hdf.h
include/hdf/hdf.inc include/hdf/hdf.inc
include/hdf/hdf2netcdf.h include/hdf/hdf2netcdf.h
@ -56,36 +62,24 @@ include/hdf/hkit.h
include/hdf/hlimits.h include/hdf/hlimits.h
include/hdf/hntdefs.h include/hdf/hntdefs.h
include/hdf/hproto.h include/hdf/hproto.h
include/hdf/hqueue.h
include/hdf/htags.h include/hdf/htags.h
include/hdf/linklist.h include/hdf/linklist.h
include/hdf/local_nc.h include/hdf/local_nc.h
include/hdf/maldebug.h
include/hdf/mcache.h
include/hdf/mfan.h include/hdf/mfan.h
include/hdf/mfhdf.h
include/hdf/mfgr.h include/hdf/mfgr.h
include/hdf/mfhdf.h
include/hdf/mstdio.h include/hdf/mstdio.h
include/hdf/netcdf.f90
include/hdf/netcdf.h include/hdf/netcdf.h
include/hdf/netcdf.inc include/hdf/netcdf.inc
include/hdf/patchlevel.h
include/hdf/src.inc
include/hdf/sys_dir_mac.h
include/hdf/tbbt.h include/hdf/tbbt.h
include/hdf/trace.h
include/hdf/vattr.h include/hdf/vattr.h
include/hdf/vg.h include/hdf/vg.h
include/hdf/vgint.h
lib/libdf.a lib/libdf.a
lib/libmfhdf.a lib/libmfhdf.a
man/cat1/hdf.0 lib/libudport.a
man/cat1/hdfncdump.0
man/cat1/hdfncgen.0
man/cat1/hdfunpac.0
man/cat3/gr_chunk.0
man/man1/hdf.1 man/man1/hdf.1
man/man1/hdfncdump.1 man/man1/hdfncdump.1
man/man1/hdfncgen.1 man/man1/hdfncgen.1
man/man1/hdfunpac.1 man/man1/hdfunpac.1
man/man3/gr_chunk.3
@dirrm include/hdf @dirrm include/hdf

28
devel/hdf/distinfo
View file

@ -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 SHA1 (HDF4.2r0.tar.gz) = 499d8c249a18a78ae81fe1d80095290ffc4d8b54
Size (HDF4.1r5.tar.gz) = 4423795 bytes Size (HDF4.2r0.tar.gz) = 3712651 bytes
SHA1 (patch-aa) = dd9c4c44423a8d93226e72331d921b0911cd0e62 SHA1 (patch-ai) = ca2ea7f69d201fb5fd9b4b43201b96aec5c9c0d8
SHA1 (patch-ab) = bc3dcc046aee99ec219d2e01b98dc314f63e25b6 SHA1 (patch-aj) = 848515c038b1c89abc3f4aaad7c816e4429a3780
SHA1 (patch-ac) = 45ba44cbdf00ac0b4b7101d2c1514e34a57dd024 SHA1 (patch-ao) = 313ea577ddc7c6f55bd8536dc34625c232ebd168
SHA1 (patch-ad) = 193fadfb544d876041e636707e54c348e485794b SHA1 (patch-ap) = b7d704321653cbf95d8784c6364b880bdc8d67df
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 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06 SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06
SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de
SHA1 (patch-at) = 10348b63c21218eb6336358f756df0ec86b0d95e SHA1 (patch-ba) = a54063eec83563a7ee785ad6120beba4e096ef1a

8
devel/hdf/patches/patch-aa
View file

@ -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>

8
devel/hdf/patches/patch-ab
View file

@ -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>

8
devel/hdf/patches/patch-ac
View file

@ -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>

47
devel/hdf/patches/patch-ad
View file

@ -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>

87
devel/hdf/patches/patch-ae
View file

@ -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
+
+all: ${UTILS}
+
+BINDIR= ${PREFIX}/bin
+LIBDIR= ${PREFIX}/lib
+
+CPPFLAGS+= -Dunix
+CPPFLAGS+= -I${.CURDIR}/../src
+
+LDFLAGS+= -L${.CURDIR}/../src
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib
+
+LDADD+= -ldf -ljpeg -lz
+
+NOGCCERROR= 1
+
+fp2hdf: fp2hdf.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -lm -o $@
+
+hdf24to8: hdf24to8.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdf2jpeg: hdf2jpeg.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdf8to24: hdf8to24.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdfcomp: hdfcomp.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdfed: he_main.o he_cntrl.o he_disp.o he_file.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdfls: hdfls.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdfpack: hdfpack.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdftopal: hdftopal.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdftor8: hdftor8.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+hdfunpac: hdfunpac.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+jpeg2hdf: jpeg2hdf.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+paltohdf: paltohdf.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+r8tohdf: r8tohdf.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+ristosds: ristosds.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+vcompat: vcompat.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+vmake: vmake.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+vshow: vshow.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} $? ${LDFLAGS} ${LDADD} -o $@
+
+
+install: ${UTILS}
+ @for f in ${UTILS}; do \
+ ${BSD_INSTALL_PROGRAM} $$f ${BINDIR}; \
+ done
+
+clean:
+ -rm -f *.o ${UTILS}

32
devel/hdf/patches/patch-af
View file

@ -1,32 +0,0 @@
$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
@@ -0,0 +1,27 @@
+.PATH: ${.CURDIR} ${.CURDIR}/../fortran ${.CURDIR}/../fortran/config
+
+LIB= mfhdf
+
+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 xdrposix.c jackets-fbsd.c mfsdf.c mfsdff.f
+
+CPPFLAGS+= -Dunix -DHDF -DNDEBUG -DNETLONG=int
+CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../hdf/src
+
+NOLINT= 1
+MKPIC= no
+MKPICINSTALL= no
+MKPROFILE= no
+
+NOGCCERROR= 1
+
+afterinstall:
+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/hdf
+ for f in hdf2netcdf.h local_nc.h mfhdf.h netcdf.h; do \
+ ${BSD_INSTALL_DATA} $$f ${PREFIX}/include/hdf/; \
+ done
+
+.include <bsd.lib.mk>

10
devel/hdf/patches/patch-ag
View file

@ -1,10 +0,0 @@
$NetBSD: patch-ag,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
--- /dev/null Wed Feb 28 13:05:04 2001
+++ man/Makefile
@@ -0,0 +1,5 @@
+MAN= hdf.1 hdfunpac.1 gr_chunk.3
+
+MANDIR= ${PREFIX}/man
+
+.include <bsd.man.mk>

28
devel/hdf/patches/patch-ah
View file

@ -1,28 +0,0 @@
$NetBSD: patch-ah,v 1.6 2002/05/03 23:14:52 jtb Exp $
--- /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 \
+ hdp_rig.c show.c hdp_dump.c hdp_gr.c
+
+BINDIR= ${PREFIX}/bin
+LIBDIR= ${PREFIX}/lib
+
+CPPFLAGS+= -Dunix
+CPPFLAGS+= -I${.CURDIR}/../libsrc
+CPPFLAGS+= -I${.CURDIR}/../../hdf/src
+
+LDFLAGS+= -L${.CURDIR}/../libsrc
+LDFLAGS+= -L${.CURDIR}/../../hdf/src
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib
+
+LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
+
+NOMAN= 1
+NOGCCERROR= 1
+
+.include <bsd.prog.mk>

85
devel/hdf/patches/patch-ai
View file

@ -1,39 +1,48 @@
$NetBSD: patch-ai,v 1.6 2002/05/03 23:14:52 jtb Exp $ $NetBSD: patch-ai,v 1.7 2004/04/20 18:14:37 drochner Exp $
--- /dev/null Wed May 1 14:20:26 2002 --- mfhdf/ncdump/Makefile.in.orig 2003-11-07 19:39:00.000000000 +0100
+++ mfhdf/ncdump/Makefile Wed May 1 14:24:12 2002 +++ mfhdf/ncdump/Makefile.in 2004-04-20 16:38:54.000000000 +0200
@@ -0,0 +1,34 @@ @@ -156,7 +156,7 @@
+PROG= ncdump #############################################################################
+PROGNAME= hdfncdump #############################################################################
+ bin_PROGRAMS = ncdump
+MAN= hdfncdump.1 -man1_MANS = ncdump.1
+ +man1_MANS = hdfncdump.1
+SRCS= ncdump.c vardata.c dumplib.c
+ ncdump_SOURCES = dumplib.c ncdump.c vardata.c
+BINDIR= ${PREFIX}/bin ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
+LIBDIR= ${PREFIX}/lib @@ -171,7 +171,7 @@
+MANDIR= ${PREFIX}/man mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+CFLAGS= -g CONFIG_HEADER = $(top_builddir)/hdf/src/h4config.h
+CPPFLAGS+= -I${.CURDIR}/../libsrc CONFIG_CLEAN_FILES =
+ -bin_PROGRAMS = ncdump$(EXEEXT)
+LDFLAGS+= -L${.CURDIR}/../libsrc +bin_PROGRAMS = hdfncdump$(EXEEXT)
+LDFLAGS+= -L${.CURDIR}/../../hdf/src PROGRAMS = $(bin_PROGRAMS)
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib am_ncdump_OBJECTS = dumplib.$(OBJEXT) ncdump.$(OBJEXT) vardata.$(OBJEXT)
+ @@ -227,7 +227,7 @@
+LDADD+= -lmfhdf -ldf -ljpeg -lz
+ clean-binPROGRAMS:
+NOGCCERROR= 1 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ -ncdump$(EXEEXT): $(ncdump_OBJECTS) $(ncdump_DEPENDENCIES)
+NCGEN= ${.CURDIR}/../ncgen/ncgen +hdfncdump$(EXEEXT): $(ncdump_OBJECTS) $(ncdump_DEPENDENCIES)
+ @rm -f ncdump$(EXEEXT)
+test: ${PROG} test0.cdl $(LINK) $(ncdump_LDFLAGS) $(ncdump_OBJECTS) $(ncdump_LDADD) $(LIBS)
+ ${NCGEN} -o test0.nc -n test0.cdl
+ ./${PROG} test0.nc > test1.cdl @@ -491,11 +491,11 @@
+ ${NCGEN} -o test1.nc -n test1.cdl uninstall-man uninstall-man1
+ ./${PROG} -n test0 test1.nc > test2.cdl
+ @cmp test1.cdl test2.cdl && \
+ echo "*** ${PROG} test successful ***" ; \ -check: ncdump $(srcdir)/test0.cdl
+ rm test1.cdl test1.nc test2.cdl - ../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
+ - ./ncdump test0.nc > test1.cdl
+.include <bsd.prog.mk> - ../ncgen/ncgen -o test1.nc -n test1.cdl
- ./ncdump -n test0 test1.nc > test2.cdl
+check: hdfncdump $(srcdir)/test0.cdl
+ ../ncgen/hdfncgen -o test0.nc -n $(srcdir)/test0.cdl
+ ./hdfncdump test0.nc > test1.cdl
+ ../ncgen/hdfncgen -o test1.nc -n test1.cdl
+ ./hdfncdump -n test0 test1.nc > test2.cdl
@cmp test1.cdl test2.cdl && echo "*** ncdump test successful ***" ; \
rm -f test1.nc test1.cdl test2.cdl
# Tell versions [3.59,3.63) of GNU make to not export all variables.

69
devel/hdf/patches/patch-aj
View file

@ -1,40 +1,31 @@
$NetBSD: patch-aj,v 1.5 2002/05/03 23:14:52 jtb Exp $ $NetBSD: patch-aj,v 1.6 2004/04/20 18:14:37 drochner Exp $
--- /dev/null Wed May 1 14:04:01 2002 --- mfhdf/ncgen/Makefile.in.orig 2003-11-07 19:39:04.000000000 +0100
+++ mfhdf/ncgen/Makefile Wed May 1 14:11:52 2002 +++ mfhdf/ncgen/Makefile.in 2004-04-20 15:53:32.000000000 +0200
@@ -0,0 +1,35 @@ @@ -166,7 +166,7 @@
+PROG= ncgen
+PROGNAME= hdfncgen #############################################################################
+ #############################################################################
+MAN= hdfncgen.1 -man1_MANS = ncgen.1
+ +man1_MANS = hdfncgen.1
+SRCS= main.c generate.c load.c ncgentab.c escapes.c getfill.c init.c \
+ close.c genlib.c
+ #############################################################################
+BINDIR= ${PREFIX}/bin @@ -185,7 +185,7 @@
+LIBDIR= ${PREFIX}/lib mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+MANDIR= ${PREFIX}/man CONFIG_HEADER = $(top_builddir)/hdf/src/h4config.h
+ CONFIG_CLEAN_FILES =
+CPPFLAGS+= -Dunix -DNDEBUG -bin_PROGRAMS = ncgen$(EXEEXT)
+CPPFLAGS+= -I${.CURDIR}/../libsrc +bin_PROGRAMS = hdfncgen$(EXEEXT)
+CPPFLAGS+= -I${.CURDIR}/../../hdf/src PROGRAMS = $(bin_PROGRAMS)
+
+LDFLAGS+= -L${.CURDIR}/../libsrc am_ncgen_OBJECTS = close.$(OBJEXT) escapes.$(OBJEXT) generate.$(OBJEXT) \
+LDFLAGS+= -L${.CURDIR}/../../hdf/src @@ -246,7 +246,7 @@
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+LDADD+= -lmfhdf -ldf -ljpeg -lz -ncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES)
+ +hdfncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES)
+NOGCCERROR= 1 @rm -f ncgen$(EXEEXT)
+ $(LINK) $(ncgen_LDFLAGS) $(ncgen_OBJECTS) $(ncgen_LDADD) $(LIBS)
+ncgenyy.c: ncgen.l
+ ${LEX} ${LFLAGS} ncgen.l
+ mv lex.yy.c ncgenyy.c
+
+ncgentab.c: ncgenyy.c ncgen.y
+ ${YACC} ${YFLAGS} ncgen.y
+ mv y.tab.c ncgentab.c
+ touch ncgentab.h
+
+.include <bsd.prog.mk>

13
devel/hdf/patches/patch-ak
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ak,v 1.1.1.1 2001/02/28 22:18:41 jtb Exp $
--- mfhdf/libsrc/netcdf.h.in.orig
+++ mfhdf/libsrc/netcdf.h.in
@@ -61,7 +61,7 @@
*
* Implementation details are contained in the section below on fill values.
*/
-#define NC_OLD_FILLVALUES @OLD_FILLVALUES@
+#define NC_OLD_FILLVALUES 0
/*
* Fill values

66
devel/hdf/patches/patch-al
View file

@ -1,66 +0,0 @@
$NetBSD: patch-al,v 1.3 2002/05/03 23:14:52 jtb Exp $
--- /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 \
+ tvsfpack.c chunks.c tvattr.c buffer.c
+
+COBJS= ${CSRCS:.c=.o}
+
+FSRCS= fortest.c fortestF.f forsupff.f forsupf.c \
+ manf.f mgrf.f slabwf.f t24f.f tanf.f tanfilef.f tpf.f tr8f.f \
+ tsdmmsf.f tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \
+ tvsetf.f, tvattrf.f
+
+FOBJS= fortestF.o forsupff.o forsupf.o \
+ manf.o mgrf.o slabwf.o t24f.o tanf.o tanfilef.o tpf.o tr8f.o \
+ tsdmmsf.o tsdnmmsf.o tsdnntf.o tsdntf.o tsdstrf.o tstubsf.o \
+ tvsetf.o tvattrf.o
+
+CPPFLAGS+= -Dunix
+CPPFLAGS+= -I${.CURDIR}/../src
+
+LDFLAGS+= -L${.CURDIR}/../src
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib
+
+LDADD+= -ldf -ljpeg -lz -lm
+
+FTESTS = fortest fortestF
+
+all: testhdf ${FTESTS} gentest
+
+TESTF = fortest.o
+
+TESTDIR = testdir
+
+${FOBJS}: fortest.inc
+
+test: atest-hdf
+
+atest-hdf: testhdf ${FTESTS}
+ -rm -f *.hdf
+
+testhdf: ${COBJS}
+ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+ test -d ${TESTDIR} || mkdir ${TESTDIR}
+
+fortestF: ${FOBJS}
+ ${FC} ${FFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+
+fortest: fortest.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+
+gentest: gentest.o
+ ${CC} ${CPPFLAGS} ${CFLAGS} -o $@ $? ${LDFLAGS} ${LDADD}
+
+clean:
+ ${RM} testhdf ${COBJS} ${FOBJS} ${FTESTS} \
+ core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg ${TESTDIR}/* \
+ .depend
+
+depend:
+ mkdep ${CFLAGS} ${CSRCS}

31
devel/hdf/patches/patch-an
View file

@ -1,31 +0,0 @@
$NetBSD: patch-an,v 1.3 2002/05/03 23:14:53 jtb Exp $
--- /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 \
+ 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
+
+CPPFLAGS+= -Dunix -DNDEBUG
+CPPFLAGS+= -I${.CURDIR}/../../hdf/src
+CPPFLAGS+= -I${.CURDIR}/../libsrc
+
+LDFLAGS+= -L${.CURDIR}/../libsrc
+LDFLAGS+= -L${.CURDIR}/../../hdf/src
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.jpeg}/lib
+LDFLAGS+= -Wl,-R${BUILDLINK_PREFIX.zlib}/lib
+
+LDADD+= -lmfhdf -ldf -ljpeg -lz -lm
+
+NOMAN= 1
+
+test: $(PROG)
+ @ echo "==========================="
+ @ echo "netCDF C interface tests"
+ @ echo "==========================="
+ ./$(PROG)
+
+.include <bsd.prog.mk>

18
devel/hdf/patches/patch-ao
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ao,v 1.5 2001/04/19 00:56:34 jtb Exp $ $NetBSD: patch-ao,v 1.6 2004/04/20 18:14:37 drochner Exp $
--- hdf/src/hdfi.h.orig Tue Aug 22 20:26:57 2000 --- hdf/src/hdfi.h.orig 2003-11-01 01:17:14.000000000 +0100
+++ hdf/src/hdfi.h +++ hdf/src/hdfi.h 2004-04-20 17:02:01.000000000 +0200
@@ -151,6 +151,8 @@ @@ -153,6 +153,8 @@
* Define options for each platform * Define options for each platform
*-------------------------------------------------------------------------*/ *-------------------------------------------------------------------------*/
@ -11,11 +11,10 @@ $NetBSD: patch-ao,v 1.5 2001/04/19 00:56:34 jtb Exp $
/* /*
* Meaning of each defined macros (not completed yet) * Meaning of each defined macros (not completed yet)
* *
@@ -1253,6 +1255,71 @@ @@ -1384,6 +1386,71 @@
#endif
#endif /* IA64 */ #endif /* IA64 */
+
+#endif /* ! NetBSD */ +#endif /* ! NetBSD */
+ +
+#ifdef __NetBSD__ +#ifdef __NetBSD__
@ -53,7 +52,7 @@ $NetBSD: patch-ao,v 1.5 2001/04/19 00:56:34 jtb Exp $
+typedef int intf; /* size of INTEGERs in Fortran compiler */ +typedef int intf; /* size of INTEGERs in Fortran compiler */
+typedef float float32; +typedef float float32;
+typedef double float64; +typedef double float64;
+#if defined(__alpha__) || defined(__sparc64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__)
+typedef long hdf_pint_t; /* an integer the same size as a pointer */ +typedef long hdf_pint_t; /* an integer the same size as a pointer */
+#else +#else
+typedef int hdf_pint_t; /* an integer the same size as a pointer */ +typedef int hdf_pint_t; /* an integer the same size as a pointer */
@ -80,6 +79,7 @@ $NetBSD: patch-ao,v 1.5 2001/04/19 00:56:34 jtb Exp $
+ +
+#endif /* NetBSD */ +#endif /* NetBSD */
+ +
+
#ifndef GOT_MACHINE #ifndef GOT_MACHINE
No machine type has been defined. Your Makefile needs to have someing like No machine type has been defined. Your Makefile needs to have someing like
-DSUN or -DUNICOS in order for the HDF internal structures to be defined

8
devel/hdf/patches/patch-ap
View file

@ -1,12 +1,12 @@
$NetBSD: patch-ap,v 1.1 2001/03/25 01:09:52 jtb Exp $ $NetBSD: patch-ap,v 1.2 2004/04/20 18:14:37 drochner Exp $
--- hdf/src/hconv.h.orig Sat Mar 24 20:43:34 2001 --- hdf/src/hconv.h.orig 2003-11-01 01:17:13.000000000 +0100
+++ hdf/src/hconv.h +++ hdf/src/hconv.h 2004-04-20 14:29:46.000000000 +0200
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
/* CONSTANT DEFINITIONS */ /* CONSTANT DEFINITIONS */
/*****************************************************************************/ /*****************************************************************************/
/* Generally Big-Endian machines */ /* Generally Big-Endian machines */
-#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !defined(IA64) -#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !defined(__ia64) && !defined(__x86_64__)
+#if BYTE_ORDER == BIG_ENDIAN +#if BYTE_ORDER == BIG_ENDIAN
# if !defined(UNICOS) # if !defined(UNICOS)
# define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */ # define UI8_IN DFKnb1b /* Unsigned Integer, 8 bits */

16
devel/hdf/patches/patch-aq
View file

@ -1,16 +0,0 @@
$NetBSD: patch-aq,v 1.2 2001/04/19 00:56:34 jtb Exp $
--- 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

18
devel/hdf/patches/patch-at
View file

@ -1,18 +0,0 @@
$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
@@ -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

12
devel/hdf/patches/patch-ba Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-ba,v 1.1 2004/04/20 18:14:37 drochner Exp $
--- configure.orig 2004-04-20 14:41:07.000000000 +0200
+++ configure 2004-04-20 14:41:38.000000000 +0200
@@ -7512,6 +7512,7 @@
mips*-sgi-irix4*) BAR="irix4" ;;
*-linux*) BAR="linux" ;;
*-freebsd*) BAR="fbsd" ;;
+ *-netbsd*) BAR="fbsd" ;;
ia64-*-*) BAR="ia64" ;;
*-ibm-aix*) BAR="aix" ;;
i386-*-solaris2*) BAR="solarisx86" ;;