diff options
author | hubertf <hubertf> | 1997-12-01 00:01:51 +0000 |
---|---|---|
committer | hubertf <hubertf> | 1997-12-01 00:01:51 +0000 |
commit | 938ffd4198075182b4f9579c8fb6ef3e8c36b5c0 (patch) | |
tree | d3861ca411145c38846d63d070aaf7ae59e20f91 | |
parent | 0d0a40605d8935e5aec7dc4a12510f570939a951 (diff) | |
download | pkgsrc-938ffd4198075182b4f9579c8fb6ef3e8c36b5c0.tar.gz |
Incorporate Matthias Scheler's update to the tiff package with some
minor fixes from me. Closes PR pkg/4603.
-rw-r--r-- | graphics/tiff/Makefile | 85 | ||||
-rw-r--r-- | graphics/tiff/files/config.site | 11 | ||||
-rw-r--r-- | graphics/tiff/files/md5 | 2 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-aa | 222 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-ab | 73 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-ac | 64 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-ad | 64 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-ae | 18 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-af | 12 | ||||
-rw-r--r-- | graphics/tiff/patches/patch-ag | 28 | ||||
-rw-r--r-- | graphics/tiff/pkg/PLIST | 163 |
11 files changed, 320 insertions, 422 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 9dd6d9a6065..a4bd8319975 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,42 +1,59 @@ -# $NetBSD: Makefile,v 1.2 1997/10/06 13:44:56 agc Exp $ +# $NetBSD: Makefile,v 1.3 1997/12/01 00:01:51 hubertf Exp $ # New ports collection makefile for: tiff -# Version required: 3.3 beta 021 -# Date created: 14 November 1994 -# Whom: torstenb -# -# FreeBSD Id: Makefile,v 1.11 1997/08/29 11:40:45 tg Exp +# Version required: 3.4 beta 037 +# Date created: 27 November 1997 +# Whom: tron # -DISTNAME= v3.3beta021.src -PKGNAME= tiff-3.3 +DISTNAME= tiff-v3.4beta037 +PKGNAME= tiff-3.4 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.isri.unlv.edu/pub/mirror/tiff/ \ - ftp://ftp.coli.uni-sb.de/pub/graphics/ \ - ftp://ftp.funet.fi/pub/graphics/packages/tiff/ -# Original master site doesn't keep old versions -# MASTER_SITES= ftp://ftp.sgi.com/graphics/tiff/ - -NO_WRKSUBDIR= yes -MAN1= fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \ - rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 \ - tiffcmp.1 tiffcp.1 tiffdither.1 tiffdump.1 tiffgt.1 \ - tiffinfo.1 tiffmedian.1 tiffsplit.1 tiffsv.1 -MAN3= TIFFClose.3 TIFFError.3 TIFFFlush.3 TIFFGetField.3 \ - TIFFOpen.3 TIFFPrintDirectory.3 TIFFReadDirectory.3 \ - TIFFReadEncodedStrip.3 TIFFReadEncodedTile.3 \ - TIFFReadRGBAImage.3 TIFFReadRawStrip.3 TIFFReadRawTile.3 \ - TIFFReadScanline.3 TIFFReadTile.3 TIFFSetDirectory.3 \ - TIFFSetField.3 TIFFWarning.3 TIFFWriteDirectory.3 \ - TIFFWriteEncodedStrip.3 TIFFWriteEncodedTile.3 \ - TIFFWriteRawStrip.3 TIFFWriteRawTile.3 TIFFWriteScanline.3 \ - TIFFintro.3 TIFFquery.3 TIFFsize.3 TIFFstrip.3 \ - TIFFswab.3 TIFFtile.3 - -pre-configure: - @(cd ${WRKSRC}/libtiff ; ln -s Makefile.gcc Makefile) - @(cd ${WRKSRC}/tools ; ln -s Makefile.sun Makefile) +MASTER_SITES= ftp://ftp.sgi.com/graphics/tiff/ \ + ftp://ftp.gwdg.de/pub/grafik/sgi/tiff/ \ + ftp://ftp.fu-berlin.de/unix/graphics/tiff/ + +# "-tar.gz" instead of ".tar.gz" +EXTRACT_SUFX= -tar.gz +EXTRACT_CMD= /usr/bin/tar +EXTRACT_BEFORE_ARGS= -xzf + +LIB_DEPENDS= jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg + +MAN1= fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \ + rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 tiffcmp.1 \ + tiffcp.1 tiffdither.1 tiffdump.1 tiffgt.1 tiffinfo.1 tiffmedian.1 \ + tiffsplit.1 tiffsv.1 + +MAN3= TIFFCheckTile.3 TIFFClose.3 TIFFComputeStrip.3 TIFFComputeTile.3 \ + TIFFCurrentDirectory.3 TIFFCurrentRow.3 TIFFCurrentStrip.3 \ + TIFFCurrentTile.3 TIFFDefaultStripSize.3 TIFFDefaultTileSize.3 \ + TIFFError.3 TIFFFdOpen.3 TIFFFileName.3 TIFFFileno.3 TIFFFindCODEC.3 \ + TIFFFlush.3 TIFFFlushData.3 TIFFGetField.3 TIFFGetMode.3 \ + TIFFIsByteSwapped.3 TIFFIsMSB2LSB.3 TIFFIsTiled.3 TIFFIsUpSampled.3 \ + TIFFLastDirectory.3 TIFFNumberOfStrips.3 TIFFNumberOfTiles.3 \ + TIFFOpen.3 TIFFPrintDirectory.3 TIFFRGBAImage.3 TIFFRGBAImageBegin.3 \ + TIFFRGBAImageEnd.3 TIFFRGBAImageGet.3 TIFFRGBAImageOK.3 \ + TIFFReadBufferSetup.3 TIFFReadDirectory.3 TIFFReadEncodedStrip.3 \ + TIFFReadEncodedTile.3 TIFFReadRGBAImage.3 TIFFReadRawStrip.3 \ + TIFFReadRawTile.3 TIFFReadScanline.3 TIFFReadTile.3 \ + TIFFRegisterCODEC.3 TIFFReverseBits.3 TIFFScanlineSize.3 \ + TIFFSetDirectory.3 TIFFSetErrorHandler.3 TIFFSetField.3 \ + TIFFSetSubDirectory.3 TIFFSetWarningHandler.3 TIFFStripSize.3 \ + TIFFSwabArrayOfLong.3 TIFFSwabArrayOfShort.3 TIFFSwabLong.3 \ + TIFFSwabShort.3 TIFFTileRowSize.3 TIFFTileSize.3 TIFFUnRegisterCODEC.3 \ + TIFFVGetField.3 TIFFVSetField.3 TIFFVStripSize.3 TIFFVTileSize.3 \ + TIFFWarning.3 TIFFWriteBufferSetup.3 TIFFWriteDirectory.3 \ + TIFFWriteEncodedStrip.3 TIFFWriteEncodedTile.3 TIFFWriteRawStrip.3 \ + TIFFWriteRawTile.3 TIFFWriteScanline.3 TIFFbuffer.3 TIFFcodec.3 \ + TIFFfree.3 TIFFmalloc.3 TIFFmemcmp.3 TIFFmemcpy.3 TIFFmemory.3 \ + TIFFmemset.3 TIFFquery.3 TIFFrealloc.3 TIFFsize.3 TIFFstrip.3 \ + TIFFswab.3 TIFFtile.3 libtiff.3 + +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --noninteractive --site ${FILESDIR} +CONFIGURE_ENV+= PREFIX=$(PREFIX) post-install: - ${LDCONFIG} -m ${PREFIX}/lib + ${LDCONFIG} -m ${PREFIX}/lib || true .include <bsd.port.mk> diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site new file mode 100644 index 00000000000..9f31b08cee1 --- /dev/null +++ b/graphics/tiff/files/config.site @@ -0,0 +1,11 @@ +DIR_BIN=$PREFIX/bin +DIR_LIB=$PREFIX/lib +DIRS_LIBINC=$PREFIX/include +DIR_GZLIB=/usr/lib +DIR_INC=$PREFIX/include +DIR_JPEGLIB=$PREFIX/lib +DIR_MAN=$PREFIX/man +INSTALL= +JPEG=yes +MANSCHEME=bsd-source-strip +ZIP=yes diff --git a/graphics/tiff/files/md5 b/graphics/tiff/files/md5 index 53d19b18557..bd16152b7b5 100644 --- a/graphics/tiff/files/md5 +++ b/graphics/tiff/files/md5 @@ -1 +1 @@ -MD5 (v3.3beta021.src.tar.gz) = 4c54a18c7bfadbc4fcce98a38b779087 +MD5 (tiff-v3.4beta037-tar.gz) = d809f5b88130062c6a2d2f70d0558b7e diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa index 335c544d29a..b48d55fc5f3 100644 --- a/graphics/tiff/patches/patch-aa +++ b/graphics/tiff/patches/patch-aa @@ -1,98 +1,124 @@ -*** libtiff/Makefile.gcc.orig Fri Sep 30 03:01:24 1994 ---- libtiff/Makefile.gcc Wed Oct 4 04:28:20 1995 -*************** -*** 26,43 **** - # - # This Makefile is for use with gcc (2.2.2 or later) - # -! DESTDIR=. - # - AR= ar - RANLIB= ranlib - NULL= - - IPATH= -I. - CONF_LIBRARY=\ - ${NULL} -! CC= gcc -! COPTS= -ansi -O -! CFLAGS= ${COPTS} ${IPATH} ${CONF_LIBRARY} - # - INCS= tiff.h tiffio.h - SRCS= tif_fax3.c \ ---- 26,42 ---- - # - # This Makefile is for use with gcc (2.2.2 or later) - # -! DESTDIR=${PREFIX} - # - AR= ar - RANLIB= ranlib -+ INSTALL= install -o bin -g bin - NULL= - - IPATH= -I. - CONF_LIBRARY=\ - ${NULL} -! CFLAGS+= ${COPTS} ${IPATH} ${CONF_LIBRARY} - # - INCS= tiff.h tiffio.h - SRCS= tif_fax3.c \ -*************** -*** 100,113 **** - tif_warning.o \ - tif_write.o \ - ${NULL} -! ALL= libtiff.a - - all: ${ALL} - -! ${ALL}: ${OBJS} - ${AR} rc libtiff.a $? - ${RANLIB} libtiff.a - - ${OBJS}: tiffio.h tiff.h tiffcomp.h tiffiop.h tiffconf.h - tif_fax3.o: tif_fax3.c g3states.h t4.h tif_fax3.h - ---- 99,120 ---- - tif_warning.o \ - tif_write.o \ - ${NULL} -! ALL= libtiff.a libtiff.so.3.3 - - all: ${ALL} - -! libtiff.a: ${OBJS} - ${AR} rc libtiff.a $? - ${RANLIB} libtiff.a - -+ .SUFFIXES: .c .o .so -+ -+ .c.so: -+ ${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} -+ -+ libtiff.so.3.3: ${OBJS:S/o$/so/g} -+ ld -x -Bshareable -Bforcearchive -o libtiff.so.3.3 ${OBJS:S/o$/so/g} -+ - ${OBJS}: tiffio.h tiff.h tiffcomp.h tiffiop.h tiffconf.h - tif_fax3.o: tif_fax3.c g3states.h t4.h tif_fax3.h - -*************** -*** 118,125 **** - install: all installh - -for i in ${ALL}; do \ - ${INSTALL} -c -m 644 $$i ${DESTDIR}/lib/$$i; \ -- ${RANLIB} ${DESTDIR}/lib/$$i; \ - done - - installh: ${INCS} - -for i in ${INCS}; do \ ---- 125,132 ---- - install: all installh - -for i in ${ALL}; do \ - ${INSTALL} -c -m 644 $$i ${DESTDIR}/lib/$$i; \ - done -+ ranlib ${DESTDIR}/lib/libtiff.a - - installh: ${INCS} - -for i in ${INCS}; do \ +--- man/Makefile.in.orig Tue Sep 2 19:54:41 1997 ++++ man/Makefile.in Fri Nov 28 02:19:36 1997 +@@ -82,7 +82,7 @@ + # pathname prefix in the .so commands when setting + # up alternate files for multi-function manual pages. + # +-#MANDIR = man3/ ++MANDIR = man3/ + + MANTOOLS=\ + apps/fax2tiff.1 \ +@@ -268,59 +268,59 @@ + lib/TIFFswab.3t:: ${SRCDIR}/TIFFswab.3t; ${MANCVT} + lib/TIFFtile.3t:: ${SRCDIR}/TIFFtile.3t; ${MANCVT} + +-lib/TIFFComputeTile.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFCheckTile.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFNumberOfTiles.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFComputeStrip.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@ +-lib/TIFFNumberOfStrips.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@ +-lib/TIFFCurrentDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFCurrentRow.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFCurrentStrip.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFCurrentTile.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFFdOpen.3t:; ${ECHO} ".so ${MANDIR}TIFFOpen.3t" > $@ +-lib/TIFFFileName.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFFileno.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFFlushData.3t:; ${ECHO} ".so ${MANDIR}TIFFFlush.3t" > $@ +-lib/TIFFGetMode.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFIsTiled.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFIsByteSwapped.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFIsUpSampled.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFIsMSB2LSB.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFLastDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3t" > $@ +-lib/TIFFReverseBits.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@ +-lib/TIFFRGBAImageOK.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@ +-lib/TIFFRGBAImageBegin.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@ +-lib/TIFFRGBAImageGet.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@ +-lib/TIFFRGBAImageEnd.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3t" > $@ +-lib/TIFFSetErrorHandler.3t:; ${ECHO} ".so ${MANDIR}TIFFError.3t" > $@ +-lib/TIFFSetSubDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFSetDirectory.3t" > $@ +-lib/TIFFSetWarningHandler.3t:; ${ECHO} ".so ${MANDIR}TIFFWarning.3t" > $@ +-lib/TIFFSwabArrayOfLong.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@ +-lib/TIFFSwabArrayOfShort.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@ +-lib/TIFFSwabLong.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@ +-lib/TIFFSwabShort.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3t" > $@ +-lib/TIFFScanlineSize.3t:; ${ECHO} ".so ${MANDIR}TIFFsize.3t" > $@ +-lib/TIFFRasterScanlineSize.3t:; ${ECHO} ".so ${MANDIR}TIFFsize.3t" > $@ +-lib/TIFFDefaultStripSize.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@ +-lib/TIFFStripSize.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@ +-lib/TIFFVStripSize.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3t" > $@ +-lib/TIFFTileSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFVTileSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFDefaultTileSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFTileRowSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3t" > $@ +-lib/TIFFVGetField.3t:; ${ECHO} ".so ${MANDIR}TIFFGetField.3t" > $@ +-lib/TIFFVSetField.3t:; ${ECHO} ".so ${MANDIR}TIFFSetField.3t" > $@ +-lib/TIFFFindCODEC.3t:; ${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@ +-lib/TIFFRegisterCODEC.3t:; ${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@ +-lib/TIFFUnRegisterCODEC.3t:; ${ECHO} ".so ${MANDIR}TIFFcodec.3t" > $@ +-lib/TIFFmalloc.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@ +-lib/TIFFrealloc.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@ +-lib/TIFFfree.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@ +-lib/TIFFmemset.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@ +-lib/TIFFmemcpy.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@ +-lib/TIFFmemcmp.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3t" > $@ +-lib/TIFFReadBufferSetup.3t:; ${ECHO} ".so ${MANDIR}TIFFbuffer.3t" > $@ +-lib/TIFFWriteBufferSetup.3t:; ${ECHO} ".so ${MANDIR}TIFFbuffer.3t" > $@ ++lib/TIFFComputeTile.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFCheckTile.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFNumberOfTiles.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFComputeStrip.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3" > $@ ++lib/TIFFNumberOfStrips.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3" > $@ ++lib/TIFFCurrentDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFCurrentRow.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFCurrentStrip.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFCurrentTile.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFFdOpen.3t:; ${ECHO} ".so ${MANDIR}TIFFOpen.3" > $@ ++lib/TIFFFileName.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFFileno.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFFlushData.3t:; ${ECHO} ".so ${MANDIR}TIFFFlush.3" > $@ ++lib/TIFFGetMode.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFIsTiled.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFIsByteSwapped.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFIsUpSampled.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFIsMSB2LSB.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFLastDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFquery.3" > $@ ++lib/TIFFReverseBits.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3" > $@ ++lib/TIFFRGBAImageOK.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3" > $@ ++lib/TIFFRGBAImageBegin.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3" > $@ ++lib/TIFFRGBAImageGet.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3" > $@ ++lib/TIFFRGBAImageEnd.3t:; ${ECHO} ".so ${MANDIR}TIFFRGBAImage.3" > $@ ++lib/TIFFSetErrorHandler.3t:; ${ECHO} ".so ${MANDIR}TIFFError.3" > $@ ++lib/TIFFSetSubDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFSetDirectory.3" > $@ ++lib/TIFFSetWarningHandler.3t:; ${ECHO} ".so ${MANDIR}TIFFWarning.3" > $@ ++lib/TIFFSwabArrayOfLong.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3" > $@ ++lib/TIFFSwabArrayOfShort.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3" > $@ ++lib/TIFFSwabLong.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3" > $@ ++lib/TIFFSwabShort.3t:; ${ECHO} ".so ${MANDIR}TIFFswab.3" > $@ ++lib/TIFFScanlineSize.3t:; ${ECHO} ".so ${MANDIR}TIFFsize.3" > $@ ++lib/TIFFRasterScanlineSize.3t:; ${ECHO} ".so ${MANDIR}TIFFsize.3" > $@ ++lib/TIFFDefaultStripSize.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3" > $@ ++lib/TIFFStripSize.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3" > $@ ++lib/TIFFVStripSize.3t:; ${ECHO} ".so ${MANDIR}TIFFstrip.3" > $@ ++lib/TIFFTileSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFVTileSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFDefaultTileSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFTileRowSize.3t:; ${ECHO} ".so ${MANDIR}TIFFtile.3" > $@ ++lib/TIFFVGetField.3t:; ${ECHO} ".so ${MANDIR}TIFFGetField.3" > $@ ++lib/TIFFVSetField.3t:; ${ECHO} ".so ${MANDIR}TIFFSetField.3" > $@ ++lib/TIFFFindCODEC.3t:; ${ECHO} ".so ${MANDIR}TIFFcodec.3" > $@ ++lib/TIFFRegisterCODEC.3t:; ${ECHO} ".so ${MANDIR}TIFFcodec.3" > $@ ++lib/TIFFUnRegisterCODEC.3t:; ${ECHO} ".so ${MANDIR}TIFFcodec.3" > $@ ++lib/TIFFmalloc.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3" > $@ ++lib/TIFFrealloc.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3" > $@ ++lib/TIFFfree.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3" > $@ ++lib/TIFFmemset.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3" > $@ ++lib/TIFFmemcpy.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3" > $@ ++lib/TIFFmemcmp.3t:; ${ECHO} ".so ${MANDIR}TIFFmemory.3" > $@ ++lib/TIFFReadBufferSetup.3t:; ${ECHO} ".so ${MANDIR}TIFFbuffer.3" > $@ ++lib/TIFFWriteBufferSetup.3t:; ${ECHO} ".so ${MANDIR}TIFFbuffer.3" > $@ + + apps/Makefile: + test -d apps || mkdir apps diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab index 5943adcb23c..5d589859881 100644 --- a/graphics/tiff/patches/patch-ab +++ b/graphics/tiff/patches/patch-ab @@ -1,62 +1,11 @@ -*** tools/Makefile.sun.orig Fri Sep 30 03:01:48 1994 ---- tools/Makefile.sun Wed Oct 4 04:45:40 1995 -*************** -*** 31,37 **** - # simply null this out and you'll get whatever is in your - # libc (or similar). - # -! GETOPT= getopt.o - # - # Library-wide configuration defines: - # Note that if you change the library-wide configuration, you'll ---- 31,37 ---- - # simply null this out and you'll get whatever is in your - # libc (or similar). - # -! # GETOPT= getopt.o - # - # Library-wide configuration defines: - # Note that if you change the library-wide configuration, you'll -*************** -*** 40,49 **** - CONF_LIBRARY=\ - ${NULL} - COPTS= -! CFLAGS= -g ${COPTS} ${IPATH} - # - LIBTIFF=../libtiff/libtiff.a -! LIBS= ${LIBTIFF} - MACHALL=ras2tiff - OBJS= \ - fax2tiff.o \ ---- 40,49 ---- - CONF_LIBRARY=\ - ${NULL} - COPTS= -! CFLAGS+= ${COPTS} ${IPATH} -D_HAVE_PARAM_H - # - LIBTIFF=../libtiff/libtiff.a -! LIBS= -L../libtiff -ltiff - MACHALL=ras2tiff - OBJS= \ - fax2tiff.o \ -*************** -*** 69,74 **** ---- 69,75 ---- - pal2rgb \ - ppm2tiff \ - rgb2ycbcr \ -+ thumbnail \ - tiff2bw \ - tiff2ps \ - tiffcmp \ -*************** -*** 127,132 **** ---- 128,134 ---- - ${CC} -o thumbnail ${CFLAGS} thumbnail.c ${LIBS} -lm - - install: all -+ install -o bin -g bin -c -s ${ALL} ${PREFIX}/bin - - clean: - rm -f ${ALL} ${OBJS} core a.out ycbcr +--- configure.orig Sat Nov 29 22:50:13 1997 ++++ configure Sat Nov 29 22:50:24 1997 +@@ -1138,7 +1138,7 @@ + TIFFLIBREF='-L${DEPTH}/libtiff -R'${DIR_LIB}' -ltiff' + ;; + *-netbsd*) +- DSOSUF=so.${DIST_MAJOR}.0 ++ DSOSUF=so.${DIST_MAJOR}.${DIST_MINOR} + LIBCOPTS='-fPIC' + DSO=NETBSD + TIFFLIBREF='-L${DEPTH}/libtiff -ltiff' diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac index ba2cfcc75e8..185ac856552 100644 --- a/graphics/tiff/patches/patch-ac +++ b/graphics/tiff/patches/patch-ac @@ -1,52 +1,12 @@ -*** contrib/fax2ps/Makefile.orig Tue Jul 26 21:55:07 1994 ---- contrib/fax2ps/Makefile Wed Oct 4 04:55:32 1995 -*************** -*** 25,42 **** - TIFF= ../../libtiff - TOOLS= ../../tools - -! BIN= /usr/local/bin - NULL= -! OBJS= fax2ps.o faxdecode.o getopt.o - CONF_LIBRARY=\ - ${NULL} -! COPTS= -O -! CFLAGS= ${COPTS} -ansi ${CONF_LIBRARY} -I${TIFF} -! LIBS= ${TIFF}/libtiff.a - - all: fax2ps - -! fax2ps: ${OBJS} ${LIBS} - ${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} -lm - - ${OBJS}: defs.h ${TIFF}/tiffio.h ---- 25,42 ---- - TIFF= ../../libtiff - TOOLS= ../../tools - -! BIN= ${PREFIX}/bin/ - NULL= -! OBJS= fax2ps.o faxdecode.o - CONF_LIBRARY=\ - ${NULL} -! CFLAGS+= ${COPTS} ${CONF_LIBRARY} -I${TIFF} -! LIBTIFF= ${TIFF}/libtiff.a -! LIBS= -L ../../libtiff -ltiff - - all: fax2ps - -! fax2ps: ${OBJS} ${LIBTIFF} - ${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} -lm - - ${OBJS}: defs.h ${TIFF}/tiffio.h -*************** -*** 48,51 **** - rm -f ${OBJS} fax2ps a.out core errs - - install: all -! /etc/install -f ${BIN} -m 755 fax2ps ---- 48,51 ---- - rm -f ${OBJS} fax2ps a.out core errs - - install: all -! install -o bin -g bin -c -s -m 755 fax2ps ${BIN} +--- libtiff/Makefile.in.orig Tue Sep 2 19:54:19 1997 ++++ libtiff/Makefile.in Mon Dec 1 00:20:35 1997 +@@ -197,7 +197,8 @@ + @rm -f libtiff_pic.a + @${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q` + ${RANLIB} libtiff_pic.a +- ${LD} -x -Bshareable -Bforcearchive -o libtiff.@DSOSUF@ libtiff_pic.a ++ if [ `uname -m` != "alpha" ]; then ${LD} -x -Bshareable -Bforcearchive -o libtiff.@DSOSUF@ libtiff_pic.a ; fi ++ if [ `uname -m` = "alpha" ]; then ${LD} -x -Bshareable -o libtiff.@DSOSUF@ libtiff_pic.a ; fi + rm -f libtiff_pic.a + touch $@ + # linux ELF shared lib rule diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad deleted file mode 100644 index 001b2b3e4d1..00000000000 --- a/graphics/tiff/patches/patch-ad +++ /dev/null @@ -1,64 +0,0 @@ -*** Makefile.orig Fri Sep 30 01:01:19 1994 ---- Makefile Mon Nov 14 22:20:02 1994 -*************** -*** 209,218 **** - ${NULL} - - all default: -! -cd libtiff; ${MAKE} -! -cd tools; ${MAKE} -! -cd contrib/fax2ps; ${MAKE} -! -cd contrib/dbs; ${MAKE} - - clean: - -cd libtiff; ${MAKE} clean; rm -f Makefile ---- 209,257 ---- - ${NULL} - - all default: -! cd libtiff; ${MAKE} PREFIX=${PREFIX} -! cd tools; ${MAKE} PREFIX=${PREFIX} -! cd contrib/fax2ps; ${MAKE} PREFIX=${PREFIX} -! #-cd contrib/dbs; ${MAKE} -! -! install: -! cd libtiff; ${MAKE} PREFIX=${PREFIX} install -! cd tools; ${MAKE} PREFIX=${PREFIX} install -! cd contrib/fax2ps; ${MAKE} PREFIX=${PREFIX} install -! (cd man/man1 ; install -c fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 \ -! ras2tiff.1 rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 \ -! tiff2ps.1 tiffcmp.1 tiffcp.1 tiffdither.1 tiffdump.1 tiffgt.1 \ -! tiffinfo.1 tiffmedian.1 tiffsplit.1 tiffsv.1 \ -! ${PREFIX}/man/man1/ ) -! install -c man/man3/TIFFClose.3t ${PREFIX}/man/man3/TIFFClose.3 -! install -c man/man3/TIFFError.3t ${PREFIX}/man/man3/TIFFError.3 -! install -c man/man3/TIFFFlush.3t ${PREFIX}/man/man3/TIFFFlush.3 -! install -c man/man3/TIFFGetField.3t ${PREFIX}/man/man3/TIFFGetField.3 -! install -c man/man3/TIFFOpen.3t ${PREFIX}/man/man3/TIFFOpen.3 -! install -c man/man3/TIFFPrintDirectory.3t ${PREFIX}/man/man3/TIFFPrintDirectory.3 -! install -c man/man3/TIFFReadDirectory.3t ${PREFIX}/man/man3/TIFFReadDirectory.3 -! install -c man/man3/TIFFReadEncodedStrip.3t ${PREFIX}/man/man3/TIFFReadEncodedStrip.3 -! install -c man/man3/TIFFReadEncodedTile.3t ${PREFIX}/man/man3/TIFFReadEncodedTile.3 -! install -c man/man3/TIFFReadRGBAImage.3t ${PREFIX}/man/man3/TIFFReadRGBAImage.3 -! install -c man/man3/TIFFReadRawStrip.3t ${PREFIX}/man/man3/TIFFReadRawStrip.3 -! install -c man/man3/TIFFReadRawTile.3t ${PREFIX}/man/man3/TIFFReadRawTile.3 -! install -c man/man3/TIFFReadScanline.3t ${PREFIX}/man/man3/TIFFReadScanline.3 -! install -c man/man3/TIFFReadTile.3t ${PREFIX}/man/man3/TIFFReadTile.3 -! install -c man/man3/TIFFSetDirectory.3t ${PREFIX}/man/man3/TIFFSetDirectory.3 -! install -c man/man3/TIFFSetField.3t ${PREFIX}/man/man3/TIFFSetField.3 -! install -c man/man3/TIFFWarning.3t ${PREFIX}/man/man3/TIFFWarning.3 -! install -c man/man3/TIFFWriteDirectory.3t ${PREFIX}/man/man3/TIFFWriteDirectory.3 -! install -c man/man3/TIFFWriteEncodedStrip.3t ${PREFIX}/man/man3/TIFFWriteEncodedStrip.3 -! install -c man/man3/TIFFWriteEncodedTile.3t ${PREFIX}/man/man3/TIFFWriteEncodedTile.3 -! install -c man/man3/TIFFWriteRawStrip.3t ${PREFIX}/man/man3/TIFFWriteRawStrip.3 -! install -c man/man3/TIFFWriteRawTile.3t ${PREFIX}/man/man3/TIFFWriteRawTile.3 -! install -c man/man3/TIFFWriteScanline.3t ${PREFIX}/man/man3/TIFFWriteScanline.3 -! install -c man/man3/intro.3t ${PREFIX}/man/man3/TIFFintro.3 -! install -c man/man3/query.3t ${PREFIX}/man/man3/TIFFquery.3 -! install -c man/man3/size.3t ${PREFIX}/man/man3/TIFFsize.3 -! install -c man/man3/strip.3t ${PREFIX}/man/man3/TIFFstrip.3 -! install -c man/man3/swab.3t ${PREFIX}/man/man3/TIFFswab.3 -! install -c man/man3/tile.3t ${PREFIX}/man/man3/TIFFtile.3 - - clean: - -cd libtiff; ${MAKE} clean; rm -f Makefile diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae deleted file mode 100644 index ee62e63104e..00000000000 --- a/graphics/tiff/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -*** tools/tiffcp.c.orig Mon Nov 14 20:03:35 1994 ---- tools/tiffcp.c Mon Nov 14 20:05:38 1994 -*************** -*** 30,36 **** ---- 30,42 ---- - - #include "tiffio.h" - -+ #ifdef _HAVE_PARAM_H -+ #include <sys/param.h> -+ #endif -+ -+ #if (defined(BSD) && (BSD < 199103)) - typedef unsigned char u_char; -+ #endif - - #if defined(VMS) - #define unlink delete diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af deleted file mode 100644 index ad970fcfd10..00000000000 --- a/graphics/tiff/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -*** libtiff/tiffcomp.h.orig Fri Sep 30 03:01:28 1994 ---- libtiff/tiffcomp.h Wed Oct 4 04:23:03 1995 -*************** -*** 78,83 **** ---- 78,84 ---- - #define L_INCR SEEK_CUR - #define L_XTND SEEK_END - #endif /* defined(SYSV) || defined(VMS) */ -+ #include <unistd.h> - #ifndef L_SET - #define L_SET 0 - #define L_INCR 1 diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag deleted file mode 100644 index 5eba4b06351..00000000000 --- a/graphics/tiff/patches/patch-ag +++ /dev/null @@ -1,28 +0,0 @@ -*** tools/thumbnail.c.orig Fri Sep 30 03:01:53 1994 ---- tools/thumbnail.c Wed Oct 4 04:48:00 1995 -*************** -*** 25,34 **** - */ - - #include <stdio.h> -- #include <getopt.h> - #include <stdlib.h> - #include <string.h> - #include <sys/param.h> - #include <math.h> - - #include "tiffio.h" ---- 25,37 ---- - */ - - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <sys/param.h> -+ #if defined(BSD) && BSD >= 199506 -+ /* Lite2, need this for getopt() */ -+ #include <unistd.h> -+ #endif - #include <math.h> - - #include "tiffio.h" diff --git a/graphics/tiff/pkg/PLIST b/graphics/tiff/pkg/PLIST index 2d4d1fcb1c5..5bc4195ae02 100644 --- a/graphics/tiff/pkg/PLIST +++ b/graphics/tiff/pkg/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:00:16 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1997/12/01 00:02:10 hubertf Exp $ bin/fax2tiff +bin/fax2ps bin/gif2tiff bin/pal2rgb bin/ppm2tiff @@ -15,58 +16,114 @@ bin/tiffdump bin/tiffinfo bin/tiffmedian bin/tiffsplit -bin/fax2ps lib/libtiff.a -@exec ranlib %D/%F -lib/libtiff.so.3.3 -@exec /sbin/ldconfig -m %B +lib/libtiff.so.3.0 +@exec /sbin/ldconfig -m %B || true +@unexec /sbin/ldconfig -m %B || true include/tiff.h include/tiffio.h -man/man1/fax2tiff.1.gz -man/man1/gif2tiff.1.gz -man/man1/pal2rgb.1.gz -man/man1/ppm2tiff.1.gz -man/man1/ras2tiff.1.gz -man/man1/rgb2ycbcr.1.gz -man/man1/sgi2tiff.1.gz -man/man1/thumbnail.1.gz -man/man1/tiff2bw.1.gz -man/man1/tiff2ps.1.gz -man/man1/tiffcmp.1.gz -man/man1/tiffcp.1.gz -man/man1/tiffdither.1.gz -man/man1/tiffdump.1.gz -man/man1/tiffgt.1.gz -man/man1/tiffinfo.1.gz -man/man1/tiffmedian.1.gz -man/man1/tiffsplit.1.gz -man/man1/tiffsv.1.gz -man/man3/TIFFClose.3.gz -man/man3/TIFFError.3.gz -man/man3/TIFFFlush.3.gz -man/man3/TIFFGetField.3.gz -man/man3/TIFFOpen.3.gz -man/man3/TIFFPrintDirectory.3.gz -man/man3/TIFFReadDirectory.3.gz -man/man3/TIFFReadEncodedStrip.3.gz -man/man3/TIFFReadEncodedTile.3.gz -man/man3/TIFFReadRGBAImage.3.gz -man/man3/TIFFReadRawStrip.3.gz -man/man3/TIFFReadRawTile.3.gz -man/man3/TIFFReadScanline.3.gz -man/man3/TIFFReadTile.3.gz -man/man3/TIFFSetDirectory.3.gz -man/man3/TIFFSetField.3.gz -man/man3/TIFFWarning.3.gz -man/man3/TIFFWriteDirectory.3.gz -man/man3/TIFFWriteEncodedStrip.3.gz -man/man3/TIFFWriteEncodedTile.3.gz -man/man3/TIFFWriteRawStrip.3.gz -man/man3/TIFFWriteRawTile.3.gz -man/man3/TIFFWriteScanline.3.gz -man/man3/TIFFintro.3.gz -man/man3/TIFFquery.3.gz -man/man3/TIFFsize.3.gz -man/man3/TIFFstrip.3.gz -man/man3/TIFFswab.3.gz -man/man3/TIFFtile.3.gz +man/man1/fax2ps.1 +man/man1/fax2tiff.1 +man/man1/gif2tiff.1 +man/man1/pal2rgb.1 +man/man1/ppm2tiff.1 +man/man1/ras2tiff.1 +man/man1/rgb2ycbcr.1 +man/man1/sgi2tiff.1 +man/man1/thumbnail.1 +man/man1/tiff2bw.1 +man/man1/tiff2ps.1 +man/man1/tiffcmp.1 +man/man1/tiffcp.1 +man/man1/tiffdither.1 +man/man1/tiffdump.1 +man/man1/tiffgt.1 +man/man1/tiffinfo.1 +man/man1/tiffmedian.1 +man/man1/tiffsplit.1 +man/man1/tiffsv.1 +man/man3/TIFFCheckTile.3 +man/man3/TIFFClose.3 +man/man3/TIFFComputeStrip.3 +man/man3/TIFFComputeTile.3 +man/man3/TIFFCurrentDirectory.3 +man/man3/TIFFCurrentRow.3 +man/man3/TIFFCurrentStrip.3 +man/man3/TIFFCurrentTile.3 +man/man3/TIFFDefaultStripSize.3 +man/man3/TIFFDefaultTileSize.3 +man/man3/TIFFError.3 +man/man3/TIFFFdOpen.3 +man/man3/TIFFFileName.3 +man/man3/TIFFFileno.3 +man/man3/TIFFFindCODEC.3 +man/man3/TIFFFlush.3 +man/man3/TIFFFlushData.3 +man/man3/TIFFGetField.3 +man/man3/TIFFGetMode.3 +man/man3/TIFFIsByteSwapped.3 +man/man3/TIFFIsMSB2LSB.3 +man/man3/TIFFIsTiled.3 +man/man3/TIFFIsUpSampled.3 +man/man3/TIFFLastDirectory.3 +man/man3/TIFFNumberOfStrips.3 +man/man3/TIFFNumberOfTiles.3 +man/man3/TIFFOpen.3 +man/man3/TIFFPrintDirectory.3 +man/man3/TIFFRGBAImage.3 +man/man3/TIFFRGBAImageBegin.3 +man/man3/TIFFRGBAImageEnd.3 +man/man3/TIFFRGBAImageGet.3 +man/man3/TIFFRGBAImageOK.3 +man/man3/TIFFReadBufferSetup.3 +man/man3/TIFFReadDirectory.3 +man/man3/TIFFReadEncodedStrip.3 +man/man3/TIFFReadEncodedTile.3 +man/man3/TIFFReadRGBAImage.3 +man/man3/TIFFReadRawStrip.3 +man/man3/TIFFReadRawTile.3 +man/man3/TIFFReadScanline.3 +man/man3/TIFFReadTile.3 +man/man3/TIFFRegisterCODEC.3 +man/man3/TIFFReverseBits.3 +man/man3/TIFFScanlineSize.3 +man/man3/TIFFSetDirectory.3 +man/man3/TIFFSetErrorHandler.3 +man/man3/TIFFSetField.3 +man/man3/TIFFSetSubDirectory.3 +man/man3/TIFFSetWarningHandler.3 +man/man3/TIFFStripSize.3 +man/man3/TIFFSwabArrayOfLong.3 +man/man3/TIFFSwabArrayOfShort.3 +man/man3/TIFFSwabLong.3 +man/man3/TIFFSwabShort.3 +man/man3/TIFFTileRowSize.3 +man/man3/TIFFTileSize.3 +man/man3/TIFFUnRegisterCODEC.3 +man/man3/TIFFVGetField.3 +man/man3/TIFFVSetField.3 +man/man3/TIFFVStripSize.3 +man/man3/TIFFVTileSize.3 +man/man3/TIFFWarning.3 +man/man3/TIFFWriteBufferSetup.3 +man/man3/TIFFWriteDirectory.3 +man/man3/TIFFWriteEncodedStrip.3 +man/man3/TIFFWriteEncodedTile.3 +man/man3/TIFFWriteRawStrip.3 +man/man3/TIFFWriteRawTile.3 +man/man3/TIFFWriteScanline.3 +man/man3/TIFFbuffer.3 +man/man3/TIFFcodec.3 +man/man3/TIFFfree.3 +man/man3/TIFFmalloc.3 +man/man3/TIFFmemcmp.3 +man/man3/TIFFmemcpy.3 +man/man3/TIFFmemory.3 +man/man3/TIFFmemset.3 +man/man3/TIFFquery.3 +man/man3/TIFFrealloc.3 +man/man3/TIFFsize.3 +man/man3/TIFFstrip.3 +man/man3/TIFFswab.3 +man/man3/TIFFtile.3 +man/man3/libtiff.3 |