Update to 4.0.6

PR:		203851
This commit is contained in:
Antoine Brodin 2015-10-21 17:32:24 +00:00
parent fc01c80942
commit 83302ffe4f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=399927
4 changed files with 15 additions and 15 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tiff
PORTVERSION= 4.0.4
PORTVERSION= 4.0.6
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
http://download.osgeo.org/libtiff/
@ -25,6 +25,7 @@ CONFIGURE_ARGS+= --with-jpeg-include-dir=${LOCALBASE}/include \
--with-jpeg-lib-dir=${LOCALBASE}/lib \
--without-x
INSTALL_TARGET= install-strip
TEST_TARGET= check
MLNKS= TIFFError.3tiff TIFFSetErrorHandler.3tiff \
TIFFFlush.3tiff TIFFFlushData.3tiff \
@ -89,11 +90,11 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
.if !defined(BUILDING_INDEX)
__pmlinks3!= ${ECHO_CMD} '${MLNKS:S/ / /}' | ${AWK} \
__pmlinks3!= ${ECHO_CMD} '${MLNKS:S/ / /}' | ${AWK} \
'{ if (NF % 2 != 0) { print "broken"; exit; } \
for (i=1; i<=NF; i++) { \
if ( i % 2 == 0) { print " " $$i " ;"; } \
else { printf "${LN} -s " $$i " "; } \
else { print "${LN} -s " $$i " "; } \
} }'
.endif
@ -118,7 +119,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/html/man/*.html ${STAGEDIR}${DOCSDIR}/man/
.endif
regression-test: build
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} check)
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (tiff-4.0.4.tar.gz) = 8cb1d90c96f61cdfc0bcf036acc251c9dbe6320334da941c7a83cfe1576ef890
SIZE (tiff-4.0.4.tar.gz) = 2100766
SHA256 (tiff-4.0.6.tar.gz) = 4d57a50907b510e3049a4bba0d7888930fdfc16ce49f1bf693e5b6247370d68c
SIZE (tiff-4.0.6.tar.gz) = 2192991

View File

@ -1,15 +1,15 @@
--- Makefile.in.orig 2015-06-21 19:07:53 UTC
--- Makefile.in.orig 2015-09-12 19:48:44 UTC
+++ Makefile.in
@@ -434,7 +434,7 @@ EXTRA_DIST = \
@@ -436,7 +436,7 @@ EXTRA_DIST = \
dist_doc_DATA = $(docfiles)
SUBDIRS = port libtiff tools build contrib test man html
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = libtiff-4.pc
all: all-recursive
@@ -485,19 +485,6 @@ distclean-libtool:
# Special rules to assist with Coverity submissions.
@@ -494,19 +494,6 @@ distclean-libtool:
-rm -f libtool config.lt
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)

View File

@ -30,11 +30,11 @@ lib/libtiff.a
lib/libtiff.so
lib/libtiff.so.4
lib/libtiff.so.5
lib/libtiff.so.5.2.2
lib/libtiff.so.5.2.4
lib/libtiffxx.a
lib/libtiffxx.so
lib/libtiffxx.so.5
lib/libtiffxx.so.5.2.2
lib/libtiffxx.so.5.2.4
libdata/pkgconfig/libtiff-4.pc
man/man1/bmp2tiff.1.gz
man/man1/fax2ps.1.gz
@ -168,6 +168,7 @@ man/man3/libtiff.3tiff.gz
%%PORTDOCS%%%%DOCSDIR%%/build.html
%%PORTDOCS%%%%DOCSDIR%%/contrib.html
%%PORTDOCS%%%%DOCSDIR%%/document.html
%%PORTDOCS%%%%DOCSDIR%%/images.html
%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
%%PORTDOCS%%%%DOCSDIR%%/images/bali.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/cat.gif
@ -184,7 +185,6 @@ man/man3/libtiff.3tiff.gz
%%PORTDOCS%%%%DOCSDIR%%/images/smallliz.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/strike.gif
%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
%%PORTDOCS%%%%DOCSDIR%%/images.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/internals.html
%%PORTDOCS%%%%DOCSDIR%%/intro.html
@ -304,3 +304,5 @@ man/man3/libtiff.3tiff.gz
%%PORTDOCS%%%%DOCSDIR%%/v4.0.3.html
%%PORTDOCS%%%%DOCSDIR%%/v4.0.4.html
%%PORTDOCS%%%%DOCSDIR%%/v4.0.4beta.html
%%PORTDOCS%%%%DOCSDIR%%/v4.0.5.html
%%PORTDOCS%%%%DOCSDIR%%/v4.0.6.html