From 0df81524e7e554c5a54827cc2c20d4d799f3bce5 Mon Sep 17 00:00:00 2001 From: Chris Piazza Date: Wed, 24 Nov 1999 23:37:02 +0000 Subject: Update to ver 3.5.2 and revise COMMENT PR: 15078 Submitted by: KATO Tsuguru --- graphics/tiff/Makefile | 67 ++++++++++++++++++------------------------ graphics/tiff/distinfo | 3 +- graphics/tiff/files/patch-aa | 32 ++++++++++++++++---- graphics/tiff/files/patch-ae | 11 +++++++ graphics/tiff/pkg-comment | 2 +- graphics/tiff/pkg-plist | 4 +-- graphics/tiff/pkg-plist.nodocs | 1 + 7 files changed, 71 insertions(+), 49 deletions(-) create mode 100644 graphics/tiff/files/patch-ae diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 3901322a739d..63004a9c725f 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,5 +1,5 @@ # New ports collection makefile for: tiff -# Version required: 3.5.1 +# Version required: 3.5.2 # Date created: 8 October 1996 # Whom: Richard Hwang # Mikhail Teterin @@ -8,32 +8,35 @@ # $FreeBSD$ # -DISTNAME= tiff-v3.5.1 -PKGNAME= tiff-3.5.1 +DISTNAME= tiff-v3.5.2 +PKGNAME= tiff-3.5.2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.onshore.com/pub/libtiff/ \ http://www.libtiff.org/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-ZIP --with-JPEG --with-DIR_BIN=${PREFIX}/bin \ +CONFIGURE_ARGS= --with-ZIP --with-JPEG \ + --with-DIR_BIN=${PREFIX}/bin \ --with-DIR_LIB=${PREFIX}/lib \ --with-DIR_INC=${PREFIX}/include \ --with-DIR_MAN=${PREFIX}/man \ --with-CC="${CC}" --with-GCOPTS="${CFLAGS}" \ - --with-DIRS_LIBINC=${PREFIX}/include \ + --with-DIRS_LIBINC=${LOCALBASE}/include \ --with-DIR_GZLIB=/usr/lib \ - --with-DIR_JPEGLIB=${PREFIX}/lib \ + --with-DIR_JPEGLIB=${LOCALBASE}/lib \ --with-LIBGL=no --with-LIBIMAGE=no \ --with-INSTALL="${SH} ${WRKSRC}/port/install.sh" \ --noninteractive .if defined(NOPORTDOCS) -CONFIGURE_ARGS+=--with-HTML=no -PLIST=${PKGDIR}/PLIST.nodocs +CONFIGURE_ARGS+= --with-HTML=no +PLIST= ${PKGDIR}/PLIST.nodocs +.else +CONFIGURE_ARGS+= --with-HTML --with-DIR_HTML=${PREFIX}/share/doc/tiff .endif MAN1= fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \ @@ -51,37 +54,23 @@ MAN3= TIFFCheckTile.3t TIFFClose.3t TIFFComputeStrip.3t TIFFComputeTile.3t \ TIFFRGBAImage.3t TIFFRGBAImageBegin.3t TIFFRGBAImageEnd.3t \ TIFFRGBAImageGet.3t TIFFRGBAImageOK.3t TIFFReadBufferSetup.3t \ TIFFReadDirectory.3t TIFFReadEncodedStrip.3t TIFFReadEncodedTile.3t \ - TIFFReadRGBAImage.3t TIFFReadRawStrip.3t TIFFReadRawTile.3t \ - TIFFReadScanline.3t TIFFReadTile.3t TIFFRegisterCODEC.3t \ - TIFFReverseBits.3t TIFFScanlineSize.3t TIFFSetDirectory.3t \ - TIFFSetErrorHandler.3t TIFFSetField.3t TIFFSetSubDirectory.3t \ - TIFFSetWarningHandler.3t TIFFStripSize.3t TIFFSwabArrayOfLong.3t \ - TIFFSwabArrayOfShort.3t TIFFSwabLong.3t TIFFSwabShort.3t \ - TIFFTileRowSize.3t TIFFTileSize.3t TIFFUnRegisterCODEC.3t \ - TIFFVGetField.3t TIFFVSetField.3t TIFFVStripSize.3t TIFFVTileSize.3t \ - TIFFWarning.3t TIFFWriteBufferSetup.3t TIFFWriteDirectory.3t \ - TIFFWriteEncodedStrip.3t TIFFWriteEncodedTile.3t TIFFWriteRawStrip.3t \ - TIFFWriteRawTile.3t TIFFWriteScanline.3t TIFFbuffer.3t TIFFcodec.3t \ - TIFFfree.3t TIFFmalloc.3t TIFFmemcmp.3t TIFFmemcpy.3t TIFFmemory.3t \ - TIFFmemset.3t TIFFquery.3t TIFFrealloc.3t TIFFsize.3t TIFFstrip.3t \ - TIFFswab.3t TIFFtile.3t libtiff.3t - -DOCDIR= ${PREFIX}/share/doc/tiff - -.include + TIFFReadRGBAImage.3t TIFFReadRGBAStrip.3t TIFFReadRGBATile.3t \ + TIFFReadRawStrip.3t TIFFReadRawTile.3t TIFFReadScanline.3t \ + TIFFReadTile.3t TIFFRegisterCODEC.3t TIFFReverseBits.3t \ + TIFFScanlineSize.3t TIFFSetDirectory.3t TIFFSetErrorHandler.3t \ + TIFFSetField.3t TIFFSetSubDirectory.3t TIFFSetWarningHandler.3t \ + TIFFStripSize.3t TIFFSwabArrayOfLong.3t TIFFSwabArrayOfShort.3t \ + TIFFSwabLong.3t TIFFSwabShort.3t TIFFTileRowSize.3t TIFFTileSize.3t \ + TIFFUnRegisterCODEC.3t TIFFVGetField.3t TIFFVSetField.3t \ + TIFFVStripSize.3t TIFFVTileSize.3t TIFFWarning.3t \ + TIFFWriteBufferSetup.3t TIFFWriteDirectory.3t TIFFWriteEncodedStrip.3t \ + TIFFWriteEncodedTile.3t TIFFWriteRawStrip.3t TIFFWriteRawTile.3t \ + TIFFWriteScanline.3t TIFFbuffer.3t TIFFcodec.3t TIFFfree.3t \ + TIFFmalloc.3t TIFFmemcmp.3t TIFFmemcpy.3t TIFFmemory.3t TIFFmemset.3t \ + TIFFquery.3t TIFFrealloc.3t TIFFsize.3t TIFFstrip.3t TIFFswab.3t \ + TIFFtile.3t libtiff.3t post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCDIR}/images - ${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCDIR}/images - ${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCDIR}/images -.endif -.if ${PORTOBJFORMAT} == "aout" - ${LN} -sf libtiff.so.4.0 ${PREFIX}/lib/libtiff.so -.else - ${LN} -sf libtiff.so.4 ${PREFIX}/lib/libtiff.so -.endif ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.include +.include diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index 5e36b228ce5e..322275cd4f13 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,2 +1 @@ -MD5 (tiff-v3.5.1.tar.gz) = d5827ede22a6c98facf37dd07e5e2a0a -MD5 (tiff-v3.5.1.tar.gz) = dfcde380cff2c4538964de1634dd4d52 +MD5 (tiff-v3.5.2.tar.gz) = 2c498457556723485d488eb12c12fe95 diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa index dbec0b9f058f..e7a85ad71cdd 100644 --- a/graphics/tiff/files/patch-aa +++ b/graphics/tiff/files/patch-aa @@ -1,5 +1,5 @@ ---- libtiff/Makefile.in.orig Mon Apr 29 18:16:21 1996 -+++ libtiff/Makefile.in Mon Nov 23 22:11:22 1998 +--- libtiff/Makefile.in.orig Wed Sep 8 18:39:00 1999 ++++ libtiff/Makefile.in Wed Nov 24 07:31:09 1999 @@ -62,7 +62,7 @@ # CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@ @@ -9,21 +9,43 @@ CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY} # SRCS = \ -@@ -199,7 +199,16 @@ +@@ -197,8 +197,8 @@ + ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o + rm -f shr.o + touch $@ +-# NetBSD 1.1 or FreeBSD +-NETBSDdso FREEBSDdso: ${OBJS} ++# NetBSD 1.1 ++NETBSDdso: ${OBJS} + @rm -f libtiff_pic.a + @${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q` + ${RANLIB} libtiff_pic.a +@@ -215,7 +215,18 @@ # OSF/1 3.2 shared lib rule OSFdso: ${OBJS} ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm - ++# FreeBSD a.out shared lib rule +FREEBSD_AOUTdso: ${OBJS} + ${LD} -Bshareable -x ${LIBDIR}/c++rt0.o -o libtiff.@DSOSUF_VERSION@ \ + ${OBJS} @LIBJPEG@ @LIBGZ@ -+ @LN@ -sf libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ ++ @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ + touch $@ ++# FreeBSD ELF shared lib rule +FREEBSD_ELFdso: ${OBJS} + ${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ -o libtiff.@DSOSUF_VERSION@ \ + ${OBJS} @LIBJPEG@ @LIBGZ@ -+ @LN@ -sf libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ ++ @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ + touch $@ ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h +@@ -327,7 +338,7 @@ + ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ + -O libtiff.@DSOSUF_VERSION@; \ + ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ +- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ ++ -lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ + else \ + ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ + -O libtiff.@DSOSUF@; \ diff --git a/graphics/tiff/files/patch-ae b/graphics/tiff/files/patch-ae new file mode 100644 index 000000000000..cba57e93964c --- /dev/null +++ b/graphics/tiff/files/patch-ae @@ -0,0 +1,11 @@ +--- html/Makefile.in.orig Wed Jul 28 06:50:27 1999 ++++ html/Makefile.in Wed Nov 24 06:20:07 1999 +@@ -80,6 +80,8 @@ + images/cat.gif \ + images/cover.jpg \ + images/cramps.gif \ ++ images/dave.gif \ ++ images/info.gif \ + images/jello.jpg \ + images/jim.gif \ + images/note.gif \ diff --git a/graphics/tiff/pkg-comment b/graphics/tiff/pkg-comment index e2e18d9399d3..3682d46df4e0 100644 --- a/graphics/tiff/pkg-comment +++ b/graphics/tiff/pkg-comment @@ -1 +1 @@ -Libtiff provides support for the Tag Image File Format (TIFF) +Tools and library routines for working with TIFF images diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index b499b986c1c7..8485975bbaf1 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -8,6 +8,7 @@ bin/rgb2ycbcr bin/thumbnail bin/tiff2bw bin/tiff2ps +bin/tiff2rgba bin/tiffcmp bin/tiffcp bin/tiffdither @@ -26,7 +27,6 @@ share/doc/tiff/bugs.html share/doc/tiff/build.html share/doc/tiff/contrib.html share/doc/tiff/document.html -share/doc/tiff/images.html share/doc/tiff/images/back.gif share/doc/tiff/images/bali.jpg share/doc/tiff/images/cat.gif @@ -43,6 +43,7 @@ share/doc/tiff/images/ring.gif share/doc/tiff/images/smallliz.jpg share/doc/tiff/images/strike.gif share/doc/tiff/images/warning.gif +share/doc/tiff/images.html share/doc/tiff/index.html share/doc/tiff/internals.html share/doc/tiff/intro.html @@ -62,6 +63,5 @@ share/doc/tiff/v3.4beta033.html share/doc/tiff/v3.4beta034.html share/doc/tiff/v3.4beta035.html share/doc/tiff/v3.4beta036.html -share/doc/tiff/v3.5.1.html @dirrm share/doc/tiff/images @dirrm share/doc/tiff diff --git a/graphics/tiff/pkg-plist.nodocs b/graphics/tiff/pkg-plist.nodocs index 717b733c846b..8ee7e12c9017 100644 --- a/graphics/tiff/pkg-plist.nodocs +++ b/graphics/tiff/pkg-plist.nodocs @@ -8,6 +8,7 @@ bin/rgb2ycbcr bin/thumbnail bin/tiff2bw bin/tiff2ps +bin/tiff2rgba bin/tiffcmp bin/tiffcp bin/tiffdither -- cgit v1.2.3