summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2006-07-26 11:53:39 +0000
committermarkd <markd@pkgsrc.org>2006-07-26 11:53:39 +0000
commitdd7c6ea965777a19ca31f7b66c41a9b178f1288e (patch)
treebe6611826b015ddb38d30bce416dd787d3b2024f /graphics
parenta54334ce3642c37468c1882a0bc98f57fe45f4a5 (diff)
downloadpkgsrc-dd7c6ea965777a19ca31f7b66c41a9b178f1288e.tar.gz
Use tiff package rather than local copy. From Matthias Drochner.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ivtools/Makefile6
-rw-r--r--graphics/ivtools/distinfo3
-rw-r--r--graphics/ivtools/patches/patch-ae13
3 files changed, 20 insertions, 2 deletions
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index c44105ed301..ed104f9a6ba 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/07/24 12:04:26 markd Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/26 11:53:39 markd Exp $
DISTNAME= ivtools-1.2.4
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivtools/}
EXTRACT_SUFX= .tgz
@@ -18,6 +19,7 @@ USE_LANGUAGES= c c++
WRKSRC= ${WRKDIR}/ivtools-1.2
GNU_CONFIGURE= YES
+CONFIGURE_ARGS= --with-tiff=${BUILDLINK_PREFIX.tiff}
.include "../../mk/x11.buildlink3.mk"
@@ -26,6 +28,8 @@ post-patch:
pre-install:
${RM} -f ${WRKSRC}/config/local.def.orig
+ ${RM} -f ${WRKSRC}/config/params.def.orig
${RM} -f ${WRKSRC}/config/site.def.NETBSD.orig
+.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 4de4e45475a..571391dcfbd 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/07/24 12:04:26 markd Exp $
+$NetBSD: distinfo,v 1.12 2006/07/26 11:53:39 markd Exp $
SHA1 (ivtools-1.2.4.tgz) = 9c9cbfeedd7692c001b458ce82958428082367a5
RMD160 (ivtools-1.2.4.tgz) = 88cc853e7a31b56a1968021c86394084ba07a4f4
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 191619b7db43c47d7cc991bc33787434f0ef6948
SHA1 (patch-ab) = 513a29c861c7e33771667088668eaf7ff8e12778
SHA1 (patch-ac) = bcda1a0b71b669ad6a4900077564c226af262708
SHA1 (patch-ad) = 6ea96c7805bb28305f42e980a86152317988be64
+SHA1 (patch-ae) = 64d0b99a868baf4be3ffd55f387ee1cd4f07747e
diff --git a/graphics/ivtools/patches/patch-ae b/graphics/ivtools/patches/patch-ae
new file mode 100644
index 00000000000..20ab0f57042
--- /dev/null
+++ b/graphics/ivtools/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2006/07/26 11:53:39 markd Exp $
+
+--- config/params.def.orig 2006-07-24 14:49:53.000000000 +0200
++++ config/params.def
+@@ -1056,7 +1056,7 @@ NONSHARED_CCLDFLAGS = NonSharedCCLdFlags
+
+ #ifndef TiffCCLdLibs
+ #ifdef TiffLibDir
+-#define TiffCCLdLibs -L$(TIFFLIBDIR) -lTIFF
++#define TiffCCLdLibs -L$(TIFFLIBDIR) -ltiff -Wl,-R$(TIFFLIBDIR)
+ #else
+ #define TiffCCLdLibs /**/
+ #endif