diff options
| author | jlam <jlam@pkgsrc.org> | 2005-01-17 08:04:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-01-17 08:04:25 +0000 |
| commit | 9ab65a09cfc5f4f8fd6c8b57860624c4b902d4ed (patch) | |
| tree | cc8704d8c6414425ac4b389ced96c8d0101759f9 /graphics/tiff | |
| parent | 48c0c161711f2e55e435752a343ec673dbc15564 (diff) | |
| download | pkgsrc-9ab65a09cfc5f4f8fd6c8b57860624c4b902d4ed.tar.gz | |
Link the tiff library, which has no C++ functions, with $(CC) instead
of $(CXX) so that applications needing libtiff don't also need to be
linked against $(CXX). Bump the PKGREVISION to 3. This should fix
PR pkg/28961.
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/Makefile | 4 | ||||
| -rw-r--r-- | graphics/tiff/distinfo | 4 | ||||
| -rw-r--r-- | graphics/tiff/patches/patch-ag | 14 |
3 files changed, 12 insertions, 10 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 3fb50e54529..2bf05d23ab1 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2005/01/13 15:39:20 jlam Exp $ +# $NetBSD: Makefile,v 1.66 2005/01/17 08:04:25 jlam Exp $ DISTNAME= tiff-3.7.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://libtiff.maptools.org/dl/ diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index 22c15e61f06..2d2884f487b 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2005/01/13 15:39:20 jlam Exp $ +$NetBSD: distinfo,v 1.23 2005/01/17 08:04:25 jlam Exp $ SHA1 (tiff-3.7.1.tar.gz) = 001b03350182869c7f5d46e6b27862b85cb06fc3 Size (tiff-3.7.1.tar.gz) = 1253810 bytes @@ -8,4 +8,4 @@ SHA1 (patch-ac) = 40e817380c5183cf2e1e5461c05600073dec7348 SHA1 (patch-ad) = 301e0ce2c121e9082e0ff9c5681c2ea1e0e6dcff SHA1 (patch-ae) = bb2e2d3a5be49204356c3c504d3a4bd5ba1fd9b2 SHA1 (patch-af) = 29adfbcaa317df36a41af791e93159ad795c5e0b -SHA1 (patch-ag) = db858390f2cad5a07132781c0c186f1a2d61f1c3 +SHA1 (patch-ag) = 8ec28fcea0690275935b4c20f57a8d6d8b114b86 diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag index d69220da00b..cc06ccb81d6 100644 --- a/graphics/tiff/patches/patch-ag +++ b/graphics/tiff/patches/patch-ag @@ -1,15 +1,17 @@ -$NetBSD: patch-ag,v 1.11 2005/01/13 15:39:20 jlam Exp $ +$NetBSD: patch-ag,v 1.12 2005/01/17 08:04:26 jlam Exp $ --- libtiff/Makefile.in.orig 2004-12-20 14:41:54.000000000 -0500 +++ libtiff/Makefile.in -@@ -409,6 +409,10 @@ clean-libLTLIBRARIES: +@@ -407,7 +407,11 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done libtiff.la: $(libtiff_la_OBJECTS) $(libtiff_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS) - +- $(CXXLINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS) ++ $(LINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiff_la_OBJECTS) $(libtiff_la_LIBADD) $(LIBS) ++ +libtiffcxx_la_OBJECTS = tif_stream.lo +libtiffcxx.la: $(libtiffcxx_la_OBJECTS) $(libtiff_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libtiff_la_LDFLAGS) $(libtiffcxx_la_OBJECTS) libtiff.la $(libtiff_la_LIBADD) $(LIBS) -+ + clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ |