Create a separate libtiffcxx.so library for use by C++ applications.

It's meant to be used directly in place of libtiff.so, i.e. instead
of linking against -ltiff, you link against -ltiffcxx.  It also leaves
libtiff.so as a plain C-linkage library again, as it was in tiff-3.6.x,
and avoids needing to patch tiff-using packages to link using the C++
compiler.  Bump the PKGREVISION to 1.

6 files changed, 50 insertions, 5 deletions

diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index f52231fd4ba..8878b119de7 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2005/01/09 23:03:58 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2005/01/11 05:29:55 jlam Exp $
 
 DISTNAME=	tiff-3.7.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
 		http://libtiff.maptools.org/dl/
@@ -41,4 +42,18 @@ CONFIGURE_ARGS+=	--disable-lzw
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+
+# We explicitly build libtiff without C++ support by patching the
+# configure script (patch-af).  We also add a new target into
+# libtiff/Makefile to create a libtiffcxx.la containing the C++
+# functions (patch-ag).
+#
+post-build:
+	cd ${WRKSRC}/libtiff && ${MAKE} libtiffcxx.la
+
+post-install:
+	cd ${WRKSRC}/libtiff && ${INSTALL_DATA} tiffio.hxx ${PREFIX}/include
+	cd ${WRKSRC}/libtiff && ${LIBTOOL} --mode=install		\
+		${INSTALL_LIB} libtiffcxx.la ${PREFIX}/lib
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/PLIST b/graphics/tiff/PLIST
index 9359ce0b073..1ffb049891d 100644
--- a/graphics/tiff/PLIST
+++ b/graphics/tiff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/12/28 23:10:10 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/01/11 05:29:55 jlam Exp $
 bin/bmp2tiff
 bin/fax2ps
 bin/fax2tiff
@@ -27,6 +27,7 @@ include/tiffio.h
 include/tiffio.hxx
 include/tiffvers.h
 lib/libtiff.la
+lib/libtiffcxx.la
 man/man1/bmp2tiff.1
 man/man1/fax2ps.1
 man/man1/fax2tiff.1
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 0c08127121e..99fb489fee7 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/12/28 23:10:10 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/01/11 05:29:55 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	tiff
 
 .if !empty(TIFF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tiff+=	tiff>=3.6.1
-BUILDLINK_RECOMMENDED.tiff+=	tiff>=3.7.0
+BUILDLINK_RECOMMENDED.tiff+=	tiff>=3.7.1nb1
 BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 .endif	# TIFF_BUILDLINK3_MK
 
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 3eb63e9beee..fcb07ec7ece 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2004/12/28 23:10:10 reed Exp $
+$NetBSD: distinfo,v 1.21 2005/01/11 05:29:55 jlam Exp $
 
 SHA1 (tiff-3.7.1.tar.gz) = 001b03350182869c7f5d46e6b27862b85cb06fc3
 Size (tiff-3.7.1.tar.gz) = 1253810 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ab) = 1e6a2dd379e388f11c5a7b1959240fd66d29b88a
 SHA1 (patch-ac) = 40e817380c5183cf2e1e5461c05600073dec7348
 SHA1 (patch-ad) = 301e0ce2c121e9082e0ff9c5681c2ea1e0e6dcff
 SHA1 (patch-ae) = bb2e2d3a5be49204356c3c504d3a4bd5ba1fd9b2
+SHA1 (patch-af) = 29adfbcaa317df36a41af791e93159ad795c5e0b
+SHA1 (patch-ag) = dc6490a688b8e26a068465965de0856d1affe2eb
diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af
new file mode 100644
index 00000000000..64ad1e7ded4
--- /dev/null
+++ b/graphics/tiff/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.10 2005/01/11 05:29:55 jlam Exp $
+
+--- configure.orig	2004-12-20 14:41:54.000000000 -0500
++++ configure
+@@ -23722,6 +23722,7 @@ if test "${enable_c+++set}" = set; then
+ else
+   HAVE_CXX=yes
+ fi;
++HAVE_CXX=no
+ 
+ if test "$HAVE_CXX" = "yes" ; then
+ 
diff --git a/graphics/tiff/patches/patch-ag b/graphics/tiff/patches/patch-ag
new file mode 100644
index 00000000000..0e71d83c52f
--- /dev/null
+++ b/graphics/tiff/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.10 2005/01/11 05:29:55 jlam Exp $
+
+--- libtiff/Makefile.in.orig	2004-12-20 14:41:54.000000000 -0500
++++ libtiff/Makefile.in
+@@ -409,6 +409,10 @@ clean-libLTLIBRARIES:
+ libtiff.la: $(libtiff_la_OBJECTS) $(libtiff_la_DEPENDENCIES) 
+ 	$(CXXLINK) -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)$$//'`; \