cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.5.7.

Browse Source 
PR:		32858
Submitted by:	Ports Fury
This commit is contained in:
Maxim Sobolev 2001-12-17 12:57:21 +00:00
parent 456bdd6c11
commit 1a2c013059
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=51663
10 changed files with 215 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
graphics/tiff/Makefile
View File

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

2
graphics/tiff/distinfo
View File

@ -1 +1 @@
MD5 (tiff-v3.5.5.tar.gz) = 407d65a98c7621ad6e2c64cd3d1e7a40
MD5 (tiff-v3.5.7.tar.gz) = 82243b5ae9b7c9e492aeebc501680990

76
graphics/tiff/files/patch-aa
View File

@ -1,63 +1,59 @@
--- libtiff/Makefile.in.orig Mon Nov 29 05:15:36 1999
+++ libtiff/Makefile.in Sat Apr 1 00:00:00 2000
@@ -62,7 +62,7 @@
#
CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
COPTS = @GCOPTS@
-OPTIMIZER=-O
+#OPTIMIZER=-O
CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
#
SRCS = \
@@ -197,8 +197,8 @@
${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o
rm -f shr.o
--- libtiff/Makefile.in.orig Mon Sep 10 00:56:04 2001
+++ libtiff/Makefile.in Sat Dec 15 00:00:00 2001
@@ -220,8 +220,8 @@
@LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@; \
fi
touch $@
-# NetBSD 1.1 or FreeBSD
-NETBSDdso FREEBSDdso: ${OBJS}
+# NetBSD 1.1
+NETBSDdso: ${OBJS}
-# NetBSD 1.1 or FreeBSD (old style)
-NETBSDdso FREEBSDdso oldOPENBSDdso: ${OBJS}
+# NetBSD 1.1 (old style)
+NETBSDdso oldOPENBSDdso: ${OBJS}
@rm -f libtiff_pic.a
@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
${RANLIB} libtiff_pic.a
@@ -215,7 +215,12 @@
@@ -239,6 +239,14 @@
# OSF/1 3.2 shared lib rule
OSFdso: ${OBJS}
${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
-
+# FreeBSD shared lib rule
+FREEBSDdso: ${OBJS}
+ ${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ -o libtiff.@DSOSUF_VERSION@ \
+ ${OBJS} @LIBJPEG@ @LIBGZ@
+ ${CC} -shared -Wl,-soname,libtiff.@DSOSUF_VERSION@ \
+ -o libtiff.@DSOSUF_VERSION@ ${OBJS} \
+ @LIBJPEG@ @LIBGZ@ @MACHDEPLIBS@
+ rm -f 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
@@ -319,22 +324,20 @@
${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@
for i in ${INCS}; do \
OPENBSDdso: ${OBJS}
${CC} -shared @LIBCOPTS@ -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ -lm
@@ -358,18 +366,15 @@
${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_INC@
for i in ${INCS_PRIVATE}; do \
f=`basename $$i`; \
- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@ \
- ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_INC@ \
- -src $$i -O $$f; \
+ ${BSD_INSTALL_DATA} $$i @DIR_INC@/$$f; \
+ ${BSD_INSTALL_DATA} $$i ${DESTDIR}@DIR_INC@/$$f; \
done
installDSO: @DSO@dso
if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \
- ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \
- ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@ \
- -O libtiff.@DSOSUF_VERSION@; \
+ ${BSD_INSTALL_DATA} libtiff.@DSOSUF_VERSION@ @DIR_LIB@; \
${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \
- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \
+ -lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \
+ ${BSD_INSTALL_DATA} libtiff.@DSOSUF_VERSION@ \
+ ${DESTDIR}@DIR_LIB@; \
${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \
-lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \
- ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \
- -lns libtiff.@DSOSUF@ -O libtiff.so; \
else \
${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \
${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@ \
-O libtiff.@DSOSUF@; \
fi
@@ -377,7 +382,7 @@
install: all installHdrs
${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@
- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a
+ ${BSD_INSTALL_DATA} libtiff.a @DIR_LIB@
${INSTALL} -idb tiff.sw.dev -m 755 -dir ${DESTDIR}@DIR_LIB@
- ${INSTALL} -idb tiff.sw.dev -m 444 -F ${DESTDIR}@DIR_LIB@ -O libtiff.a
+ ${BSD_INSTALL_DATA} libtiff.a ${DESTDIR}@DIR_LIB@
if [ @DSO@dso != nodso ]; then \
${MAKE} installDSO; \
${MAKE} -${MAKEFLAGS} installDSO; \
else \

38
graphics/tiff/files/patch-ab
View File

@ -1,18 +1,38 @@
--- configure.orig Mon Mar 20 20:20:42 2000
+++ configure Mon Sep 18 21:04:27 2000
@@ -1150,8 +1150,10 @@
--- configure.orig Fri Nov 16 02:21:05 2001
+++ configure Sat Dec 15 00:00:00 2001
@@ -170,10 +170,10 @@
esac
done
-DIR_BIN=${EPREFIX}/bin # destination for applications
-DIR_LIB=${EPREFIX}/lib # destination for library
-DIR_INC=${PREFIX}/include # destination for include files
-DIR_HTML=${PREFIX}/doc/libtiff # destination for HTML files
+#DIR_BIN=${EPREFIX}/bin # destination for applications
+#DIR_LIB=${EPREFIX}/lib # destination for library
+#DIR_INC=${PREFIX}/include # destination for include files
+#DIR_HTML=${PREFIX}/doc/libtiff # destination for HTML files
if [ -n "$ac_prev" ]; then
bitch "configure: missing argument to --`echo $ac_prev | sed 's/_/-/g'`"
@@ -1172,11 +1172,12 @@
TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
;;
*-freebsd*)
- DSOSUF=so.${DIST_MAJOR}.0
- DSOSUF=so.${DIST_MAJOR}
- DSOSUF_VERSION=${DSOSUF}.${DIST_MINOR}.${DIST_POINT}
- LIBCOPTS='-fPIC'
+ DSOSUF=so
LIBCOPTS='-fpic -fPIC'
+ DSOSUF_VERSION=${DSOSUF}.4
+ DSOOPTS='-shared'
DSO=FREEBSD
TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
+ LIBCOPTS='-fPIC -DPIC'
DSOOPTS='-shared'
- DSO=GNULD
+ DSO=FREEBSD
+ TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
;;
@@ -1256,7 +1258,7 @@
*-openbsd*)
DSOSUF=so.${DIST_MAJOR}.${DIST_MINOR}
@@ -1300,7 +1301,7 @@
# Check if ln -s creates a symbolic link.
#
if [ -z "${LN_S-}" ]; then

45
graphics/tiff/files/patch-ac
View File

@ -1,35 +1,12 @@
--- tools/Makefile.in.orig Tue Dec 21 08:46:11 1999
+++ tools/Makefile.in Sat Apr 1 00:00:00 2000
@@ -43,17 +43,17 @@
INSTALL = @INSTALL@
#
COPTS = @GCOPTS@
-OPTIMIZER=-O
+#OPTIMIZER=-O
IPATH = -I. -I${SRCDIR} -I${LIBDIR}
-CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
+CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
#
-TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@
+TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
LIBJPEG = @LIBJPEG@
LIBGZ = @LIBGZ@
LIBTIFF = @TIFFLIBREF@
LIBPORT = @LIBPORT@
MACHLIBS= @MACHDEPLIBS@
-LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
+LIBS = ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} -ltiff
#
OBJS= \
fax2tiff.o \
@@ -108,8 +108,8 @@
true; \
fi
--- tools/Makefile.in.orig Tue Jul 17 22:13:37 2001
+++ tools/Makefile.in Sat Dec 15 00:00:00 2001
@@ -113,8 +113,7 @@
install: all
- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
+ ${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
+ ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
@if [ "@LIBIMAGE@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
else \
${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
-dir ${DESTDIR}@DIR_BIN@
- ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
- -F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
+ ${BSD_INSTALL_PROGRAM} ${TARGETS} ${DESTDIR}@DIR_BIN@
@if [ "@LIBIMAGE@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 \
-F ${DESTDIR}@DIR_BIN@ -O sgi2tiff; \

150
graphics/tiff/files/patch-ad
View File

@ -1,152 +1,26 @@
--- man/Makefile.in.orig Tue Nov 30 01:42:44 1999
+++ man/Makefile.in Sat Apr 1 00:00:00 2000
@@ -41,6 +41,7 @@
SED = sed
MV = mv
RM = rm -f
+LN = ln -sf
INSTALL = @INSTALL@
#
@@ -82,7 +83,7 @@
# pathname prefix in the .so commands when setting
# up alternate files for multi-function manual pages.
#
-#MANDIR = man3/
+MANDIR =
MANTOOLS=\
apps/fax2tiff.1 \
@@ -274,59 +275,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:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFCheckTile.3t:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFNumberOfTiles.3t:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFComputeStrip.3t:; ${LN} ${MANDIR}TIFFstrip.3t $@
+lib/TIFFNumberOfStrips.3t:; ${LN} ${MANDIR}TIFFstrip.3t $@
+lib/TIFFCurrentDirectory.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFCurrentRow.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFCurrentStrip.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFCurrentTile.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFFdOpen.3t:; ${LN} ${MANDIR}TIFFOpen.3t $@
+lib/TIFFFileName.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFFileno.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFFlushData.3t:; ${LN} ${MANDIR}TIFFFlush.3t $@
+lib/TIFFGetMode.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFIsTiled.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFIsByteSwapped.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFIsUpSampled.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFIsMSB2LSB.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFLastDirectory.3t:; ${LN} ${MANDIR}TIFFquery.3t $@
+lib/TIFFReverseBits.3t:; ${LN} ${MANDIR}TIFFswab.3t $@
+lib/TIFFRGBAImageOK.3t:; ${LN} ${MANDIR}TIFFRGBAImage.3t $@
+lib/TIFFRGBAImageBegin.3t:; ${LN} ${MANDIR}TIFFRGBAImage.3t $@
+lib/TIFFRGBAImageGet.3t:; ${LN} ${MANDIR}TIFFRGBAImage.3t $@
+lib/TIFFRGBAImageEnd.3t:; ${LN} ${MANDIR}TIFFRGBAImage.3t $@
+lib/TIFFSetErrorHandler.3t:; ${LN} ${MANDIR}TIFFError.3t $@
+lib/TIFFSetSubDirectory.3t:; ${LN} ${MANDIR}TIFFSetDirectory.3t $@
+lib/TIFFSetWarningHandler.3t:; ${LN} ${MANDIR}TIFFWarning.3t $@
+lib/TIFFSwabArrayOfLong.3t:; ${LN} ${MANDIR}TIFFswab.3t $@
+lib/TIFFSwabArrayOfShort.3t:; ${LN} ${MANDIR}TIFFswab.3t $@
+lib/TIFFSwabLong.3t:; ${LN} ${MANDIR}TIFFswab.3t $@
+lib/TIFFSwabShort.3t:; ${LN} ${MANDIR}TIFFswab.3t $@
+lib/TIFFScanlineSize.3t:; ${LN} ${MANDIR}TIFFsize.3t $@
+lib/TIFFRasterScanlineSize.3t:; ${LN} ${MANDIR}TIFFsize.3t $@
+lib/TIFFDefaultStripSize.3t:; ${LN} ${MANDIR}TIFFstrip.3t $@
+lib/TIFFStripSize.3t:; ${LN} ${MANDIR}TIFFstrip.3t $@
+lib/TIFFVStripSize.3t:; ${LN} ${MANDIR}TIFFstrip.3t $@
+lib/TIFFTileSize.3t:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFVTileSize.3t:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFDefaultTileSize.3t:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFTileRowSize.3t:; ${LN} ${MANDIR}TIFFtile.3t $@
+lib/TIFFVGetField.3t:; ${LN} ${MANDIR}TIFFGetField.3t $@
+lib/TIFFVSetField.3t:; ${LN} ${MANDIR}TIFFSetField.3t $@
+lib/TIFFFindCODEC.3t:; ${LN} ${MANDIR}TIFFcodec.3t $@
+lib/TIFFRegisterCODEC.3t:; ${LN} ${MANDIR}TIFFcodec.3t $@
+lib/TIFFUnRegisterCODEC.3t:; ${LN} ${MANDIR}TIFFcodec.3t $@
+lib/TIFFmalloc.3t:; ${LN} ${MANDIR}TIFFmemory.3t $@
+lib/TIFFrealloc.3t:; ${LN} ${MANDIR}TIFFmemory.3t $@
+lib/TIFFfree.3t:; ${LN} ${MANDIR}TIFFmemory.3t $@
+lib/TIFFmemset.3t:; ${LN} ${MANDIR}TIFFmemory.3t $@
+lib/TIFFmemcpy.3t:; ${LN} ${MANDIR}TIFFmemory.3t $@
+lib/TIFFmemcmp.3t:; ${LN} ${MANDIR}TIFFmemory.3t $@
+lib/TIFFReadBufferSetup.3t:; ${LN} ${MANDIR}TIFFbuffer.3t $@
+lib/TIFFWriteBufferSetup.3t:; ${LN} ${MANDIR}TIFFbuffer.3t $@
apps/Makefile:
test -d apps || mkdir apps
@@ -336,8 +337,7 @@
--- man/Makefile.in.orig Thu Sep 27 02:32:24 2001
+++ man/Makefile.in Sat Dec 15 00:00:00 2001
@@ -343,9 +343,8 @@
${ECHO} 'install:'; \
for i in *.1; do \
f=${MANAPPNAME}; \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS} \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 \
- -F ${DESTDIR}${MAN}/${MANAPPS} \
- -idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \
+ ${ECHO} ' ${BSD_INSTALL_MAN}' $$i ${MAN}/${MANAPPS}/$$f; \
+ ${ECHO} ' ${BSD_INSTALL_MAN}' \
+ $$i ${DESTDIR}${MAN}/${MANAPPS}/$$f; \
done \
)>apps/Makefile
lib/Makefile:
@@ -348,8 +348,7 @@
@@ -356,9 +355,8 @@
${ECHO} 'install:'; \
for i in *.3t; do \
f=${MANLIBNAME}; \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB} \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 \
- -F ${DESTDIR}${MAN}/${MANLIB} \
- -idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \
+ ${ECHO} ' ${BSD_INSTALL_MAN}' $$i ${MAN}/${MANLIB}/$$f; \
+ ${ECHO} ' ${BSD_INSTALL_MAN}' \
+ $$i ${DESTDIR}${MAN}/${MANLIB}/$$f; \
done \
)>lib/Makefile

17
graphics/tiff/files/patch-ae
View File

@ -1,15 +1,16 @@
--- html/Makefile.in.orig Tue Mar 28 02:05:55 2000
+++ html/Makefile.in Sat Apr 1 00:00:00 2000
@@ -76,8 +76,6 @@
--- html/Makefile.in.orig Tue Jul 17 22:13:37 2001
+++ html/Makefile.in Sat Dec 15 00:00:00 2001
@@ -77,8 +77,7 @@
v3.5.1.html \
v3.5.2.html \
v3.5.3.html \
- v3.5.4.html \
- v3.5.5.html \
+ v3.5.7.html \
${NULL}
IMAGES=\
images/back.gif \
@@ -85,6 +83,8 @@
@@ -86,6 +85,8 @@
images/cat.gif \
images/cover.jpg \
images/cramps.gif \
@ -18,13 +19,13 @@
images/jello.jpg \
images/jim.gif \
images/note.gif \
@@ -102,8 +102,7 @@
@@ -103,8 +104,7 @@
install: all
${INSTALL} -m 755 -dir -idb tiff.man.html ${HTML} ${HTML}/images
${INSTALL} -m 755 -dir -idb tiff.man.html ${DESTDIR}${HTML} ${HTML}/images
for i in ${HTMLFILES} ${IMAGES}; do \
- ${INSTALL} -idb tiff.man.html -m 444 -F ${HTML} \
- ${INSTALL} -idb tiff.man.html -m 444 -F ${DESTDIR}${HTML} \
- -src ${SRCDIR}/$$i -O $$i; \
+ ${BSD_INSTALL_DATA} ${SRCDIR}/$$i ${HTML}/$$i; \
+ ${BSD_INSTALL_DATA} ${SRCDIR}/$$i ${DESTDIR}${HTML}/$$i; \
done
clean:;

42
graphics/tiff/files/patch-tools::fax2ps.c
View File

@ -1,42 +0,0 @@
--- tools/fax2ps.c.orig Tue Sep 2 19:54:34 1997
+++ tools/fax2ps.c Sat Feb 13 16:43:01 1999
@@ -151,7 +151,7 @@
{
uint32 w, h;
uint16 unit;
- float xres, yres;
+ float xres, yres, scale = 1.0;
tstrip_t s, ns;
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &h);
@@ -174,21 +174,13 @@
printf("%%%%Page: \"%d\" %d\n", pageNumber, pageNumber);
printf("/$pageTop save def gsave\n");
- if (scaleToPage) {
- float yscale = pageHeight / (h/yres);
- float xscale = pageWidth / (w/xres);
- printf("%d %d translate\n",
- (int) (((basePageWidth - pageWidth) * points) * half),
- (int)((yscale*(h/yres)*points) +
- (basePageHeight - pageHeight) * points * half) );
- printf("%g %g scale\n", (72.*xscale)/xres, -(72.*yscale)/yres);
- } else {
- printf("%d %d translate\n",
- (int) ((basePageWidth - pageWidth) * points * half),
- (int)((72.*h/yres) +
- (basePageHeight - pageHeight) * points * half) );
- printf("%g %g scale\n", 72./xres, -72./yres);
- }
+ if (scaleToPage)
+ scale = pageHeight / (h/yres) < pageWidth / (w/xres) ?
+ pageHeight / (h/yres) : pageWidth / (w/xres);
+ printf("%g %g translate\n",
+ points * (pageWidth - scale*w/xres) * half,
+ points * (scale*h/yres + (pageHeight - scale*h/yres) * half));
+ printf("%g %g scale\n", points/xres*scale, -points/yres*scale);
printf("0 setgray\n");
TIFFSetField(tif, TIFFTAG_FAXFILLFUNC, printruns);
ns = TIFFNumberOfStrips(tif);

93
graphics/tiff/pkg-plist
View File

@ -15,55 +15,58 @@ bin/tiffdither
bin/tiffdump
bin/tiffinfo
bin/tiffmedian
bin/tiffset
bin/tiffsplit
include/tiff.h
include/tiffconf.h
include/tiffio.h
include/tiffvers.h
lib/libtiff.a
lib/libtiff.so
lib/libtiff.so.4
share/doc/tiff/bugs.html
share/doc/tiff/build.html
share/doc/tiff/contrib.html
share/doc/tiff/document.html
share/doc/tiff/images/back.gif
share/doc/tiff/images/bali.jpg
share/doc/tiff/images/cat.gif
share/doc/tiff/images/cover.jpg
share/doc/tiff/images/cramps.gif
share/doc/tiff/images/dave.gif
share/doc/tiff/images/info.gif
share/doc/tiff/images/jello.jpg
share/doc/tiff/images/jim.gif
share/doc/tiff/images/note.gif
share/doc/tiff/images/oxford.gif
share/doc/tiff/images/quad.jpg
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
share/doc/tiff/libtiff.html
share/doc/tiff/misc.html
share/doc/tiff/support.html
share/doc/tiff/tools.html
share/doc/tiff/v3.4beta007.html
share/doc/tiff/v3.4beta016.html
share/doc/tiff/v3.4beta018.html
share/doc/tiff/v3.4beta024.html
share/doc/tiff/v3.4beta028.html
share/doc/tiff/v3.4beta029.html
share/doc/tiff/v3.4beta031.html
share/doc/tiff/v3.4beta032.html
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
share/doc/tiff/v3.5.2.html
share/doc/tiff/v3.5.3.html
@dirrm share/doc/tiff/images
@dirrm share/doc/tiff
%%PORTDOCS%%share/doc/tiff/bugs.html
%%PORTDOCS%%share/doc/tiff/build.html
%%PORTDOCS%%share/doc/tiff/contrib.html
%%PORTDOCS%%share/doc/tiff/document.html
%%PORTDOCS%%share/doc/tiff/images/back.gif
%%PORTDOCS%%share/doc/tiff/images/bali.jpg
%%PORTDOCS%%share/doc/tiff/images/cat.gif
%%PORTDOCS%%share/doc/tiff/images/cover.jpg
%%PORTDOCS%%share/doc/tiff/images/cramps.gif
%%PORTDOCS%%share/doc/tiff/images/dave.gif
%%PORTDOCS%%share/doc/tiff/images/info.gif
%%PORTDOCS%%share/doc/tiff/images/jello.jpg
%%PORTDOCS%%share/doc/tiff/images/jim.gif
%%PORTDOCS%%share/doc/tiff/images/note.gif
%%PORTDOCS%%share/doc/tiff/images/oxford.gif
%%PORTDOCS%%share/doc/tiff/images/quad.jpg
%%PORTDOCS%%share/doc/tiff/images/ring.gif
%%PORTDOCS%%share/doc/tiff/images/smallliz.jpg
%%PORTDOCS%%share/doc/tiff/images/strike.gif
%%PORTDOCS%%share/doc/tiff/images/warning.gif
%%PORTDOCS%%share/doc/tiff/images.html
%%PORTDOCS%%share/doc/tiff/index.html
%%PORTDOCS%%share/doc/tiff/internals.html
%%PORTDOCS%%share/doc/tiff/intro.html
%%PORTDOCS%%share/doc/tiff/libtiff.html
%%PORTDOCS%%share/doc/tiff/misc.html
%%PORTDOCS%%share/doc/tiff/support.html
%%PORTDOCS%%share/doc/tiff/tools.html
%%PORTDOCS%%share/doc/tiff/v3.4beta007.html
%%PORTDOCS%%share/doc/tiff/v3.4beta016.html
%%PORTDOCS%%share/doc/tiff/v3.4beta018.html
%%PORTDOCS%%share/doc/tiff/v3.4beta024.html
%%PORTDOCS%%share/doc/tiff/v3.4beta028.html
%%PORTDOCS%%share/doc/tiff/v3.4beta029.html
%%PORTDOCS%%share/doc/tiff/v3.4beta031.html
%%PORTDOCS%%share/doc/tiff/v3.4beta032.html
%%PORTDOCS%%share/doc/tiff/v3.4beta033.html
%%PORTDOCS%%share/doc/tiff/v3.4beta034.html
%%PORTDOCS%%share/doc/tiff/v3.4beta035.html
%%PORTDOCS%%share/doc/tiff/v3.4beta036.html
%%PORTDOCS%%share/doc/tiff/v3.5.1.html
%%PORTDOCS%%share/doc/tiff/v3.5.2.html
%%PORTDOCS%%share/doc/tiff/v3.5.3.html
%%PORTDOCS%%share/doc/tiff/v3.5.7.html
%%PORTDOCS%%@dirrm share/doc/tiff/images
%%PORTDOCS%%@dirrm share/doc/tiff

24
graphics/tiff/pkg-plist.nodocs
View File

@ -1,24 +0,0 @@
bin/fax2ps
bin/fax2tiff
bin/gif2tiff
bin/pal2rgb
bin/ppm2tiff
bin/ras2tiff
bin/rgb2ycbcr
bin/thumbnail
bin/tiff2bw
bin/tiff2ps
bin/tiff2rgba
bin/tiffcmp
bin/tiffcp
bin/tiffdither
bin/tiffdump
bin/tiffinfo
bin/tiffmedian
bin/tiffsplit
include/tiff.h
include/tiffconf.h
include/tiffio.h
lib/libtiff.a
lib/libtiff.so
lib/libtiff.so.4