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

upgrade to libtiff 3.5.7

Browse Source
This commit is contained in:
brad 2002-01-19 09:34:42 +00:00
parent dd89c248ad
commit 2bd845dea8
12 changed files with 181 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/tiff/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.22 2001/10/10 19:28:50 brad Exp $
# $OpenBSD: Makefile,v 1.23 2002/01/19 09:34:42 brad Exp $
COMMENT= "Tools and library routines for working with TIFF images"
COMMENT= "tools and library routines for working with TIFF images"
DISTNAME= tiff-v3.5.5
PKGNAME= tiff-3.5.5
DISTNAME= tiff-v3.5.7
PKGNAME= tiff-3.5.7
CATEGORIES= graphics
NEED_VERSION= 1.460
MASTER_SITES= http://www.libtiff.org/
NEED_VERSION= 1.500
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/
HOMEPAGE= http://www.libtiff.org/
@ -20,15 +20,11 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= simple
CONFIGURE_ARGS= --with-ZIP --with-JPEG \
--with-DIR_BIN='$${DESTDIR}${PREFIX}/bin' \
--with-DIR_LIB='$${DESTDIR}${PREFIX}/lib' \
--with-DIR_INC='$${DESTDIR}${PREFIX}/include' \
--with-DIR_MAN='$${DESTDIR}${PREFIX}/man' \
CONFIGURE_ARGS= --prefix="${PREFIX}" --with-ZIP --with-JPEG \
--with-CC="${CC}" --with-GCOPTS="${CFLAGS}" \
--with-DIRS_LIBINC="${PREFIX}/include" \
--with-DIR_GZLIB="/usr/lib" \
--with-DIR_JPEGLIB="${PREFIX}/lib" \
--with-DIRS_LIBINC="${LOCALBASE}/include" \
--with-OPTIMIZER="" --with-DIR_GZLIB="/usr/lib" \
--with-DIR_JPEGLIB="${LOCALBASE}/lib" \
--with-LIBGL="no" --with-LIBIMAGE="no" \
--with-INSTALL="sh ${WRKSRC}/port/install.sh" \
--noninteractive

3
graphics/tiff/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (tiff-v3.5.7.tar.gz) = 82243b5ae9b7c9e492aeebc501680990
RMD160 (tiff-v3.5.7.tar.gz) = 4654d21ba2ad8ecf54e54f5e6a5ace4df1410b38
SHA1 (tiff-v3.5.7.tar.gz) = a4c3e27b6625ee9daec7c7c35ec3dedf59c14ca7

3
graphics/tiff/files/md5
View File

@ -1,3 +0,0 @@
MD5 (tiff-v3.5.5.tar.gz) = 407d65a98c7621ad6e2c64cd3d1e7a40
RMD160 (tiff-v3.5.5.tar.gz) = 28014f2611ea66ea25788977b8c26cc6b96dd47f
SHA1 (tiff-v3.5.5.tar.gz) = e86acf234ea5d1423ff98d6607d49b150d822075

17
graphics/tiff/patches/patch-configure
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2001/10/10 15:15:00 wilfried Exp $
--- configure.orig Mon Mar 20 19:20:42 2000
+++ configure Wed Oct 10 17:07:22 2001
@@ -1155,6 +1155,13 @@ if [ "$DSO" = auto ]; then
DSO=FREEBSD
TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
;;
+ *-openbsd*)
+ DSOSUF=so
+ DSOSUF_VERSION=${DSOSUF}.35.5
+ LIBCOPTS='-fPIC'
+ DSO=OPENBSD
+ TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
+ ;;
*-linux*)
if [ -r /lib/libc.so.6 || -r /lib/libc.so.5 ]; then
DSOSUF=so.${DIST_MAJOR}

53
graphics/tiff/patches/patch-libtiff_Makefile_in
View File

@ -1,39 +1,22 @@
$OpenBSD: patch-libtiff_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
--- libtiff/Makefile.in.orig Sun Nov 28 21:15:36 1999
+++ libtiff/Makefile.in Wed Oct 10 17:07:22 2001
@@ -62,7 +62,6 @@ IPATH = -I. -I${SRCDIR} @COPT_LIBINC@
#
CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
COPTS = @GCOPTS@
-OPTIMIZER=-O
CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
#
SRCS = \
@@ -216,6 +215,9 @@ LINUXdso: ${OBJS}
OSFdso: ${OBJS}
${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
--- libtiff/Makefile.in.orig Sun Sep 9 11:56:04 2001
+++ libtiff/Makefile.in Tue Dec 4 00:01:22 2001
@@ -364,15 +364,15 @@ installPrivateHdrs: ${INCS_PRIVATE}
+OPENBSDdso: ${OBJS}
+ ${CC} -shared @LIBCOPTS@ -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@
+ touch $@
${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h
@@ -323,15 +325,9 @@ installHdrs: ${INCS}
-src $$i -O $$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.nostrip -m 555 -F @DIR_LIB@ \
-O libtiff.@DSOSUF_VERSION@; \
- ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \
- -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \
- else \
- ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \
if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \
- ${INSTALL} -idb tiff.sw.tools -m 555 -F ${DESTDIR}@DIR_LIB@ \
- -O libtiff.@DSOSUF_VERSION@; \
+ ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F \
+ ${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF_VERSION@; \
${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 ${DESTDIR}@DIR_LIB@ \
- -O libtiff.@DSOSUF@; \
- fi
+
+ ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 -F \
+ ${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF@; \
fi
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

12
graphics/tiff/patches/patch-libtiff_tif_fax3_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libtiff_tif_fax3_c,v 1.1 2002/01/19 09:34:42 brad Exp $
--- libtiff/tif_fax3.c.orig Tue Dec 4 10:20:46 2001
+++ libtiff/tif_fax3.c Tue Dec 4 10:21:16 2001
@@ -315,7 +315,7 @@ Fax3Decode2D(TIFF* tif, tidata_t buf, ts
* this is <8 bytes. We optimize the code here to reflect the
* machine characteristics.
*/
-#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__)
+#if defined(__alpha) || _MIPS_SZLONG == 64 || defined(__LP64__) || defined(__arch64__)
#define FILL(n, cp) \
switch (n) { \
case 15:(cp)[14] = 0xff; case 14:(cp)[13] = 0xff; case 13: (cp)[12] = 0xff;\

12
graphics/tiff/patches/patch-libtiff_tiff_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libtiff_tiff_h,v 1.1 2002/01/19 09:34:42 brad Exp $
--- libtiff/tiff.h.orig Tue Dec 4 10:19:32 2001
+++ libtiff/tiff.h Tue Dec 4 10:20:07 2001
@@ -79,7 +79,7 @@ typedef char int8;
typedef unsigned char uint8;
typedef short int16;
typedef unsigned short uint16; /* sizeof (uint16) must == 2 */
-#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__)
+#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64) || defined(__LP64__) || defined(__arch64__)
typedef int int32;
typedef unsigned int uint32; /* sizeof (uint32) must == 4 */
#else

137
graphics/tiff/patches/patch-man_Makefile_in
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-man_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
--- man/Makefile.in.orig Mon Nov 29 17:42:44 1999
+++ man/Makefile.in Wed Oct 10 17:07:22 2001
@@ -41,6 +41,7 @@ ECHO = echo
--- man/Makefile.in.orig Wed Sep 26 13:32:24 2001
+++ man/Makefile.in Tue Dec 4 09:54:49 2001
@@ -42,6 +42,7 @@ ECHO = echo
SED = sed
MV = mv
RM = rm -f
@ -9,7 +8,7 @@ $OpenBSD: patch-man_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
INSTALL = @INSTALL@
#
@@ -82,7 +83,7 @@ MANLIBNAME = @MANLIBNAME@
@@ -83,7 +84,7 @@ MANLIBNAME = @MANLIBNAME@
# pathname prefix in the .so commands when setting
# up alternate files for multi-function manual pages.
#
@ -18,7 +17,7 @@ $OpenBSD: patch-man_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
MANTOOLS=\
apps/fax2tiff.1 \
@@ -274,59 +275,59 @@ lib/TIFFstrip.3t:: ${SRCDIR}/TIFFstrip.3
@@ -279,61 +280,61 @@ lib/TIFFstrip.3t:: ${SRCDIR}/TIFFstrip.3
lib/TIFFswab.3t:: ${SRCDIR}/TIFFswab.3t; ${MANCVT}
lib/TIFFtile.3t:: ${SRCDIR}/TIFFtile.3t; ${MANCVT}
@ -32,6 +31,7 @@ $OpenBSD: patch-man_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
-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/TIFFClientOpen.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" > $@
@ -42,6 +42,7 @@ $OpenBSD: patch-man_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
-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/TIFFRewriteDirectory.3t:; ${ECHO} ".so ${MANDIR}TIFFWriteDirectory.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" > $@
@ -75,77 +76,79 @@ $OpenBSD: patch-man_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
-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 $@
+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/TIFFClientOpen.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/TIFFRewriteDirectory.3t:; ${LN} ${MANDIR}TIFFWriteDirectory.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,7 +337,7 @@ apps/Makefile:
${ECHO} 'install:'; \
@@ -344,7 +345,7 @@ apps/Makefile:
for i in *.1; do \
f=${MANAPPNAME}; \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS} \
+ ${ECHO} ' cd ..; ${INSTALL} -m 444 -F $${DESTDIR}${MAN}/${MANAPPS}\
${ECHO} ' cd ..; ${INSTALL} -m 444 \
- -F ${DESTDIR}${MAN}/${MANAPPS} \
+ -F $${DESTDIR}${MAN}/${MANAPPS} \
-idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \
done \
)>apps/Makefile
@@ -348,7 +349,7 @@ lib/Makefile:
${ECHO} 'install:'; \
@@ -357,7 +358,7 @@ lib/Makefile:
for i in *.3t; do \
f=${MANLIBNAME}; \
- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB} \
+ ${ECHO} ' cd ..; ${INSTALL} -m 444 -F $${DESTDIR}${MAN}/${MANLIB} \
${ECHO} ' cd ..; ${INSTALL} -m 444 \
- -F ${DESTDIR}${MAN}/${MANLIB} \
+ -F $${DESTDIR}${MAN}/${MANLIB} \
-idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \
done \
)>lib/Makefile

43
graphics/tiff/patches/patch-tools_Makefile_in
View File

@ -1,35 +1,14 @@
$OpenBSD: patch-tools_Makefile_in,v 1.1 2001/10/10 15:15:00 wilfried Exp $
--- tools/Makefile.in.orig Tue Dec 21 00:46:11 1999
+++ tools/Makefile.in Wed Oct 10 17:07:22 2001
@@ -43,17 +43,16 @@ CC = @CCOMPILER@
INSTALL = @INSTALL@
#
COPTS = @GCOPTS@
-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 = @LIBPORT@ -ltiff ${LIBJPEG} ${LIBGZ} ${LIBPORT} @MACHDEPLIBS@
#
OBJS= \
fax2tiff.o \
@@ -108,8 +107,8 @@ all: ${TARGETS}
--- tools/Makefile.in.orig Mon Dec 3 21:14:22 2001
+++ tools/Makefile.in Mon Dec 3 21:20:08 2001
@@ -111,9 +111,9 @@ all: ${TARGETS}
true; \
fi
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@
+ ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
@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 \
+ ${INSTALL} -idb tiff.sw.tools -m 755 \
-dir ${DESTDIR}@DIR_BIN@
- ${INSTALL} -idb nostrip -idb tiff.sw.tools -m 755 \
+ ${INSTALL} -idb tiff.sw.tools -m 755 \
-F ${DESTDIR}@DIR_BIN@ -O ${TARGETS}
@if [ "@LIBIMAGE@" = yes ]; then \
${INSTALL} -idb tiff.sw.tools -m 755 \

45
graphics/tiff/patches/patch-tools_fax2ps_c
View File

@ -1,13 +1,38 @@
$OpenBSD: patch-tools_fax2ps_c,v 1.1 2001/10/10 15:15:00 wilfried Exp $
--- tools/fax2ps.c.orig Wed Mar 29 06:22:33 2000
+++ tools/fax2ps.c Wed Oct 10 17:07:22 2001
@@ -382,8 +382,7 @@ main(int argc, char** argv)
char temp[1024], buf[16*1024];
$OpenBSD: patch-tools_fax2ps_c,v 1.2 2002/01/19 09:34:42 brad Exp $
--- tools/fax2ps.c.orig Wed Mar 28 20:45:43 2001
+++ tools/fax2ps.c Fri Jan 18 23:48:37 2002
@@ -23,6 +23,7 @@
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE.
*/
+#include <errno.h>
#include <math.h>
#include <stdio.h>
#include <string.h>
@@ -370,15 +371,19 @@ main(int argc, char** argv)
} while (++optind < argc);
} else {
int n;
+ int sfd = -1;
FILE* fd;
- char temp[1024], buf[16*1024];
+ char temp[15] = "", buf[16*1024];
strcpy(temp, "/tmp/fax2psXXXXXX");
- strcpy(temp, "/tmp/fax2psXXXXXX");
- (void) mktemp(temp);
- fd = fopen(temp, "w");
+ fd = fdopen(mkstemp(temp), "w+");
if (fd == NULL) {
fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
exit(-2);
- if (fd == NULL) {
- fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
- exit(-2);
+ strlcpy(temp, "/tmp/fax2ps.XXXXXX", sizeof temp);
+ if ((sfd = mkstemp(temp)) == -1 ||
+ (fd = fdopen(sfd, "w+")) == NULL) {
+ if (sfd != -1) {
+ unlink(temp);
+ close(sfd);
+ }
+ fprintf(stderr, "%s: %s\n", temp, strerror(errno));
+ exit(-2);
}
while ((n = read(fileno(stdin), buf, sizeof (buf))) > 0)
write(fileno(fd), buf, n);

4
graphics/tiff/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 02:09:26 krw Exp $
lib/libtiff.so.35.5
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/01/19 09:34:42 brad Exp $
lib/libtiff.so.35.7
DYNLIBDIR(%B)

9
graphics/tiff/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2000/06/14 18:24:55 brad Exp $
@comment $OpenBSD: PLIST,v 1.8 2002/01/19 09:34:42 brad Exp $
bin/fax2ps
bin/fax2tiff
bin/gif2tiff
@ -16,10 +16,12 @@ 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
%%SHARED%%
man/man1/fax2ps.1
@ -33,6 +35,7 @@ man/man1/sgi2tiff.1
man/man1/thumbnail.1
man/man1/tiff2bw.1
man/man1/tiff2ps.1
man/man1/tiff2rgba.1
man/man1/tiffcmp.1
man/man1/tiffcp.1
man/man1/tiffdither.1
@ -43,6 +46,7 @@ man/man1/tiffmedian.1
man/man1/tiffsplit.1
man/man1/tiffsv.1
man/man3/TIFFCheckTile.3t
man/man3/TIFFClientOpen.3t
man/man3/TIFFClose.3t
man/man3/TIFFComputeStrip.3t
man/man3/TIFFComputeTile.3t
@ -88,6 +92,7 @@ man/man3/TIFFReadScanline.3t
man/man3/TIFFReadTile.3t
man/man3/TIFFRegisterCODEC.3t
man/man3/TIFFReverseBits.3t
man/man3/TIFFRewriteDirectory.3t
man/man3/TIFFScanlineSize.3t
man/man3/TIFFSetDirectory.3t
man/man3/TIFFSetErrorHandler.3t
@ -114,6 +119,7 @@ man/man3/TIFFWriteEncodedTile.3t
man/man3/TIFFWriteRawStrip.3t
man/man3/TIFFWriteRawTile.3t
man/man3/TIFFWriteScanline.3t
man/man3/TIFFWriteTile.3t
man/man3/TIFFbuffer.3t
man/man3/TIFFcodec.3t
man/man3/TIFFfree.3t
@ -172,5 +178,6 @@ 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
share/doc/tiff/v3.5.7.html
@dirrm share/doc/tiff/images
@dirrm share/doc/tiff