From e96e81d4dbdbe9332a19ac8993d462da2e60f68d Mon Sep 17 00:00:00 2001 From: dinoex Date: Mon, 13 Jun 2011 02:35:41 +0000 Subject: - drop dependency on pkg-config - change path of libtiff-4.pc Submitted by: Max Brazhnikov --- graphics/tiff/Makefile | 3 +-- graphics/tiff/files/patch-Makefile.in | 15 ++++++++++++--- graphics/tiff/pkg-plist | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'graphics') diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 7a7b29fa343e..4202aea3bc2c 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -9,7 +9,7 @@ PORTNAME= tiff PORTVERSION= 4.0.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSION= 4.0.0beta7 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ @@ -18,7 +18,6 @@ MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ MAINTAINER= dinoex@FreeBSD.org COMMENT= Tools and library routines for working with TIFF images -BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ jbig.1:${PORTSDIR}/graphics/jbigkit diff --git a/graphics/tiff/files/patch-Makefile.in b/graphics/tiff/files/patch-Makefile.in index 0f33fee7a608..6101b37b538d 100644 --- a/graphics/tiff/files/patch-Makefile.in +++ b/graphics/tiff/files/patch-Makefile.in @@ -1,6 +1,15 @@ ---- Makefile.in.orig 2009-08-21 00:25:16.000000000 +0200 -+++ Makefile.in 2009-08-24 22:55:02.000000000 +0200 -@@ -380,16 +380,6 @@ +--- Makefile.in.orig 2011-04-09 22:53:37.000000000 +0200 ++++ Makefile.in 2011-06-13 04:29:31.000000000 +0200 +@@ -330,7 +330,7 @@ + + 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 + +@@ -382,16 +382,6 @@ -rm -f libtool config.lt install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) diff --git a/graphics/tiff/pkg-plist b/graphics/tiff/pkg-plist index d46cf89e5ee7..61383e1a23ec 100644 --- a/graphics/tiff/pkg-plist +++ b/graphics/tiff/pkg-plist @@ -35,7 +35,8 @@ lib/libtiffxx.a lib/libtiffxx.la lib/libtiffxx.so lib/libtiffxx.so.4 -lib/pkgconfig/libtiff-4.pc +libdata/pkgconfig/libtiff-4.pc +@dirrmtry libdata/pkgconfig %%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html %%PORTDOCS%%%%DOCSDIR%%/addingtags.html %%PORTDOCS%%%%DOCSDIR%%/bugs.html -- cgit