diff options
| -rw-r--r-- | graphics/tiff/Makefile | 22 | ||||
| -rw-r--r-- | graphics/tiff/files/md5 | 6 | ||||
| -rw-r--r-- | graphics/tiff/files/patch-sum | 6 | ||||
| -rw-r--r-- | graphics/tiff/patches/patch-ae | 21 | ||||
| -rw-r--r-- | graphics/tiff/patches/patch-af | 8 |
5 files changed, 32 insertions, 31 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 36d67b701d5..d12c747fd0a 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.23 2000/01/06 01:25:22 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2000/04/01 00:05:27 wiz Exp $ -DISTNAME= tiff-v3.5.4 -PKGNAME= tiff-3.5.4 +DISTNAME= tiff-v3.5.5 +PKGNAME= tiff-3.5.5 CATEGORIES= graphics MASTER_SITES= http://www.libtiff.org/ \ ftp://ftp.onshore.com/pub/libtiff/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -# need DISTFILES above for adding lzw-files to it, if USE_GIF is defined +# need DISTFILES above for adding lzw-files to it if USE_GIF is defined # in mk.conf MAINTAINER= packages@netbsd.org @@ -28,12 +28,14 @@ ZLIBDIR= /usr/lib .endif .if defined(USE_GIF) -DISTFILES+= libtiff-lzw-compression-kit.tar.gz - -pre-build: - cd ${WRKSRC} \ - && ${CP} ../libtiff-lzw-compression-kit/tif_dir.c libtiff \ - && ${CP} ../libtiff-lzw-compression-kit/tif_lzw.c libtiff +DISTFILES+= libtiff-lzw-compression-kit-1.1.tar.gz +LZWWRKDIR= ${WRKDIR}/libtiff-lzw-compression-kit + +post-patch: + ${MV} ${LZWWRKDIR}/Makefile ${LZWWRKDIR}/Makefile.orig + ${SED} "s@TIFF_SRC_DIR = /tmp/libtiff@TIFF_SRC_DIR = ../${DISTNAME}@" \ + ${LZWWRKDIR}/Makefile.orig > ${LZWWRKDIR}/Makefile + cd ${LZWWRKDIR} && make install .endif CPPFLAGS+= -Dunix diff --git a/graphics/tiff/files/md5 b/graphics/tiff/files/md5 index 25f54e4e42d..c70ca4b016b 100644 --- a/graphics/tiff/files/md5 +++ b/graphics/tiff/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.5 2000/01/06 01:25:24 wiz Exp $ +$NetBSD: md5,v 1.6 2000/04/01 00:05:28 wiz Exp $ -MD5 (tiff-v3.5.4.tar.gz) = 3957aeace6b66720751f497157e16e53 -MD5 (libtiff-lzw-compression-kit.tar.gz) = 7372ce27aa47f048c83aa59239a685d1 +MD5 (tiff-v3.5.5.tar.gz) = 407d65a98c7621ad6e2c64cd3d1e7a40 +MD5 (libtiff-lzw-compression-kit-1.1.tar.gz) = 771663ad1196fab093b1dd512ecd3061 diff --git a/graphics/tiff/files/patch-sum b/graphics/tiff/files/patch-sum index 4266ce57432..6fca2a51288 100644 --- a/graphics/tiff/files/patch-sum +++ b/graphics/tiff/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.4 2000/03/18 19:45:19 jlam Exp $ +$NetBSD: patch-sum,v 1.5 2000/04/01 00:05:29 wiz Exp $ MD5 (patch-aa) = 347f3d4e204a0ad2efbb38dbb9ea2394 MD5 (patch-ab) = e3ec199475823b7fd769c53d8aebae25 MD5 (patch-ac) = dbb2139b87ff636258bdcff19f30d06f MD5 (patch-ad) = 514225e0cacc10cca883b4670a72949f -MD5 (patch-ae) = 6eb6553aa1245bb8ce9dce1cfce6b329 -MD5 (patch-af) = 05bb28ae1f5d1d007fb63f51baf08de1 +MD5 (patch-ae) = 5847109156a1d557b465db01a1e5095b +MD5 (patch-af) = 26d39de0080b83394cbc04cb75cc1dcb diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae index af3dc5eb2f3..808d5193ee6 100644 --- a/graphics/tiff/patches/patch-ae +++ b/graphics/tiff/patches/patch-ae @@ -1,18 +1,17 @@ -$NetBSD: patch-ae,v 1.3 2000/01/06 01:25:25 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2000/04/01 00:05:29 wiz Exp $ ---- html/Makefile.in.orig Tue Jul 27 23:50:27 1999 -+++ html/Makefile.in Thu Jan 6 01:32:51 2000 -@@ -73,6 +73,9 @@ - v3.4beta034.html \ - v3.4beta035.html \ - v3.4beta036.html \ -+ v3.5.1.html \ -+ v3.5.2.html \ -+ v3.5.3.html \ +--- html/Makefile.in.orig Mon Mar 27 19:05:55 2000 ++++ html/Makefile.in Fri Mar 31 23:47:24 2000 +@@ -76,8 +76,6 @@ + v3.5.1.html \ + v3.5.2.html \ + v3.5.3.html \ +- v3.5.4.html \ +- v3.5.5.html \ ${NULL} IMAGES=\ images/back.gif \ -@@ -80,6 +83,8 @@ +@@ -85,6 +83,8 @@ images/cat.gif \ images/cover.jpg \ images/cramps.gif \ diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af index c964a68aabd..57aa5442e6a 100644 --- a/graphics/tiff/patches/patch-af +++ b/graphics/tiff/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2000/01/06 01:25:26 wiz Exp $ +$NetBSD: patch-af,v 1.4 2000/04/01 00:05:29 wiz Exp $ ---- html/index.html.orig Tue Dec 21 22:09:04 1999 -+++ html/index.html Thu Jan 6 02:20:45 2000 -@@ -76,7 +76,6 @@ +--- html/index.html.orig Mon Mar 27 19:05:55 2000 ++++ html/index.html Fri Mar 31 23:27:39 2000 +@@ -78,7 +78,6 @@ <LI><A HREF="bugs.html">Bugs and the TIFF mailing list</A> <LI><A HREF="images.html">Test images</A> <LI><A HREF="misc.html">Acknowledgements and copyright issues</A> |