1 files changed, 69 insertions, 70 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 45f3952c66fa..bedbbff1783b 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -8,10 +8,9 @@
 #
 
 PORTNAME=	tiff
-PORTVERSION=	3.5.5
-PORTREVISION=	1
+PORTVERSION=	3.5.7
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.onshore.com/pub/libtiff/ \
+MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://www.libtiff.org/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
@@ -27,6 +26,7 @@ CONFIGURE_ARGS=	--with-ZIP --with-JPEG \
 		--with-DIR_INC=${PREFIX}/include \
 		--with-DIR_MAN=${PREFIX}/man \
 		--with-CC="${CC}" --with-GCOPTS="${CFLAGS}" \
+		--with-OPTIMIZER="" \
 		--with-DIRS_LIBINC=${LOCALBASE}/include \
 		--with-DIR_GZLIB=/usr/lib \
 		--with-DIR_JPEGLIB=${LOCALBASE}/lib \
@@ -34,79 +34,78 @@ CONFIGURE_ARGS=	--with-ZIP --with-JPEG \
 		--with-INSTALL="${SH} ${WRKSRC}/port/install.sh" \
 		--noninteractive
 
-.if defined(NOPORTDOCS)
-PLIST=			${PKGDIR}/pkg-plist.nodocs
-.else
-CONFIGURE_ARGS+=	--with-HTML --with-DIR_HTML=${PREFIX}/share/doc/tiff
+.if !defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--with-HTML --with-DIR_HTML=${DOCSDIR}
 .endif
 
 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
+	rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 tiff2rgba.1 \
+	tiffcmp.1 tiffcp.1 tiffdither.1 tiffdump.1 tiffgt.1 tiffinfo.1 \
+	tiffmedian.1 tiffsplit.1 tiffsv.1 
 MAN3=	TIFFClose.3t TIFFError.3t TIFFFlush.3t TIFFGetField.3t TIFFOpen.3t \
-	TIFFPrintDirectory.3t TIFFquery.3t TIFFRGBAImage.3t \
-	TIFFReadDirectory.3t TIFFReadEncodedStrip.3t TIFFReadEncodedTile.3t \
-	TIFFReadRGBAImage.3t TIFFReadRGBAStrip.3t TIFFReadRGBATile.3t \
-	TIFFReadRawStrip.3t TIFFReadRawTile.3t TIFFReadScanline.3t \
-	TIFFReadTile.3t TIFFSetDirectory.3t TIFFSetField.3t TIFFWarning.3t \
+	TIFFPrintDirectory.3t TIFFRGBAImage.3t TIFFReadDirectory.3t \
+	TIFFReadEncodedStrip.3t TIFFReadEncodedTile.3t TIFFReadRGBAImage.3t \
+	TIFFReadRGBAStrip.3t TIFFReadRGBATile.3t TIFFReadRawStrip.3t \
+	TIFFReadRawTile.3t TIFFReadScanline.3t TIFFReadTile.3t \
+	TIFFSetDirectory.3t TIFFSetField.3t TIFFWarning.3t \
 	TIFFWriteDirectory.3t TIFFWriteEncodedStrip.3t \
 	TIFFWriteEncodedTile.3t TIFFWriteRawStrip.3t TIFFWriteRawTile.3t \
 	TIFFWriteScanline.3t TIFFWriteTile.3t TIFFbuffer.3t TIFFcodec.3t \
-	TIFFmemory.3t TIFFsize.3t TIFFstrip.3t TIFFswab.3t TIFFtile.3t \
-	libtiff.3t
-MLINKS=	TIFFError.3t        TIFFSetErrorHandler.3t \
-	TIFFFlush.3t        TIFFFlushData.3t \
-	TIFFGetField.3t     TIFFVGetField.3t \
-	TIFFOpen.3t         TIFFFdOpen.3t \
-	TIFFRGBAImage.3t    TIFFRGBAImageBegin.3t \
-	TIFFRGBAImage.3t    TIFFRGBAImageEnd.3t \
-	TIFFRGBAImage.3t    TIFFRGBAImageGet.3t \
-	TIFFRGBAImage.3t    TIFFRGBAImageOK.3t \
-	TIFFSetDirectory.3t TIFFSetSubDirectory.3t \
-	TIFFSetField.3t     TIFFVSetField.3t \
-	TIFFWarning.3t      TIFFSetWarningHandler.3t \
-	TIFFbuffer.3t       TIFFReadBufferSetup.3t \
-	TIFFbuffer.3t       TIFFWriteBufferSetup.3t \
-	TIFFcodec.3t        TIFFFindCODEC.3t \
-	TIFFcodec.3t        TIFFRegisterCODEC.3t \
-	TIFFcodec.3t        TIFFUnRegisterCODEC.3t \
-	TIFFmemory.3t       TIFFfree.3t \
-	TIFFmemory.3t       TIFFmalloc.3t \
-	TIFFmemory.3t       TIFFmemcmp.3t \
-	TIFFmemory.3t       TIFFmemcpy.3t \
-	TIFFmemory.3t       TIFFmemset.3t \
-	TIFFmemory.3t       TIFFrealloc.3t \
-	TIFFquery.3t        TIFFCurrentDirectory.3t \
-	TIFFquery.3t        TIFFCurrentRow.3t \
-	TIFFquery.3t        TIFFCurrentStrip.3t \
-	TIFFquery.3t        TIFFCurrentTile.3t \
-	TIFFquery.3t        TIFFFileName.3t \
-	TIFFquery.3t        TIFFFileno.3t \
-	TIFFquery.3t        TIFFGetMode.3t \
-	TIFFquery.3t        TIFFIsByteSwapped.3t \
-	TIFFquery.3t        TIFFIsMSB2LSB.3t \
-	TIFFquery.3t        TIFFIsTiled.3t \
-	TIFFquery.3t        TIFFIsUpSampled.3t \
-	TIFFquery.3t        TIFFLastDirectory.3t \
-	TIFFsize.3t         TIFFRasterScanlineSize.3t \
-	TIFFsize.3t         TIFFScanlineSize.3t \
-	TIFFstrip.3t        TIFFComputeStrip.3t \
-	TIFFstrip.3t        TIFFDefaultStripSize.3t \
-	TIFFstrip.3t        TIFFNumberOfStrips.3t \
-	TIFFstrip.3t        TIFFStripSize.3t \
-	TIFFstrip.3t        TIFFVStripSize.3t \
-	TIFFswab.3t         TIFFReverseBits.3t \
-	TIFFswab.3t         TIFFSwabArrayOfLong.3t \
-	TIFFswab.3t         TIFFSwabArrayOfShort.3t \
-	TIFFswab.3t         TIFFSwabLong.3t \
-	TIFFswab.3t         TIFFSwabShort.3t \
-	TIFFtile.3t         TIFFCheckTile.3t \
-	TIFFtile.3t         TIFFComputeTile.3t \
-	TIFFtile.3t         TIFFDefaultTileSize.3t \
-	TIFFtile.3t         TIFFNumberOfTiles.3t \
-	TIFFtile.3t         TIFFTileRowSize.3t \
-	TIFFtile.3t         TIFFTileSize.3t \
-	TIFFtile.3t         TIFFVTileSize.3t
+	TIFFmemory.3t TIFFquery.3t TIFFsize.3t TIFFstrip.3t TIFFswab.3t \
+	TIFFtile.3t libtiff.3t 
+MLINKS=	TIFFError.3t          TIFFSetErrorHandler.3t \
+	TIFFFlush.3t          TIFFFlushData.3t \
+	TIFFGetField.3t       TIFFVGetField.3t \
+	TIFFOpen.3t           TIFFFdOpen.3t \
+	TIFFOpen.3t           TIFFClientOpen.3t \
+	TIFFRGBAImage.3t      TIFFRGBAImageOK.3t \
+	TIFFRGBAImage.3t      TIFFRGBAImageBegin.3t \
+	TIFFRGBAImage.3t      TIFFRGBAImageGet.3t \
+	TIFFRGBAImage.3t      TIFFRGBAImageEnd.3t \
+	TIFFSetDirectory.3t   TIFFSetSubDirectory.3t \
+	TIFFSetField.3t       TIFFVSetField.3t \
+	TIFFWarning.3t        TIFFSetWarningHandler.3t \
+	TIFFWriteDirectory.3t TIFFRewriteDirectory.3t \
+	TIFFbuffer.3t         TIFFReadBufferSetup.3t \
+	TIFFbuffer.3t         TIFFWriteBufferSetup.3t \
+	TIFFcodec.3t          TIFFFindCODEC.3t \
+	TIFFcodec.3t          TIFFRegisterCODEC.3t \
+	TIFFcodec.3t          TIFFUnRegisterCODEC.3t \
+	TIFFmemory.3t         TIFFfree.3t \
+	TIFFmemory.3t         TIFFmalloc.3t \
+	TIFFmemory.3t         TIFFmemcmp.3t \
+	TIFFmemory.3t         TIFFmemcpy.3t \
+	TIFFmemory.3t         TIFFmemset.3t \
+	TIFFmemory.3t         TIFFrealloc.3t \
+	TIFFquery.3t          TIFFCurrentDirectory.3t \
+	TIFFquery.3t          TIFFCurrentRow.3t \
+	TIFFquery.3t          TIFFCurrentStrip.3t \
+	TIFFquery.3t          TIFFCurrentTile.3t \
+	TIFFquery.3t          TIFFFileName.3t \
+	TIFFquery.3t          TIFFFileno.3t \
+	TIFFquery.3t          TIFFGetMode.3t \
+	TIFFquery.3t          TIFFIsTiled.3t \
+	TIFFquery.3t          TIFFIsByteSwapped.3t \
+	TIFFquery.3t          TIFFIsUpSampled.3t \
+	TIFFquery.3t          TIFFIsMSB2LSB.3t \
+	TIFFquery.3t          TIFFLastDirectory.3t \
+	TIFFsize.3t           TIFFScanlineSize.3t \
+	TIFFstrip.3t          TIFFComputeStrip.3t \
+	TIFFstrip.3t          TIFFDefaultStripSize.3t \
+	TIFFstrip.3t          TIFFNumberOfStrips.3t \
+	TIFFstrip.3t          TIFFStripSize.3t \
+	TIFFstrip.3t          TIFFVStripSize.3t \
+	TIFFswab.3t           TIFFReverseBits.3t \
+	TIFFswab.3t           TIFFSwabArrayOfLong.3t \
+	TIFFswab.3t           TIFFSwabArrayOfShort.3t \
+	TIFFswab.3t           TIFFSwabLong.3t \
+	TIFFswab.3t           TIFFSwabShort.3t \
+	TIFFtile.3t           TIFFCheckTile.3t \
+	TIFFtile.3t           TIFFComputeTile.3t \
+	TIFFtile.3t           TIFFDefaultTileSize.3t \
+	TIFFtile.3t           TIFFNumberOfTiles.3t \
+	TIFFtile.3t           TIFFTileSize.3t \
+	TIFFtile.3t           TIFFTileRowSize.3t \
+	TIFFtile.3t           TIFFVTileSize.3t
 
 .include <bsd.port.mk>