Changes 3.0.18:

* Print received/sent faxes via cairo, libtiff and GtkPrintOperation
  when efax-gtk is compiled against GTK+ >= 2.10.0, instead of
  converting to postscript with efix.
* Minor improvements to the TextPrintManager implementation.
* Make use of GTK+ print system the default when efax-gtk is
  compiled against GTK+ >= 2.10.0.
* Correct man file.

4 files changed, 17 insertions, 16 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index e6b17e6c7a1..83a8409c64c 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2008/04/28 14:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.41 2008/12/19 12:28:38 adam Exp $
 
-DISTNAME=	efax-gtk-3.0.17.src
-PKGNAME=	efax-gtk-3.0.17
+DISTNAME=	efax-gtk-3.0.18.src
+PKGNAME=	efax-gtk-3.0.18
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
 EXTRACT_SUFX=	.tgz
@@ -21,5 +21,6 @@ CONFIGURE_ARGS+=	--with-spooldir=${VARBASE}/spool/efax
 EGDIR=			${PREFIX}/share/examples
 CONF_FILES=		${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc
 
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo
index 8e86d930cfc..e59723c64cb 100644
--- a/comms/efax-gtk/distinfo
+++ b/comms/efax-gtk/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2008/04/28 14:47:29 adam Exp $
+$NetBSD: distinfo,v 1.20 2008/12/19 12:28:38 adam Exp $
 
-SHA1 (efax-gtk-3.0.17.src.tgz) = 61bf78b66c1afb77ae19349326b06bf74233ada7
-RMD160 (efax-gtk-3.0.17.src.tgz) = 8f875537a65474d5995646f3ca255b5149397e01
-Size (efax-gtk-3.0.17.src.tgz) = 1148144 bytes
+SHA1 (efax-gtk-3.0.18.src.tgz) = d645166ce1e0868ab94dcac9991af6a0f04b535f
+RMD160 (efax-gtk-3.0.18.src.tgz) = aceb12f99cd4200d4f4aafc8443b5eb15521d147
+Size (efax-gtk-3.0.18.src.tgz) = 1156252 bytes
 SHA1 (patch-aa) = 94cd524ea47542e69d4a13704c204522f7324cd8
 SHA1 (patch-ab) = cbada5659b3a9af6862a8941c2c85ab9dccdc475
 SHA1 (patch-ac) = 5d223f5a9cacf3b60e8e5affaf9e5be8511db9be
-SHA1 (patch-af) = 46a78705501aa77c6534904b53d5bc55f884a166
-SHA1 (patch-ag) = b243f8f2a50c97d51ba44c046f2f34d4418d4948
+SHA1 (patch-af) = cec7a4e35412aa46adbbb981cf20a83131792c90
+SHA1 (patch-ag) = 6f0ef55eadb264dd083287c3d77394f5481fe9b6
diff --git a/comms/efax-gtk/patches/patch-af b/comms/efax-gtk/patches/patch-af
index 589c81abba1..d6b0f8d87b1 100644
--- a/comms/efax-gtk/patches/patch-af
+++ b/comms/efax-gtk/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2007/10/13 17:25:20 adam Exp $
+$NetBSD: patch-af,v 1.4 2008/12/19 12:28:38 adam Exp $
 
---- src/Makefile.in.orig	2007-07-15 11:23:11.000000000 +0200
+--- src/Makefile.in.orig	2008-09-07 16:23:57.000000000 +0200
 +++ src/Makefile.in
 @@ -228,7 +228,7 @@ noinst_HEADERS = mainwindow.h dialogs.h 
  		   gpl.h fax_list_manager_icons.h libegg/eggtrayicon.h
@@ -9,5 +9,5 @@ $NetBSD: patch-af,v 1.3 2007/10/13 17:25:20 adam Exp $
 -AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils
 +AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils
  AM_CFLAGS = @GTK_CFLAGS@ -I./libegg
- efax_gtk_LDADD = utils/libutils.a @LIBINTL@ @SIGC_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@ @GTK_UNIX_PRINT_LIBS@
+ efax_gtk_LDADD = utils/libutils.a @LIBINTL@ @SIGC_LIBS@ @GTK_LIBS@ @GTHREAD_LIBS@ @GTK_UNIX_PRINT_LIBS@ -ltiff
  EXTRA_DIST = libegg/CREDITS
diff --git a/comms/efax-gtk/patches/patch-ag b/comms/efax-gtk/patches/patch-ag
index 09f56b79695..95db77c2530 100644
--- a/comms/efax-gtk/patches/patch-ag
+++ b/comms/efax-gtk/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.4 2007/10/13 17:25:20 adam Exp $
+$NetBSD: patch-ag,v 1.5 2008/12/19 12:28:38 adam Exp $
 
---- src/utils/Makefile.in.orig	2007-07-15 11:23:11.000000000 +0200
+--- src/utils/Makefile.in.orig	2008-09-07 16:23:58.000000000 +0200
 +++ src/utils/Makefile.in
-@@ -219,7 +219,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc
- 		      pango_layout_iter_handle.h
+@@ -223,7 +223,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc
+ 		      tiff_handle.h cairo_handle.h
  
  INCLUDES = -DDATADIR=\"$(datadir)\" -DRC_DIR=\"$(sysconfdir)\" -DSIGC_VERSION=@SIGC_VER@
 -AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I..