From owner-freebsd-ports Thu Nov 4 18:50:27 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 62F2F1584E for ; Thu, 4 Nov 1999 18:50:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id SAA87904; Thu, 4 Nov 1999 18:50:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from misha.cisco.com (misha.cisco.com [171.69.206.50]) by hub.freebsd.org (Postfix) with ESMTP id 2DAEC157FA for ; Thu, 4 Nov 1999 18:42:16 -0800 (PST) (envelope-from mi@misha.cisco.com) Received: (from mi@localhost) by misha.cisco.com (8.9.3/8.9.1) id VAA15933; Thu, 4 Nov 1999 21:39:58 -0500 (EST) (envelope-from mi) Message-Id: <199911050239.VAA15933@misha.cisco.com> Date: Thu, 4 Nov 1999 21:39:58 -0500 (EST) From: Mikhail Teterin Reply-To: mi@aldan.algebra.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/14717: graphics/hdf port upgraded Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14717 >Category: ports >Synopsis: graphics/hdf port upgraded >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 4 18:50:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Mikhail Teterin >Release: FreeBSD 3.3-STABLE i386 >Organization: Virtual Estates, Inc. >Environment: >Description: The new release of HDF was available since May... They also have HDF5, now which may be a different animal. The new release is 4.1r3, and the software did not change much, but the port did. The old port had many hacks to avoid building new jpeg and zlib, etc. It was also building static libs only. The new one puts its own set of Makefiles into the relevant directories, to build staff "The BSD way" (hopefully). >How-To-Repeat: >Fix: The new port is quite different, so I take the risk of including both, the shar (of the new port) and the diffs. The shar is, actually, a lot smaller. # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # ./Makefile # ./files/hdf/src/Makefile # ./files/hdf/test/Makefile # ./files/hdf/util/Makefile # ./files/hdf/Makefile # ./files/man/Makefile # ./files/mfhdf/fortran/Makefile # ./files/mfhdf/libsrc/Makefile # ./files/mfhdf/ncdump/Makefile # ./files/mfhdf/ncgen/Makefile # ./files/mfhdf/nctest/Makefile # ./files/mfhdf/Makefile # ./files/mfhdf/dumper/Makefile # ./files/Makefile # ./files/md5 # ./pkg/COMMENT # ./pkg/DESCR # ./pkg/PLIST # echo x - ./Makefile sed 's/^X//' >./Makefile << 'END-of-./Makefile' X# New ports collection makefile for: HDF_lib X# Version required: 4.1r2 X# Date created: 17 November 1996 X# Whom: mi X# X# $FreeBSD: ports/graphics/hdf/Makefile,v 1.13 1999/08/28 01:57:15 mharo Exp $ X# X XDISTNAME= HDF4.1r3 XPKGNAME= hdf-4.1r3 XCATEGORIES= graphics XMASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/ X XMAINTAINER= mi@aldan.algebra.com X XLIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg X XMAN1= hdf.1 hdfunpac.1 ncdump.1 ncgen.1 XMAN3= gr_chunk.3 XMANCOMPRESSED= maybe X XMAKE_ARGS= PREFIX="${PREFIX}" -j 2 X Xpost-patch: X ${RM} -rf ${WRKSRC}/hdf/jpeg X ${RM} -rf ${WRKSRC}/hdf/zlib X Xdo-configure: X ${CP} -rp ${FILESDIR}/Makefile ${FILESDIR}/hdf \ X ${FILESDIR}/mfhdf ${FILESDIR}/man ${WRKSRC} X ${LN} -s config/netcdf-fbsd.h ${WRKSRC}/mfhdf/libsrc/netcdf.h X ${LN} -s netcdf-fbsd.inc ${WRKSRC}/mfhdf/fortran/config/netcdf.inc X Xtest: build X cd ${WRKSRC}; ${MAKE} test X X.include END-of-./Makefile echo x - ./files/hdf/src/Makefile sed 's/^X//' >./files/hdf/src/Makefile << 'END-of-./files/hdf/src/Makefile' XLIB=df X X# uncomment the line below to avoid building static libraries X#INTERNALLIB=YES XLIBDIR=${PREFIX}/lib X XSHLIB_MAJOR=1 XSHLIB_MINOR=0 X XSRCS=atom.c bitvect.c cdeflate.c cnbit.c cnone.c crle.c cskphuff.c \ X df24.c df24f.c dfan.c dfanf.c dfcomp.c dfconv.c dff.c dfgr.c \ X dfgroup.c dfimcomp.c dfjpeg.c dfkconv.c dfkcray.c dfkfuji.c \ X dfknat.c dfkswap.c dfkvms.c dfp.c dfpf.c dfr8.c dfr8f.c dfrle.c \ X dfsd.c dfsdf.c dfstubs.c dfufp2i.c dfunjpeg.c dfutil.c dfutilf.c \ X dir_mac.c dynarray.c glist.c hbitio.c hblocks.c hbuffer.c \ X hchunks.c hcomp.c hcompri.c hdfalloc.c herr.c herrf.c hextelt.c \ X hfile.c hfiledd.c hfilef.c hkit.c linklist.c mcache.c \ X mfan.c mfanf.c mfgr.c mfgrf.c mstdio.c tbbt.c vattr.c vattrf.c \ X vconv.c vg.c vgf.c vgp.c vhi.c vio.c vparse.c vrw.c vsfld.c \ X df24ff.f dfanff.f dfff.f dfpff.f dfr8ff.f dfsdff.f dfufp2if.f \ X hfileff.f mfgrff.f vattrff.f vgff.f X XCFLAGS += -I${PREFIX}/include XFFLAGS += ${CFLAGS} XLDADD += -L${PREFIX}/lib -ljpeg -lf2c -lz X X Xafterinstall: X install -c -o root -g wheel -m 444 \ X atom.h bitvect.h cdeflate.h cnbit.h cnone.h crle.h \ X cskphuff.h df.h dfan.h dfconvrt.h dfgr.h dfi.h dfivms.h \ X dfrig.h dfsd.h dfstubs.h dfufp2i.h dir_mac.h dynarray.h \ X glist.h hbitio.h hchunks.h hcomp.h hcompi.h hconv.h \ X hdf.h hdfi.h herr.h hfile.h hkit.h hlimits.h hntdefs.h \ X hproto.h hqueue.h htags.h linklist.h maldebug.h mcache.h \ X mfan.h mfgr.h mstdio.h patchlevel.h sys_dir_mac.h tbbt.h \ X trace.h vattr.h vg.h vgint.h hdf.inc dffunc.inc \ X ${PREFIX}/include X X.include END-of-./files/hdf/src/Makefile echo x - ./files/hdf/test/Makefile sed 's/^X//' >./files/hdf/test/Makefile << 'END-of-./files/hdf/test/Makefile' XCSRCS= rig.c sdstr.c blocks.c an.c anfile.c extelt.c file.c file1.c vers.c \ X sdmms.c sdnmms.c slab.c litend.c tvset.c comp.c bitio.c tree.c macros.c \ X conv.c nbit.c man.c mgr.c testhdf.c tbv.c tvsfpack.c chunks.c tvattr.c \ X buffer.c X XCOBJS= ${CSRCS:S/.c/.o/g} X XFSRCS= fortest.c fortestF.f forsupff.f forsupf.c \ X manf.f mgrf.f slabwf.f t24f.f tanf.f tanfilef.f tpf.f tr8f.f \ X tsdmmsf.f tsdnmmsf.f tsdnntf.f tsdntf.f tsdstrf.f tstubsf.f \ X tvsetf.f, tvattrf.f X XFOBJS = fortestF.o forsupff.o forsupf.o \ X manf.o mgrf.o slabwf.o t24f.o tanf.o tanfilef.o tpf.o tr8f.o \ X tsdmmsf.o tsdnmmsf.o tsdnntf.o tsdntf.o tsdstrf.o tstubsf.o \ X tvsetf.o tvattrf.o X X#CFORSUPSRCS = forsupf.c X XHDFLIB = ${.CURDIR}/../src XCFLAGS += -I${HDFLIB} XFFLAGS += ${CFLAGS} -Nn802 -Nx400 X XFTESTS = fortest fortestF X Xall: testhdf $(FTESTS) gentest X X#CFORSUPOBJS = forsupf.o X XTESTF = fortest.o X X# directory used by extelt test. XTESTDIR = testdir X X$(FOBJS): fortest.inc X Xtest: atest-hdf X Xatest-hdf: testhdf $(FTESTS) X -rm -f *.hdf X env LD_LIBRARY_PATH=${.CURDIR}/../src ./testhdf X -rm -f *.hdf X env LD_LIBRARY_PATH=${.CURDIR}/../src ./fortest X Xtesthdf: $(COBJS) $(HDFLIB)/libdf.so X $(CC) -o testhdf $(COBJS) $(HDFLIB)/libdf.so -lm X test -d $(TESTDIR) || mkdir $(TESTDIR) X XfortestF: $(FOBJS) $(HDFLIB)/libdf.so X $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.so -lm X Xfortest: $(HDFLIB)/libdf.so fortest.c $(CHDRS) X $(CC) $(CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.so -lm X Xgentest: gentest.c $(HDFLIB)/libdf.so X $(CC) $(CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.so -lm X Xclean: X -rm -f $(COBJS) testhdf $(FOBJS) $(FTESTS) \ X core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg $(TESTDIR)/* \ X .depend X Xdepend: X mkdep ${CFLAGS} ${CSRCS} X Xinstall: END-of-./files/hdf/test/Makefile echo x - ./files/hdf/util/Makefile sed 's/^X//' >./files/hdf/util/Makefile << 'END-of-./files/hdf/util/Makefile' XUTILS = hdf24to8 hdfcomp hdfls hdfpack hdftopal hdftor8 paltohdf \ X r8tohdf ristosds vmake vshow hdf8to24 hdf2jpeg jpeg2hdf fp2hdf \ X hdfunpac vcompat X Xall: ${UTILS} hdfed X XHEOBJ = he_main.o he_cntrl.o he_disp.o he_file.o X X#CFLAGS += -I${PREFIX}/include -I${.CURDIR}/../src/ XCFLAGS += -I${.CURDIR}/../src/ X#LDFLAGS += -L${PREFIX}/lib -ljpeg -L${.CURDIR}/../src/ -ldf -lz XLDFLAGS += -L${.CURDIR}/../src/ -ldf X Xhdfed: he.h he_proto.h $(HEOBJ) X $(CC) $(HEOBJ) $(LDFLAGS) -o hdfed X Xtest: all fptest X env LD_LIBRARY_PATH=${.CURDIR}/../src ./testutil.sh X Xclean: X -rm -f *.o $(UTILS) hdfed fptest X -rm -f o* ctx* cb* fptestf .depend X Xdepend: X mkdep ${CFLAGS} ${UTILS:S/$/.c/g} ${HEOBJ:S/.o/.c/g} X Xinstall: all X install -c -s -o root -g wheel -m 555 ${UTILS} hdfed ${BINDIR} END-of-./files/hdf/util/Makefile echo x - ./files/hdf/Makefile sed 's/^X//' >./files/hdf/Makefile << 'END-of-./files/hdf/Makefile' XSUBDIR = src util test X Xhdf-test: all X cd util && ${MAKE} test X cd test && ${MAKE} test X X.include END-of-./files/hdf/Makefile echo x - ./files/man/Makefile sed 's/^X//' >./files/man/Makefile << 'END-of-./files/man/Makefile' XMANDIR = ${PREFIX}/man/man X XMAN1 = hdf.1 hdfunpac.1 XMAN3 = gr_chunk.3 X X.include X Xinstall: all-man maninstall X Xclean: X -rm -f *.gz X Xall: all-man X Xdepend: END-of-./files/man/Makefile echo x - ./files/mfhdf/fortran/Makefile sed 's/^X//' >./files/mfhdf/fortran/Makefile << 'END-of-./files/mfhdf/fortran/Makefile' X.PATH: ${.CURDIR} ${.CURDIR}/config X Xall: X XNOMAN = 1 X XFFLAGS += ${CFLAGS} -DNDEBUG -Nn802 -Nx400 X XLDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf X Xafterinstall: X install -c -o root -g wheel -m 444 config/netcdf-fbsd.inc \ X ${PREFIX}/include/netcdf.inc X X.include X XENVIR = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src X XCLEANFILES+= hdftest hdftest.o ftest ftest-fbsd.o X Xconfig/netcdf.inc: X ln -s netcdf-fbsd.inc config/netcdf.inc X Xftest: ftest-fbsd.f config/netcdf.inc X ${MAKE} PROG=$@ SRCS=ftest-fbsd.f $@ X Xhdftest: hdftest.f X ${MAKE} PROG=$@ SRCS=hdftest.f $@ X Xtest: ftest hdftest X mkdir -p testdir X # ================================ X # netCDF Fortran interface tests X # ================================ X ${ENVIR} ./ftest X ${ENVIR} ./hdftest > hdfout.new X @diff -Bb hdfout.new hdftst.sav && \ X echo "*** HDF-SD Fortran interface tests passed ***" || \ X (echo "*** HDF-SD Fortran interface tests failed ***"; \ X echo "The above differences are OK if small") END-of-./files/mfhdf/fortran/Makefile echo x - ./files/mfhdf/libsrc/Makefile sed 's/^X//' >./files/mfhdf/libsrc/Makefile << 'END-of-./files/mfhdf/libsrc/Makefile' X.PATH: ${.CURDIR} ${.CURDIR}/../fortran/config ${.CURDIR}/../fortran X XSRCS = array.c attr.c cdf.c dim.c file.c iarray.c error.c \ X globdef.c putget.c putgetg.c sharray.c string.c var.c \ X hdfsds.c mfsd.c nssdc.c xdrposix.c \ X jackets-fbsd.c mfsdf.c mfsdff.f X XLIB = mfhdf XSHLIB_MAJOR = 2 XSHLIB_MINOR = 3 X XLIBDIR = ${PREFIX}/lib X X# uncomment the line below to avoid building static libraries X#INTERNALLIB = Yes X XCFLAGS += -DNDEBUG -DHDF -I${.CURDIR}/../../hdf/src -I${.CURDIR} X.if ${MACHINE_ARCH} == "i386" XCFLAGS += -DSWAP X.endif X XLDADD += -L${.CURDIR}/../../hdf/src -ldf XLDFLAGS += -L. -l${LIB} ${LDADD} X Xafterinstall: X install -c -o root -g wheel -m 444 hdf2netcdf.h local_nc.h \ X mfhdf.h netcdf.h ${PREFIX}/include X X.include X Xtest: ${SHLIB_NAME} cdftest hdftest X env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./cdftest > cdfout.new X @diff cdfout.new testout.sav && \ X echo "*** netCDF passes formatted test ***" || \ X (echo "*** netCDF fails formatted test ***" ; \ X echo "The above differences are OK if small") X env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./hdftest > hdfout.new X @diff hdfout.new hdfout.sav && \ X echo "*** HDF passes formatted test ***" || \ X (echo "*** HDF fails formatted test ***" ; \ X echo "The above differences are OK if small") END-of-./files/mfhdf/libsrc/Makefile echo x - ./files/mfhdf/ncdump/Makefile sed 's/^X//' >./files/mfhdf/ncdump/Makefile << 'END-of-./files/mfhdf/ncdump/Makefile' XPROG = ncdump XMANDIR = ${PREFIX}/man/man X XLDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf XCFLAGS += -I${.CURDIR}/../libsrc XSRCS = ncdump.c vardata.c dumplib.c X X.include X XENVIR = env LD_LIBRARY_PATH=${.CURDIR}/../../hdf/src:${.CURDIR}/../libsrc XNCGEN = ${.CURDIR}/../ncgen/ncgen X Xtest: $(PROG) test0.cdl X ${ENVIR} $(NCGEN) -o test0.nc -n test0.cdl X ${ENVIR} ./$(PROG) test0.nc > test1.cdl X ${ENVIR} $(NCGEN) -o test1.nc -n test1.cdl X ${ENVIR} ./$(PROG) -n test0 test1.nc > test2.cdl X @cmp test1.cdl test2.cdl && \ X echo "*** $(PROGRAM) test successful ***" ; \ X rm test1.cdl test1.nc test2.cdl END-of-./files/mfhdf/ncdump/Makefile echo x - ./files/mfhdf/ncgen/Makefile sed 's/^X//' >./files/mfhdf/ncgen/Makefile << 'END-of-./files/mfhdf/ncgen/Makefile' XPROG = ncgen XMANDIR = ${PREFIX}/man/man XLDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf XCFLAGS += -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src -DNDEBUG XSRCS = main.c generate.c load.c ncgentab.c escapes.c \ X getfill.c init.c close.c genlib.c X XENVIR = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src XNCDUMP = ${.CURDIR}/../ncdump/ncdump X Xtest: $(PROG) test0.cdl btest ctest ftest X Xncgenyy.c: ncgen.l X ${LEX} ${LFLAGS} ncgen.l X mv lex.yy.c ncgenyy.c X Xncgentab.c: ncgenyy.c ncgen.y X ${YACC} ${YFLAGS} ncgen.y X mv y.tab.c ncgentab.c X mv y.tab.h ncgentab.h X X.include X X# X# test "-b" option of ncgen X# Xbtest: $(PROG) test0.cdl test1.cdl X ${ENVIR} ./$(PROG) -b test1.cdl X ${ENVIR} $(NCDUMP) test1.nc > test2.cdl X @diff test1.cdl test2.cdl && \ X echo "*** $(PROG) -b test successful ***" X X# X# test "-c" option of ncgen X# Xctest: test1.cdl ctest0 X ${ENVIR} ./ctest0 # tests `-c' option, creates ctest0.nc X ${ENVIR} $(NCDUMP) -n test1 ctest0.nc > ctest1.cdl X @diff test1.cdl ctest1.cdl && \ X echo "*** $(PROG) -c test successful ***" X Xctest0: ncgen test0.cdl X ${ENVIR} ./$(PROG) -c -o ctest0.nc test0.cdl > test0.c X $(CC) $(CFLAGS) -o $@ test0.c ${LDFLAGS} X X# X# test "-f" option of ncgen X# Xftest: test1.cdl ftest0 X ${ENVIR} ./ftest0 X ${ENVIR} $(NCDUMP) -n test1 ftest0.nc > ftest1.cdl X @if diff test1.cdl ftest1.cdl; then \ X echo "*** ncgen -f test successful ***"; \ X else \ X echo "*** ncgen -f test failed " \ X "(but roundoff differences are OK) ***"; \ X fi X Xftest0: $(PROG) test0.cdl netcdf.inc X ${ENVIR} ./$(PROG) -f -o ftest0.nc test0.cdl > test0.f; \ X $(FC) $(FFLAGS) ${CFLAGS} -o $@ test0.f ${LDFLAGS} X Xtest1.cdl: test0.nc X ${ENVIR} $(NCDUMP) -n test1 test0.nc > $@ X Xtest0.nc: $(PROG) test0.cdl X ${ENVIR} ./$(PROG) -b -o test0.nc test0.cdl X Xnetcdf.inc: X ln -s ../fortran/config/netcdf-fbsd.inc $@ END-of-./files/mfhdf/ncgen/Makefile echo x - ./files/mfhdf/nctest/Makefile sed 's/^X//' >./files/mfhdf/nctest/Makefile << 'END-of-./files/mfhdf/nctest/Makefile' XPROG = nctest XNOMAN = 1 XCFLAGS += -I${.CURDIR}/../libsrc XLDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf XSRCS = varget.c vargetg.c varput.c varputg.c vardef.c vartests.c \ X vputget.c vputgetg.c driver.c cdftests.c dimtests.c rec.c \ X atttests.c misctest.c add.c error.c emalloc.c val.c slabs.c X Xinstall: X X.include X Xtest: $(PROG) X @ echo "===========================" X @ echo "netCDF C interface tests" X @ echo "===========================" X env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src ./$(PROG) END-of-./files/mfhdf/nctest/Makefile echo x - ./files/mfhdf/Makefile sed 's/^X//' >./files/mfhdf/Makefile << 'END-of-./files/mfhdf/Makefile' XSUBDIR = fortran libsrc ncgen ncdump nctest dumper X X.include X Xtest: all X @for d in ${SUBDIR} ; do \ X echo "===> testing in $$d"; \ X cd $$d; \ X ${MAKE} test; \ X cd ..; \ X done END-of-./files/mfhdf/Makefile echo x - ./files/mfhdf/dumper/Makefile sed 's/^X//' >./files/mfhdf/dumper/Makefile << 'END-of-./files/mfhdf/dumper/Makefile' XPROG = hdp XNOMAN = 1 XLDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf XCFLAGS += -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src X XSRCS = 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 X X.include X Xtest: ${PROG} X env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src sh testhdp.sh END-of-./files/mfhdf/dumper/Makefile echo x - ./files/Makefile sed 's/^X//' >./files/Makefile << 'END-of-./files/Makefile' XSUBDIR = hdf mfhdf man X#PREFIX ?= /usr/local XLIBDIR ?= ${PREFIX}/lib XBINDIR ?= ${PREFIX}/bin X X.MAKEFLAGS: PREFIX=${PREFIX} LIBDIR=${LIBDIR} BINDIR=${BINDIR} X Xtest: all X # testing in hdf X @cd hdf && ${MAKE} hdf-test X # testing in mfhdf X @cd mfhdf && ${MAKE} test X X.include END-of-./files/Makefile echo x - ./files/md5 sed 's/^X//' >./files/md5 << 'END-of-./files/md5' XMD5 (HDF4.1r3.tar.gz) = 975f84ad8c5910841995c9d339fbd8bb END-of-./files/md5 echo x - ./pkg/COMMENT sed 's/^X//' >./pkg/COMMENT << 'END-of-./pkg/COMMENT' XHierarchical Data Format library (from NCSA) END-of-./pkg/COMMENT echo x - ./pkg/DESCR sed 's/^X//' >./pkg/DESCR << 'END-of-./pkg/DESCR' XFrom HDF's manpage: X X hdf - Hierarchical Data Format library X XDescription: X HDF is a multi-object file format that facilitates the X transfer of various types of scientific data between X machines and operating systems. Machines currently sup- X ported include the Cray, Convex, HP, Vax, Sun, IBM X RS/6000, Silicon Graphics, Macintosh, and IBM PC comput- X ers. HDF allows self-definitions of data content and easy X extensibility for future enhancements or compatibility X with other standard formats. HDF includes Fortran and C X calling interfaces,and utilities to prepare raw image of X data files or for use with other NCSA software. The HDF X library contains interfaces for storing and retrieving X compressed or uncompressed 8-bit and 24-bit raster images X with palettes, n-Dimensional scientific datasets and X binary tables. An interface is also included that allows X arbitray grouping of other HDF objects. X X X -mi (mi@aldan.ziplink.net) END-of-./pkg/DESCR echo x - ./pkg/PLIST sed 's/^X//' >./pkg/PLIST << 'END-of-./pkg/PLIST' Xbin/fp2hdf Xbin/hdf24to8 Xbin/hdf2jpeg Xbin/hdf8to24 Xbin/hdfcomp Xbin/hdfed Xbin/hdfls Xbin/hdfpack Xbin/hdftopal Xbin/hdftor8 Xbin/hdfunpac Xbin/hdp Xbin/jpeg2hdf Xbin/ncdump Xbin/ncgen Xbin/paltohdf Xbin/r8tohdf Xbin/ristosds Xbin/vcompat Xbin/vmake Xbin/vshow Xlib/libmfhdf.a Xlib/libmfhdf.so.2 Xlib/libmfhdf.so Xlib/libdf.a Xlib/libdf.so Xlib/libdf.so.1 Xinclude/atom.h Xinclude/bitvect.h Xinclude/cdeflate.h Xinclude/cnbit.h Xinclude/cnone.h Xinclude/crle.h Xinclude/cskphuff.h Xinclude/df.h Xinclude/dfan.h Xinclude/dffunc.inc Xinclude/dfgr.h Xinclude/dfi.h Xinclude/dfrig.h Xinclude/dfsd.h Xinclude/dfstubs.h Xinclude/dfufp2i.h Xinclude/dynarray.h Xinclude/hbitio.h Xinclude/hchunks.h Xinclude/hcomp.h Xinclude/hcompi.h Xinclude/hconv.h Xinclude/hdf.h Xinclude/hdf.inc Xinclude/hdf2netcdf.h Xinclude/hdfi.h Xinclude/herr.h Xinclude/hfile.h Xinclude/hkit.h Xinclude/hlimits.h Xinclude/hntdefs.h Xinclude/hproto.h Xinclude/htags.h Xinclude/linklist.h Xinclude/local_nc.h Xinclude/mfan.h Xinclude/mfgr.h Xinclude/mfhdf.h Xinclude/mstdio.h Xinclude/netcdf.h Xinclude/netcdf.inc Xinclude/tbbt.h Xinclude/vattr.h Xinclude/vg.h END-of-./pkg/PLIST exit diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/Makefile ./Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/Makefile Wed Oct 27 03:12:24 1999 +++ ./Makefile Thu Nov 4 21:26:07 1999 @@ -3,66 +3,35 @@ # Date created: 17 November 1996 # Whom: mi # -# $FreeBSD: ports/graphics/hdf/Makefile,v 1.14 1999/10/26 21:18:37 fenner Exp $ +# $FreeBSD: ports/graphics/hdf/Makefile,v 1.13 1999/08/28 01:57:15 mharo Exp $ # -DISTNAME= HDF4.1r2 -PKGNAME= hdf-4.1r2 +DISTNAME= HDF4.1r3 +PKGNAME= hdf-4.1r3 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF4.1r2/tar/ +MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/ MAINTAINER= mi@aldan.algebra.com LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg MAN1= hdf.1 hdfunpac.1 ncdump.1 ncgen.1 +MAN3= gr_chunk.3 +MANCOMPRESSED= maybe -GNU_CONFIGURE= yes -FC?= f77 # Can also be g77 for the newer one -MAKE_FLAGS= CC="$(CC)" FC="${FC}" -f -MAKE_ENV= pwrkdir=${WRKDIR} -#"wrkdir" doesn't work for some reason in the above - -# This will create dummy Makefiles and some links in the jpeg and libz -# subdirectories. This way, we do not need to hunt all the dependencies -# out. Shame on the lib's developers, though, this can not be done through -# `configure'. -mi -pre-build: - ${AR} -r ${WRKDIR}/libz.a /dev/null - ${RANLIB} ${WRKDIR}/libz.a - test -d ${WRKSRC}/hdf/jpeg.came-with-HDF || \ - ${MV} -f ${WRKSRC}/hdf/jpeg ${WRKSRC}/hdf/jpeg.came-with-HDF - -${MKDIR} ${WRKSRC}/hdf/jpeg - ${RM} -f ${WRKSRC}/hdf/jpeg/Makefile - ${ECHO} #Phony makefile > ${WRKSRC}/hdf/jpeg/Makefile - ${ECHO} >> ${WRKSRC}/hdf/jpeg/Makefile - ${ECHO} libjpeg.a: >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\t@${ECHO} Using the already installed JPEG library\n' \ - >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile - printf '\ninstall:\n\ttrue\n' >> ${WRKSRC}/hdf/jpeg/Makefile - -${LN} -s ${PREFIX}/lib/libjpeg* ${WRKSRC}/hdf/jpeg/ - -${LN} -s ${PREFIX}/include/j*.h ${WRKSRC}/hdf/jpeg/ - test -d ${WRKSRC}/hdf/zlib.came-with-HDF || \ - ${MV} -f ${WRKSRC}/hdf/zlib ${WRKSRC}/hdf/zlib.came-with-HDF - -${MKDIR} ${WRKSRC}/hdf/zlib - ${RM} -f ${WRKSRC}/hdf/zlib/Makefile - ${ECHO} #Phony makefile > ${WRKSRC}/hdf/zlib/Makefile - ${ECHO} >> ${WRKSRC}/hdf/zlib/Makefile - ${ECHO} libzlib.a: >> ${WRKSRC}/hdf/zlib/Makefile - printf '\t@${ECHO} Using the already installed ZLIB library\n' \ - >> ${WRKSRC}/hdf/zlib/Makefile - printf '\nclean:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile - printf '\ninstall-lib:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile - printf '\ninstall:\n\ttrue\n' >> ${WRKSRC}/hdf/zlib/Makefile - -${LN} -s /usr/lib/${BINFORMAT}/libz* ${WRKSRC}/hdf/zlib/ - -${LN} -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/ +MAKE_ARGS= PREFIX="${PREFIX}" -j 2 -post-install: - @for binary in `${GREP} ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done +post-patch: + ${RM} -rf ${WRKSRC}/hdf/jpeg + ${RM} -rf ${WRKSRC}/hdf/zlib + +do-configure: + ${CP} -rp ${FILESDIR}/Makefile ${FILESDIR}/hdf \ + ${FILESDIR}/mfhdf ${FILESDIR}/man ${WRKSRC} + ${LN} -s config/netcdf-fbsd.h ${WRKSRC}/mfhdf/libsrc/netcdf.h + ${LN} -s netcdf-fbsd.inc ${WRKSRC}/mfhdf/fortran/config/netcdf.inc -test: - cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test +test: build + cd ${WRKSRC}; ${MAKE} test .include diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/Makefile ./files/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/Makefile Thu Nov 4 19:30:28 1999 @@ -0,0 +1,14 @@ +SUBDIR = hdf mfhdf man +#PREFIX ?= /usr/local +LIBDIR ?= ${PREFIX}/lib +BINDIR ?= ${PREFIX}/bin + +.MAKEFLAGS: PREFIX=${PREFIX} LIBDIR=${LIBDIR} BINDIR=${BINDIR} + +test: all + # testing in hdf + @cd hdf && ${MAKE} hdf-test + # testing in mfhdf + @cd mfhdf && ${MAKE} test + +.include diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/Makefile ./files/hdf/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/hdf/Makefile Thu Nov 4 12:58:13 1999 @@ -0,0 +1,7 @@ +SUBDIR = src util test + +hdf-test: all + cd util && ${MAKE} test + cd test && ${MAKE} test + +.include diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/src/Makefile ./files/hdf/src/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/src/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/hdf/src/Makefile Thu Nov 4 19:27:43 1999 @@ -0,0 +1,40 @@ +LIB=df + +# uncomment the line below to avoid building static libraries +#INTERNALLIB=YES +LIBDIR=${PREFIX}/lib + +SHLIB_MAJOR=1 +SHLIB_MINOR=0 + +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 + +CFLAGS += -I${PREFIX}/include +FFLAGS += ${CFLAGS} +LDADD += -L${PREFIX}/lib -ljpeg -lf2c -lz + + +afterinstall: + install -c -o root -g wheel -m 444 \ + atom.h bitvect.h cdeflate.h cnbit.h cnone.h crle.h \ + cskphuff.h df.h dfan.h dfconvrt.h 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 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 sys_dir_mac.h tbbt.h \ + trace.h vattr.h vg.h vgint.h hdf.inc dffunc.inc \ + ${PREFIX}/include + +.include diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/test/Makefile ./files/hdf/test/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/test/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/hdf/test/Makefile Thu Nov 4 19:37:35 1999 @@ -0,0 +1,66 @@ +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:S/.c/.o/g} + +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 + +#CFORSUPSRCS = forsupf.c + +HDFLIB = ${.CURDIR}/../src +CFLAGS += -I${HDFLIB} +FFLAGS += ${CFLAGS} -Nn802 -Nx400 + +FTESTS = fortest fortestF + +all: testhdf $(FTESTS) gentest + +#CFORSUPOBJS = forsupf.o + +TESTF = fortest.o + +# directory used by extelt test. +TESTDIR = testdir + +$(FOBJS): fortest.inc + +test: atest-hdf + +atest-hdf: testhdf $(FTESTS) + -rm -f *.hdf + env LD_LIBRARY_PATH=${.CURDIR}/../src ./testhdf + -rm -f *.hdf + env LD_LIBRARY_PATH=${.CURDIR}/../src ./fortest + +testhdf: $(COBJS) $(HDFLIB)/libdf.so + $(CC) -o testhdf $(COBJS) $(HDFLIB)/libdf.so -lm + test -d $(TESTDIR) || mkdir $(TESTDIR) + +fortestF: $(FOBJS) $(HDFLIB)/libdf.so + $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.so -lm + +fortest: $(HDFLIB)/libdf.so fortest.c $(CHDRS) + $(CC) $(CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.so -lm + +gentest: gentest.c $(HDFLIB)/libdf.so + $(CC) $(CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.so -lm + +clean: + -rm -f $(COBJS) testhdf $(FOBJS) $(FTESTS) \ + core *.hdf ptesthdf qtesthdf gentest *.o fortest.arg $(TESTDIR)/* \ + .depend + +depend: + mkdep ${CFLAGS} ${CSRCS} + +install: diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/util/Makefile ./files/hdf/util/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/hdf/util/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/hdf/util/Makefile Thu Nov 4 19:27:05 1999 @@ -0,0 +1,28 @@ +UTILS = hdf24to8 hdfcomp hdfls hdfpack hdftopal hdftor8 paltohdf \ + r8tohdf ristosds vmake vshow hdf8to24 hdf2jpeg jpeg2hdf fp2hdf \ + hdfunpac vcompat + +all: ${UTILS} hdfed + +HEOBJ = he_main.o he_cntrl.o he_disp.o he_file.o + +#CFLAGS += -I${PREFIX}/include -I${.CURDIR}/../src/ +CFLAGS += -I${.CURDIR}/../src/ +#LDFLAGS += -L${PREFIX}/lib -ljpeg -L${.CURDIR}/../src/ -ldf -lz +LDFLAGS += -L${.CURDIR}/../src/ -ldf + +hdfed: he.h he_proto.h $(HEOBJ) + $(CC) $(HEOBJ) $(LDFLAGS) -o hdfed + +test: all fptest + env LD_LIBRARY_PATH=${.CURDIR}/../src ./testutil.sh + +clean: + -rm -f *.o $(UTILS) hdfed fptest + -rm -f o* ctx* cb* fptestf .depend + +depend: + mkdep ${CFLAGS} ${UTILS:S/$/.c/g} ${HEOBJ:S/.o/.c/g} + +install: all + install -c -s -o root -g wheel -m 555 ${UTILS} hdfed ${BINDIR} diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/man/Makefile ./files/man/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/man/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/man/Makefile Thu Nov 4 15:58:41 1999 @@ -0,0 +1,15 @@ +MANDIR = ${PREFIX}/man/man + +MAN1 = hdf.1 hdfunpac.1 +MAN3 = gr_chunk.3 + +.include + +install: all-man maninstall + +clean: + -rm -f *.gz + +all: all-man + +depend: diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/md5 ./files/md5 --- /lan/bummer/home/mi/ports/graphics/hdf/files/md5 Sun Jan 3 13:18:26 1999 +++ ./files/md5 Thu Nov 4 20:51:27 1999 @@ -1 +1 @@ -MD5 (HDF4.1r2.tar.gz) = 52814865529791e3a39637fd851a7143 +MD5 (HDF4.1r3.tar.gz) = 975f84ad8c5910841995c9d339fbd8bb diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/Makefile ./files/mfhdf/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/Makefile Thu Nov 4 15:35:28 1999 @@ -0,0 +1,11 @@ +SUBDIR = fortran libsrc ncgen ncdump nctest dumper + +.include + +test: all + @for d in ${SUBDIR} ; do \ + echo "===> testing in $$d"; \ + cd $$d; \ + ${MAKE} test; \ + cd ..; \ + done diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/dumper/Makefile ./files/mfhdf/dumper/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/dumper/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/dumper/Makefile Thu Nov 4 14:28:52 1999 @@ -0,0 +1,11 @@ +PROG = hdp +NOMAN = 1 +LDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf +CFLAGS += -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src + +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 + +.include + +test: ${PROG} + env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src sh testhdp.sh diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/fortran/Makefile ./files/mfhdf/fortran/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/fortran/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/fortran/Makefile Thu Nov 4 21:16:44 1999 @@ -0,0 +1,40 @@ +.PATH: ${.CURDIR} ${.CURDIR}/config + +all: + +NOMAN = 1 + +FFLAGS += ${CFLAGS} -DNDEBUG -Nn802 -Nx400 + +LDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf + +afterinstall: + install -c -o root -g wheel -m 444 config/netcdf-fbsd.inc \ + ${PREFIX}/include/netcdf.inc + +.include + +ENVIR = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src + +CLEANFILES+= hdftest hdftest.o ftest ftest-fbsd.o + +config/netcdf.inc: + ln -s netcdf-fbsd.inc config/netcdf.inc + +ftest: ftest-fbsd.f config/netcdf.inc + ${MAKE} PROG=$@ SRCS=ftest-fbsd.f $@ + +hdftest: hdftest.f + ${MAKE} PROG=$@ SRCS=hdftest.f $@ + +test: ftest hdftest + mkdir -p testdir + # ================================ + # netCDF Fortran interface tests + # ================================ + ${ENVIR} ./ftest + ${ENVIR} ./hdftest > hdfout.new + @diff -Bb hdfout.new hdftst.sav && \ + echo "*** HDF-SD Fortran interface tests passed ***" || \ + (echo "*** HDF-SD Fortran interface tests failed ***"; \ + echo "The above differences are OK if small") diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/libsrc/Makefile ./files/mfhdf/libsrc/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/libsrc/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/libsrc/Makefile Thu Nov 4 19:44:44 1999 @@ -0,0 +1,41 @@ +.PATH: ${.CURDIR} ${.CURDIR}/../fortran/config ${.CURDIR}/../fortran + +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 + +LIB = mfhdf +SHLIB_MAJOR = 2 +SHLIB_MINOR = 3 + +LIBDIR = ${PREFIX}/lib + +# uncomment the line below to avoid building static libraries +#INTERNALLIB = Yes + +CFLAGS += -DNDEBUG -DHDF -I${.CURDIR}/../../hdf/src -I${.CURDIR} +.if ${MACHINE_ARCH} == "i386" +CFLAGS += -DSWAP +.endif + +LDADD += -L${.CURDIR}/../../hdf/src -ldf +LDFLAGS += -L. -l${LIB} ${LDADD} + +afterinstall: + install -c -o root -g wheel -m 444 hdf2netcdf.h local_nc.h \ + mfhdf.h netcdf.h ${PREFIX}/include + +.include + +test: ${SHLIB_NAME} cdftest hdftest + env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./cdftest > cdfout.new + @diff cdfout.new testout.sav && \ + echo "*** netCDF passes formatted test ***" || \ + (echo "*** netCDF fails formatted test ***" ; \ + echo "The above differences are OK if small") + env LD_LIBRARY_PATH=${.CURDIR}:${.CURDIR}/../../hdf/src ./hdftest > hdfout.new + @diff hdfout.new hdfout.sav && \ + echo "*** HDF passes formatted test ***" || \ + (echo "*** HDF fails formatted test ***" ; \ + echo "The above differences are OK if small") diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/ncdump/Makefile ./files/mfhdf/ncdump/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/ncdump/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/ncdump/Makefile Thu Nov 4 19:48:14 1999 @@ -0,0 +1,20 @@ +PROG = ncdump +MANDIR = ${PREFIX}/man/man + +LDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf +CFLAGS += -I${.CURDIR}/../libsrc +SRCS = ncdump.c vardata.c dumplib.c + +.include + +ENVIR = env LD_LIBRARY_PATH=${.CURDIR}/../../hdf/src:${.CURDIR}/../libsrc +NCGEN = ${.CURDIR}/../ncgen/ncgen + +test: $(PROG) test0.cdl + ${ENVIR} $(NCGEN) -o test0.nc -n test0.cdl + ${ENVIR} ./$(PROG) test0.nc > test1.cdl + ${ENVIR} $(NCGEN) -o test1.nc -n test1.cdl + ${ENVIR} ./$(PROG) -n test0 test1.nc > test2.cdl + @cmp test1.cdl test2.cdl && \ + echo "*** $(PROGRAM) test successful ***" ; \ + rm test1.cdl test1.nc test2.cdl diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/ncgen/Makefile ./files/mfhdf/ncgen/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/ncgen/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/ncgen/Makefile Thu Nov 4 19:48:39 1999 @@ -0,0 +1,70 @@ +PROG = ncgen +MANDIR = ${PREFIX}/man/man +LDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf +CFLAGS += -I${.CURDIR}/../libsrc -I${.CURDIR}/../../hdf/src -DNDEBUG +SRCS = main.c generate.c load.c ncgentab.c escapes.c \ + getfill.c init.c close.c genlib.c + +ENVIR = env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src +NCDUMP = ${.CURDIR}/../ncdump/ncdump + +test: $(PROG) test0.cdl btest ctest ftest + +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 + mv y.tab.h ncgentab.h + +.include + +# +# test "-b" option of ncgen +# +btest: $(PROG) test0.cdl test1.cdl + ${ENVIR} ./$(PROG) -b test1.cdl + ${ENVIR} $(NCDUMP) test1.nc > test2.cdl + @diff test1.cdl test2.cdl && \ + echo "*** $(PROG) -b test successful ***" + +# +# test "-c" option of ncgen +# +ctest: test1.cdl ctest0 + ${ENVIR} ./ctest0 # tests `-c' option, creates ctest0.nc + ${ENVIR} $(NCDUMP) -n test1 ctest0.nc > ctest1.cdl + @diff test1.cdl ctest1.cdl && \ + echo "*** $(PROG) -c test successful ***" + +ctest0: ncgen test0.cdl + ${ENVIR} ./$(PROG) -c -o ctest0.nc test0.cdl > test0.c + $(CC) $(CFLAGS) -o $@ test0.c ${LDFLAGS} + +# +# test "-f" option of ncgen +# +ftest: test1.cdl ftest0 + ${ENVIR} ./ftest0 + ${ENVIR} $(NCDUMP) -n test1 ftest0.nc > ftest1.cdl + @if diff test1.cdl ftest1.cdl; then \ + echo "*** ncgen -f test successful ***"; \ + else \ + echo "*** ncgen -f test failed " \ + "(but roundoff differences are OK) ***"; \ + fi + +ftest0: $(PROG) test0.cdl netcdf.inc + ${ENVIR} ./$(PROG) -f -o ftest0.nc test0.cdl > test0.f; \ + $(FC) $(FFLAGS) ${CFLAGS} -o $@ test0.f ${LDFLAGS} + +test1.cdl: test0.nc + ${ENVIR} $(NCDUMP) -n test1 test0.nc > $@ + +test0.nc: $(PROG) test0.cdl + ${ENVIR} ./$(PROG) -b -o test0.nc test0.cdl + +netcdf.inc: + ln -s ../fortran/config/netcdf-fbsd.inc $@ diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/nctest/Makefile ./files/mfhdf/nctest/Makefile --- /lan/bummer/home/mi/ports/graphics/hdf/files/mfhdf/nctest/Makefile Wed Dec 31 19:00:00 1969 +++ ./files/mfhdf/nctest/Makefile Thu Nov 4 20:00:50 1999 @@ -0,0 +1,17 @@ +PROG = nctest +NOMAN = 1 +CFLAGS += -I${.CURDIR}/../libsrc +LDFLAGS += -L${.CURDIR}/../libsrc -L${.CURDIR}/../../hdf/src -lmfhdf -ldf +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 + +install: + +.include + +test: $(PROG) + @ echo "===========================" + @ echo "netCDF C interface tests" + @ echo "===========================" + env LD_LIBRARY_PATH=${.CURDIR}/../libsrc:${.CURDIR}/../../hdf/src ./$(PROG) diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-aa ./patches/patch-aa --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-aa Sun Jan 3 13:18:26 1999 +++ ./patches/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,20 +0,0 @@ ---- config/mh-fbsd.orig Fri Oct 24 20:54:55 1997 -+++ config/mh-fbsd Fri May 29 10:45:15 1998 -@@ -26 +26 @@ --CFLAGS=-ansi -Wall -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wnested-externs -pedantic -O2 -+CFLAGS+=-ansi -DNDEBUG -@@ -33,2 +33,2 @@ --FC = f77 --FFLAGS = -O -Nn802 -Nx400 -+FC ?= f77 -+FFLAGS = $(CFLAGS) -Nn802 -Nx400 -@@ -177,0 +178,9 @@ -+# Have to do the following as files (not `-lz') for dependencies to work :( -+# XXX Version numbers will change in the future. -mi -+JPEG_LIB = $(prefix)/lib/libjpeg.so # separate port -+ZLIB_LIB = -lz # Comes with the OS these days. -+ZLIBLIB=-lz -+ZLIBINC=/usr/include -+JPEGLIB=$(prefix)/lib -+JPEGINC=$(prefix)/include -+ diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ab ./patches/patch-ab --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ab Sun Jan 3 13:18:26 1999 +++ ./patches/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,12 +0,0 @@ ---- Makefile.in.orig Thu Sep 11 21:18:49 1997 -+++ Makefile.in Thu Sep 11 21:26:57 1997 -@@ -69,7 +69,7 @@ - - AS = as - CC = gcc --CFLAGS = -ansi -O -+#CFLAGS = -ansi -O - FC = f77 --FFLAGS= -O -+#FFLAGS= -O - diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ac ./patches/patch-ac --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ac Sun Jan 3 13:18:26 1999 +++ ./patches/patch-ac Wed Dec 31 19:00:00 1969 @@ -1,41 +0,0 @@ ---- hdf/util/Makefile.in.orig Thu Nov 14 04:12:28 1996 -+++ hdf/util/Makefile.in Sat Oct 3 22:46:36 1998 -@@ -121,8 +121,8 @@ - HDFBIN=$(srcdir)/../bin - - # ==> where is your JPEG library (libjpeg.a) located? --JPEGLIB=$(srcdir)/../jpeg --JPEGINC=$(srcdir)/../jpeg -+JPEGLIB?=$(srcdir)/../jpeg -+JPEGINC?=$(srcdir)/../jpeg - - # ==> where is your PABLO include files - PABLO_HINC= $(srcdir)/../pablo -@@ -132,8 +132,8 @@ - FMPOOL_SRC=$(srcdir)/../fmpool - - # ==> where is your zlib library (libz.a) located? --ZLIBLIB=$(srcdir)/../zlib --ZLIBINC=$(srcdir)/../zlib -+ZLIBLIB?=$(srcdir)/../zlib -+ZLIBINC?=$(srcdir)/../zlib - - #Where are the utility includes - UTILINC=$(srcdir) -@@ -216,13 +216,13 @@ - $(CC) $(ALL_CFLAGS) -c $< - - .c: $(HDFLIB)/libdf.a -- $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a $(LIBSX) -+ $(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) $(LIBSX) - - .f: $(HDFLIB)/libdf.a -- $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -+ $(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEGLIB)/libjpeg.a $(ZLIBLIB) - - hdfed: he.h he_proto.h $(HEOBJ) $(HDFLIB)/libdf.a $(FRC) -- $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -+ $(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEGLIB)/libjpeg.a $(ZLIBLIB) - - utils: $(UTILS) $(HDFLIB)/libdf.a $(FRC) - diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ad ./patches/patch-ad --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ad Sun Jan 3 13:18:26 1999 +++ ./patches/patch-ad Wed Dec 31 19:00:00 1969 @@ -1,11 +0,0 @@ ---- mfhdf/xdr/types.h.orig Tue Oct 29 11:34:08 1996 -+++ mfhdf/xdr/types.h Wed Apr 8 14:47:38 1998 -@@ -23,7 +23,7 @@ - - #if defined __STDC__ || defined PC || defined _WINDOWS || defined WIN32 - #define STDC_INCLUDES --#if !(defined vms || defined UNIX386 || defined WINNT || defined WIN32 || defined __ultrix || (defined __sun__ && defined __i386__) || defined _CRAYMPP) -+#if !(defined vms || defined UNIX386 || defined WINNT || defined WIN32 || defined __ultrix || (defined __sun__ && defined __i386__) || defined _CRAYMPP || defined __FreeBSD__ ) - long ntohl(long); - long htonl(long); - #endif /* !unix */ diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ae ./patches/patch-ae --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ae Sun Jan 3 13:18:26 1999 +++ ./patches/patch-ae Wed Dec 31 19:00:00 1969 @@ -1,36 +0,0 @@ ---- hdf/test/Makefile.in.orig Sat Oct 3 22:48:08 1998 -+++ hdf/test/Makefile.in Sat Oct 3 22:54:41 1998 -@@ -358,26 +358,26 @@ - @cmp fortest.out fortest.sav && echo "*** Fortran tests passed ***"; - - qtesthdf: $(COBJS) $(HDFLIB)/libdf.a -- quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ quantify $(CC) $(ALL_CFLAGS) -o qtesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - - ptesthdf: $(COBJS) $(HDFLIB)/libdf.a -- purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ purify $(CC) $(ALL_CFLAGS) -o ptesthdf $(COBJS) $(HDFSRC)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - - testhdf.tc: $(COBJS) $(HDFLIB)/libdf.a -- proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ proof $(CC) $(ALL_CFLAGS) -o testhdf.tc $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - - testhdf: $(COBJS) $(HDFLIB)/libdf.a -- $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ $(CC) $(ALL_CFLAGS) -o testhdf $(COBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - test -d $(TESTDIR) || mkdir $(TESTDIR) - - fortestF: $(FOBJS) $(HDFLIB)/libdf.a -- $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ $(FC) $(FFLAGS) -o $@ $(FOBJS) $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - - fortest: $(HDFLIB)/libdf.a fortest.c $(CHDRS) -- $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ $(CC) $(ALL_CFLAGS) -o fortest fortest.c $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - - gentest: gentest.c $(HDFLIB)/libdf.a -- $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a -lm -+ $(CC) $(ALL_CFLAGS) gentest.c -o gentest $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) -lm - - ftests: $(FTESTS) - diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-af ./patches/patch-af --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-af Mon May 31 01:11:17 1999 +++ ./patches/patch-af Wed Dec 31 19:00:00 1969 @@ -1,18 +0,0 @@ ---- configure.in.orig Tue Mar 3 17:23:22 1998 -+++ configure.in Sun May 30 18:08:57 1999 -@@ -82,6 +82,7 @@ - mips*-sgi-irix4*) host_makefile_frag=config/mh-irix4 ;; - i[3456]86-*-linux*) host_makefile_frag=config/mh-linux ;; - i[3456]86-*-freebsd*) host_makefile_frag=config/mh-fbsd ;; -+ alpha-*-freebsd*) host_makefile_frag=config/mh-fbsd ;; - *-ibm-aix*) host_makefile_frag=config/mh-aix ;; - i386-*-solaris2*) host_makefile_frag=config/mh-solarisx86 ;; - *-*-solaris2*) host_makefile_frag=config/mh-solaris ;; -@@ -155,6 +156,7 @@ - mips*-sgi-irix4*) files="mfhdf/libsrc/config/netcdf-irix4.h mfhdf/fortran/config/jackets-irix4.c mfhdf/fortran/config/netcdf-irix4.inc mfhdf/fortran/config/ftest-irix4.f" ;; - i[3456]86-*-linux*) files="mfhdf/libsrc/config/netcdf-linux.h mfhdf/fortran/config/jackets-linux.c mfhdf/fortran/config/netcdf-linux.inc mfhdf/fortran/config/ftest-linux.f" ;; - i[3456]86-*-freebsd*) files="mfhdf/libsrc/config/netcdf-fbsd.h mfhdf/fortran/config/jackets-fbsd.c mfhdf/fortran/config/netcdf-fbsd.inc mfhdf/fortran/config/ftest-fbsd.f" ;; -+ alpha-*-freebsd*) files="mfhdf/libsrc/config/netcdf-fbsd.h mfhdf/fortran/config/jackets-fbsd.c mfhdf/fortran/config/netcdf-fbsd.inc mfhdf/fortran/config/ftest-fbsd.f" ;; - *-ibm-aix*) files="mfhdf/libsrc/config/netcdf-aix.h mfhdf/fortran/config/jackets-aix.c mfhdf/fortran/config/netcdf-aix.inc mfhdf/fortran/config/ftest-aix.f" ;; - i386-*-solaris2*) files="mfhdf/libsrc/config/netcdf-solarisx86.h mfhdf/fortran/config/jackets-solarisx86.c mfhdf/fortran/config/netcdf-solarisx86.inc mfhdf/fortran/config/ftest-solarisx86.f" ;; - *-*-solaris2*) files="mfhdf/libsrc/config/netcdf-solaris.h mfhdf/fortran/config/jackets-solaris.c mfhdf/fortran/config/netcdf-solaris.inc mfhdf/fortran/config/ftest-solaris.f";; diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ag ./patches/patch-ag --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ag Mon May 31 01:11:18 1999 +++ ./patches/patch-ag Wed Dec 31 19:00:00 1969 @@ -1,18 +0,0 @@ ---- hdf/jpeg/configure.in.orig Tue Mar 3 17:23:32 1998 -+++ hdf/jpeg/configure.in Sun May 30 17:47:04 1999 -@@ -40,6 +40,7 @@ - mips*-sgi-irix4*) host_makefile_frag=config/mh-irix4 ;; - i[3456]86-*-linux*) host_makefile_frag=config/mh-linux ;; - i[3456]86-*-freebsd*) host_makefile_frag=config/mh-fbsd ;; -+ alpha-*-freebsd*) host_makefile_frag=config/mh-fbsd ;; - *-ibm-aix*) host_makefile_frag=config/mh-aix ;; - *-*-solaris2*) host_makefile_frag=config/mh-solaris ;; - *-sun-*) host_makefile_frag=config/mh-sun ;; -@@ -110,6 +111,7 @@ - mips*-sgi-irix4*) files=config/jirix4.h ;; - i[3456]86-*-linux*) files=config/jlinux.h ;; - i[3456]86-*-freebsd*) files=config/jfbsd.h ;; -+ alpha-*-freebsd*) files=config/jfbsd.h ;; - *-ibm-aix*) files=config/jaix.h ;; - *-*-solaris2*) files=config/jsolaris.h ;; - *-sun-*) files=config/jsun.h ;; diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ah ./patches/patch-ah --- /lan/bummer/home/mi/ports/graphics/hdf/patches/patch-ah Mon May 31 01:11:19 1999 +++ ./patches/patch-ah Wed Dec 31 19:00:00 1969 @@ -1,18 +0,0 @@ ---- hdf/fmpool/configure.in.orig Sun May 30 17:49:07 1999 -+++ hdf/fmpool/configure.in Sun May 30 17:49:41 1999 -@@ -40,6 +40,7 @@ - mips*-sgi-irix4*) host_makefile_frag=config/mh-irix4 ;; - i[3456]86-*-linux*) host_makefile_frag=config/mh-linux ;; - i[3456]86-*-freebsd*) host_makefile_frag=config/mh-fbsd ;; -+ alpha-*-freebsd*) host_makefile_frag=config/mh-fbsd ;; - *-ibm-aix*) host_makefile_frag=config/mh-aix ;; - *-*-solaris2*) host_makefile_frag=config/mh-solaris ;; - *-sun-*) host_makefile_frag=config/mh-sun ;; -@@ -110,6 +111,7 @@ - mips*-sgi-irix4*) files=config/fmpirix4.h ;; - i[3456]86-*-linux*) files=config/fmplinux.h ;; - i[3456]86-*-freebsd*) files=config/fmpfbsd.h ;; -+ alpha-*-freebsd*) files=config/fmpfbsd.h ;; - *-ibm-aix*) files=config/fmpaix.h ;; - *-*-solaris2*) files=config/fmpsolaris.h ;; - *-sun-*) files=config/fmpsun.h ;; diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/pkg/PLIST ./pkg/PLIST --- /lan/bummer/home/mi/ports/graphics/hdf/pkg/PLIST Sun Jan 3 13:18:26 1999 +++ ./pkg/PLIST Thu Nov 4 19:50:43 1999 @@ -20,7 +20,11 @@ bin/vmake bin/vshow lib/libmfhdf.a +lib/libmfhdf.so.2 +lib/libmfhdf.so lib/libdf.a +lib/libdf.so +lib/libdf.so.1 include/atom.h include/bitvect.h include/cdeflate.h @@ -30,7 +34,6 @@ include/cskphuff.h include/df.h include/dfan.h -include/dffunc.f90 include/dffunc.inc include/dfgr.h include/dfi.h @@ -45,7 +48,6 @@ include/hcompi.h include/hconv.h include/hdf.h -include/hdf.f90 include/hdf.inc include/hdf2netcdf.h include/hdfi.h @@ -63,7 +65,6 @@ include/mfhdf.h include/mstdio.h include/netcdf.h -include/netcdf.f90 include/netcdf.inc include/tbbt.h include/vattr.h diff -u -N -r /lan/bummer/home/mi/ports/graphics/hdf/scripts/post-patch ./scripts/post-patch --- /lan/bummer/home/mi/ports/graphics/hdf/scripts/post-patch Sun Jan 3 13:18:26 1999 +++ ./scripts/post-patch Wed Dec 31 19:00:00 1969 @@ -1,83 +0,0 @@ -#!/bin/sh - -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^CFLAGS = -ansi -O"` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,1 +72,1 @@ --CFLAGS = -ansi -O -+#CFLAGS = -ansi -O -END_OF_PATCH -done -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIB_LIB = "` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,1 +72,1 @@ --ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a -+#ZLIB_LIB = \$(TOP_SRCDIR)/hdf/zlib/libz.a -END_OF_PATCH -done -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEG_LIB = "` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,1 +72,1 @@ --JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a -+#JPEG_LIB = \$(TOP_SRCDIR)/hdf/jpeg/libjpeg.a -END_OF_PATCH -done -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,2 +72,2 @@ --ZLIBINC=\$(srcdir)/../zlib --ZLIBLIB=\$(srcdir)/../zlib -+ZLIBINC=/usr/include -+ZLIBLIB=-lz \$(pwrkdir) -END_OF_PATCH -done - -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^ZLIBLIB="` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,2 +72,2 @@ --ZLIBLIB=\$(srcdir)/../zlib --ZLIBINC=\$(srcdir)/../zlib -+ZLIBLIB=-lz -+ZLIBINC=/usr/include -END_OF_PATCH -done - -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,2 +72,2 @@ --JPEGINC=\$(srcdir)/../jpeg --JPEGLIB=\$(srcdir)/../jpeg -+JPEGINC=\$(prefix)/include -+JPEGLIB=\$(prefix)/lib -END_OF_PATCH -done - -for f in `find ${WRKSRC} -type f -name Makefile.in -print | xargs grep -l "^JPEGLIB="` -do -patch -p << END_OF_PATCH ---- $f.orig -+++ $f -@@ -72,2 +72,2 @@ --JPEGLIB=\$(srcdir)/../jpeg --JPEGINC=\$(srcdir)/../jpeg -+JPEGLIB=\$(prefix)/lib -+JPEGINC=\$(prefix)/include -END_OF_PATCH -done >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message