pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/tiff Upgrade tiff to 3.7.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e43b173b121
branches:  trunk
changeset: 486500:7e43b173b121
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Dec 28 23:10:09 2004 +0000

description:
Upgrade tiff to 3.7.1.

Remove OpenWindows workaround in pkgsrc for this.

Too many changes to include here.
See http://www.remotesensing.org/libtiff/v3.7.1.html
and http://www.remotesensing.org/libtiff/v3.7.0.html
and previous change files for changes information.

tiff-3.7.1 now includes the lzw compression code again.
It also uses autoconf and libtool now.

A new tool is bmp2tiff.

Docs are placed under share/doc/tiff/html instead of share/doc/html/tiff.

Many manpage symlinks are now missing. (This was reported to tiff list.)

diffstat:

 graphics/tiff/INSTALL.OpenWindows |   25 ---
 graphics/tiff/Makefile            |   61 +------
 graphics/tiff/PLIST               |  244 ++++++++++++++++-------------
 graphics/tiff/buildlink3.mk       |    4 +-
 graphics/tiff/distinfo            |   39 +---
 graphics/tiff/files/config.site   |   29 ---
 graphics/tiff/patches/patch-aa    |   56 +----
 graphics/tiff/patches/patch-ab    |   24 +-
 graphics/tiff/patches/patch-ac    |   23 +-
 graphics/tiff/patches/patch-ad    |  101 +----------
 graphics/tiff/patches/patch-ae    |   48 +----
 graphics/tiff/patches/patch-af    |   31 ---
 graphics/tiff/patches/patch-ag    |   62 -------
 graphics/tiff/patches/patch-ah    |   22 --
 graphics/tiff/patches/patch-ai    |   16 -
 graphics/tiff/patches/patch-aj    |  116 --------------
 graphics/tiff/patches/patch-ak    |   17 --
 graphics/tiff/patches/patch-al    |   87 ----------
 graphics/tiff/patches/patch-am    |   76 ---------
 graphics/tiff/patches/patch-an    |   60 -------
 graphics/tiff/patches/patch-ao    |  311 --------------------------------------
 graphics/tiff/patches/patch-ap    |   64 -------
 graphics/tiff/patches/patch-aq    |   23 --
 graphics/tiff/patches/patch-ar    |   55 ------
 graphics/tiff/patches/patch-as    |   13 -
 graphics/tiff/patches/patch-at    |   68 --------
 graphics/tiff/patches/patch-au    |  107 -------------
 graphics/tiff/patches/patch-av    |   17 --
 graphics/tiff/patches/patch-aw    |  100 ------------
 graphics/tiff/patches/patch-ax    |   44 -----
 30 files changed, 218 insertions(+), 1725 deletions(-)

diffs (truncated from 2155 to 300 lines):

diff -r 1f37d0bee145 -r 7e43b173b121 graphics/tiff/INSTALL.OpenWindows
--- a/graphics/tiff/INSTALL.OpenWindows Tue Dec 28 23:04:15 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: INSTALL.OpenWindows,v 1.4 2004/01/03 18:33:24 reed Exp $
-
-LIBTIFF="libtiff.so.3 libtiff.so"
-
-case ${STAGE} in
-POST-INSTALL)
-       for lib in ${LIBTIFF}; do
-               src="${PKG_PREFIX}/lib/${lib}"
-               dest="${X11BASE}/lib/${lib}"
-               if [ -f ${dest} ]; then
-                       ${MV} -f ${dest} ${dest}.openwin
-                       ${LN} -sf ${src} ${dest}
-               fi
-       done
-       ;;
-       
-POST-DEINSTALL)
-       for lib in ${LIBTIFF}; do
-               file="${X11BASE}/lib/${lib}"
-               if [ -f ${file}.openwin ]; then
-                       ${MV} -f ${file}.openwin ${file}
-               fi
-       done
-       ;;
-esac
diff -r 1f37d0bee145 -r 7e43b173b121 graphics/tiff/Makefile
--- a/graphics/tiff/Makefile    Tue Dec 28 23:04:15 2004 +0000
+++ b/graphics/tiff/Makefile    Tue Dec 28 23:10:09 2004 +0000
@@ -1,17 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2004/12/22 03:57:15 reed Exp $
+# $NetBSD: Makefile,v 1.61 2004/12/28 23:10:10 reed Exp $
 
-DISTNAME=      tiff-v3.6.1
-PKGNAME=       ${DISTNAME:S/-v/-/}
-PKGREVISION=   6
+DISTNAME=      tiff-3.7.1
 CATEGORIES=    graphics
-MASTER_SITES=  ftp://ftp.remotesensing.org/pub/libtiff/old/ \
-               ftp://ftp.fu-berlin.de/unix/graphics/tiff/old/
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
-# need DISTFILES above for adding lzw-files to it if USE_GIF is defined
-# in mk.conf
-DISTFILES+=    TIFFTechNote2.html
-# It is in CVS for Release-v3-6-1, but accidently excluded from distribution.
-SITES_TIFFTechNote2.html=      ${MASTER_SITE_LOCAL:=tiff/}
+MASTER_SITES=  ftp://ftp.remotesensing.org/pub/libtiff/ \
+               http://libtiff.maptools.org/dl/
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.remotesensing.org/libtiff/
@@ -19,56 +11,23 @@
 
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
-# use DIST_SUBDIR because TIFFTechNote2.html could be changed later
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-
 BUILD_DEFS+=   USE_GIF
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=        yes
 USE_LIBTOOL=   yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS=        --noninteractive --site=${FILESDIR} --prefix=${PREFIX}
-MAKE_ENV+=     PKGDIRMODE=${PKGDIRMODE}
+GNU_CONFIGURE= yes
+
+CONFIGURE_ARGS+=       --enable-rpath
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(X11BASE:M*openwin)
-USE_PKGINSTALL=                yes
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL.OpenWindows
-INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL.OpenWindows
-.endif
-
-post-extract:
-       ${CP} ${DISTDIR}/${DIST_SUBDIR}/TIFFTechNote2.html ${WRKSRC}/html/
-
-.if defined(USE_GIF)
-LZW_VERSION=   1.5
-DISTFILES+=    libtiff-lzw-compression-kit-${LZW_VERSION}.tar.gz
-EXTRACT_ONLY+= libtiff-lzw-compression-kit-${LZW_VERSION}.tar.gz
-LZWWRKDIR=     ${WRKDIR}/libtiff-lzw-compression-kit-${LZW_VERSION}
-pre-patch:
-       ${CP} ${LZWWRKDIR}/tif_lzw.c ${WRKSRC}/libtiff
+.if !defined(USE_GIF) || !empty(USE_GIF:M[Nn][Oo])
+# disable support for LZW algorithm
+CONFIGURE_ARGS+=       --disable-lzw
 .endif
 
-CPPFLAGS+=     -Dunix
-CONFIGURE_ENV+=        PREFIX="${PREFIX}"
-CONFIGURE_ENV+=        ENVOPTS="${CFLAGS} ${CPPFLAGS}"
-
-INSTALLATION_DIRS=     share/doc/html
-
-# reference correct relative man page when using .so;
-# libtoolize build of TIFF tools
-post-patch:
-       ${MV} ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.in.in
-       ${SED}  -e "s,\$${MANDIR}\(.*\)\.\([0-9]\).,${PREFIX}/man/man\2/\1.\2,g" \
-               -e "s,\$${MANDIR}\(.*\)\.\([0-9]\),${PREFIX}/man/man\2/\1.\2,g" \
-               ${WRKSRC}/man/Makefile.in.in  > ${WRKSRC}/man/Makefile.in
-       ${MV} ${WRKSRC}/tools/Makefile.in ${WRKSRC}/tools/Makefile.in.in
-       ${SED}  -e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \
-               ${WRKSRC}/tools/Makefile.in.in  > ${WRKSRC}/tools/Makefile.in
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1f37d0bee145 -r 7e43b173b121 graphics/tiff/PLIST
--- a/graphics/tiff/PLIST       Tue Dec 28 23:04:15 2004 +0000
+++ b/graphics/tiff/PLIST       Tue Dec 28 23:10:09 2004 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/12/28 23:10:10 reed Exp $
+bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
 bin/gif2tiff
@@ -23,8 +24,10 @@
 include/tiff.h
 include/tiffconf.h
 include/tiffio.h
+include/tiffio.hxx
 include/tiffvers.h
 lib/libtiff.la
+man/man1/bmp2tiff.1
 man/man1/fax2ps.1
 man/man1/fax2tiff.1
 man/man1/gif2tiff.1
@@ -46,80 +49,30 @@
 man/man1/tiffgt.1
 man/man1/tiffinfo.1
 man/man1/tiffmedian.1
+man/man1/tiffset.1
 man/man1/tiffsplit.1
 man/man1/tiffsv.1
-man/man3/TIFFCheckTile.3
-man/man3/TIFFClientOpen.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/TIFFDataWidth.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/TIFFGetFieldDefaulted.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/TIFFReadRGBAImageOriented.3
 man/man3/TIFFReadRGBAStrip.3
 man/man3/TIFFReadRGBATile.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/TIFFRewriteDirectory.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/TIFFVGetFieldDefaulted.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
@@ -130,68 +83,139 @@
 man/man3/TIFFbuffer.3
 man/man3/TIFFcodec.3
 man/man3/TIFFcolor.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
-share/doc/html/tiff/TIFFTechNote2.html
-share/doc/html/tiff/bugs.html
-share/doc/html/tiff/build.html
-share/doc/html/tiff/contrib.html
-share/doc/html/tiff/document.html
-share/doc/html/tiff/images.html
-share/doc/html/tiff/images/back.gif
-share/doc/html/tiff/images/bali.jpg
-share/doc/html/tiff/images/cat.gif
-share/doc/html/tiff/images/cover.jpg
-share/doc/html/tiff/images/cramps.gif
-share/doc/html/tiff/images/dave.gif
-share/doc/html/tiff/images/info.gif
-share/doc/html/tiff/images/jello.jpg
-share/doc/html/tiff/images/jim.gif
-share/doc/html/tiff/images/note.gif
-share/doc/html/tiff/images/oxford.gif
-share/doc/html/tiff/images/quad.jpg
-share/doc/html/tiff/images/ring.gif
-share/doc/html/tiff/images/smallliz.jpg
-share/doc/html/tiff/images/strike.gif
-share/doc/html/tiff/images/warning.gif
-share/doc/html/tiff/index.html
-share/doc/html/tiff/internals.html
-share/doc/html/tiff/intro.html
-share/doc/html/tiff/libtiff.html
-share/doc/html/tiff/misc.html
-share/doc/html/tiff/support.html
-share/doc/html/tiff/tools.html
-share/doc/html/tiff/v3.4beta007.html
-share/doc/html/tiff/v3.4beta016.html
-share/doc/html/tiff/v3.4beta018.html
-share/doc/html/tiff/v3.4beta024.html
-share/doc/html/tiff/v3.4beta028.html
-share/doc/html/tiff/v3.4beta029.html
-share/doc/html/tiff/v3.4beta031.html
-share/doc/html/tiff/v3.4beta032.html
-share/doc/html/tiff/v3.4beta033.html
-share/doc/html/tiff/v3.4beta034.html
-share/doc/html/tiff/v3.4beta035.html
-share/doc/html/tiff/v3.4beta036.html
-share/doc/html/tiff/v3.5.1.html
-share/doc/html/tiff/v3.5.2.html
-share/doc/html/tiff/v3.5.3.html
-share/doc/html/tiff/v3.5.4.html
-share/doc/html/tiff/v3.5.5.html
-share/doc/html/tiff/v3.5.6-beta.html
-share/doc/html/tiff/v3.5.7.html
-share/doc/html/tiff/v3.6.0.html
-share/doc/html/tiff/v${PKGVERSION}.html
-@dirrm share/doc/html/tiff/images
-@dirrm share/doc/html/tiff
+share/doc/tiff/COPYRIGHT
+share/doc/tiff/ChangeLog
+share/doc/tiff/README
+share/doc/tiff/RELEASE-DATE
+share/doc/tiff/TODO
+share/doc/tiff/VERSION
+share/doc/tiff/html/TIFFTechNote2.html
+share/doc/tiff/html/addingtags.html
+share/doc/tiff/html/bugs.html
+share/doc/tiff/html/build.html
+share/doc/tiff/html/contrib.html



Home | Main Index | Thread Index | Old Index