Changes 3.0.11:

* Correct file descriptor leak when viewing a fax.
* Implement printing of faxes in fax lists via the GTK+ print system
  where compiled against GTK+2.10 or higher.
* Improve handling of user locales with streams.
* Use AC_COMPILE_IFELSE/AC_LANG_PROGRAM autoconf macros instead of
  the AC_TRY_COMPILE macro when configuring the program.
* Correct derivation of fdistream class for wide characters (not
  relevant to efax-gtk).
* Mention the need to call g_thread_init() before Notifier::init()
  in the Notifier documentation.
* Correct help information concerning sending faxes via socket and
  pop-up dialog.
* Explicitly include <ios> header where relevant.

8 files changed, 58 insertions, 30 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index e5f3f91213c..83052e02fc8 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/06/12 09:12:33 adam Exp $
+# $NetBSD: Makefile,v 1.34 2006/09/24 16:56:16 adam Exp $
 
-DISTNAME=	efax-gtk-3.0.10.src
-PKGNAME=	efax-gtk-3.0.10
+DISTNAME=	efax-gtk-3.0.11.src
+PKGNAME=	efax-gtk-3.0.11
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
 EXTRACT_SUFX=	.tgz
diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo
index 3c5b6e6e1f7..f8544b0d885 100644
--- a/comms/efax-gtk/distinfo
+++ b/comms/efax-gtk/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.13 2006/06/12 09:12:33 adam Exp $
+$NetBSD: distinfo,v 1.14 2006/09/24 16:56:16 adam Exp $
 
-SHA1 (efax-gtk-3.0.10.src.tgz) = f450e0f009c2b9a2c45e2533e881fed5f24dca74
-RMD160 (efax-gtk-3.0.10.src.tgz) = eb2beba6a332060bb02c38b1b035fa4a980f28c7
-Size (efax-gtk-3.0.10.src.tgz) = 1069508 bytes
-SHA1 (patch-aa) = 31791c664d6672c9c0e9b3891e3de855e9d6f0a2
-SHA1 (patch-ab) = ec67e410d9c6d3230c9814f079025a4ee9900d72
-SHA1 (patch-ac) = c9559ab67260fbb326acc1406e89cdf558f71d4f
-SHA1 (patch-ad) = bd027f6e89cddceb646445c9dc061b0afad8b2ef
+SHA1 (efax-gtk-3.0.11.src.tgz) = 889bf4b5472f4793f436536c4770252debe75921
+RMD160 (efax-gtk-3.0.11.src.tgz) = 3ea44b04a6c7145a303d0f854802776a3f79db5b
+Size (efax-gtk-3.0.11.src.tgz) = 1076781 bytes
+SHA1 (patch-aa) = 0650232e162cac968c8a3920829fe17be38085aa
+SHA1 (patch-ab) = d71cce206417ca9aa12abf687ce8ca2c1bcdc24f
+SHA1 (patch-ac) = af6cfa319391caa6230ca69a776bdce8e7305710
+SHA1 (patch-ad) = d9212f4ded662871e3e0156dcd157a9e27dbf6f0
+SHA1 (patch-af) = 7965dfa6d497ee5886775a8bea6ceec5a4ddabe6
+SHA1 (patch-ag) = f5dbd0531e0f1e3a9f9b07603c1cde5bbf5fac33
diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa
index 74ed5ba4adc..c6cb1623e5c 100644
--- a/comms/efax-gtk/patches/patch-aa
+++ b/comms/efax-gtk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2005/10/17 09:25:42 adam Exp $
+$NetBSD: patch-aa,v 1.8 2006/09/24 16:56:16 adam Exp $
 
---- Makefile.in.orig	2005-09-18 22:09:47.000000000 +0000
+--- Makefile.in.orig	2006-08-13 15:21:58.000000000 +0200
 +++ Makefile.in
-@@ -146,7 +146,7 @@ sharedstatedir = @sharedstatedir@
+@@ -148,7 +148,7 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2005/10/17 09:25:42 adam Exp $
  
  desktopdir = $(datadir)/applications
  
-@@ -288,12 +288,12 @@ uninstall-desktopDATA:
+@@ -290,12 +290,12 @@ uninstall-desktopDATA:
  sysconfDATA_INSTALL = $(INSTALL_DATA)
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
diff --git a/comms/efax-gtk/patches/patch-ab b/comms/efax-gtk/patches/patch-ab
index ca6c86a3ffd..10c37b5fb68 100644
--- a/comms/efax-gtk/patches/patch-ab
+++ b/comms/efax-gtk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2006/05/29 06:41:38 adam Exp $
+$NetBSD: patch-ab,v 1.9 2006/09/24 16:56:16 adam Exp $
 
---- src/efax_controller.cpp.orig	2006-02-16 23:00:41.000000000 +0100
+--- src/efax_controller.cpp.orig	2006-08-13 15:29:16.000000000 +0200
 +++ src/efax_controller.cpp
-@@ -224,8 +224,8 @@ std::pair<const char*, char* const*> Efa
+@@ -229,8 +229,8 @@ std::pair<const char*, char* const*> Efa
  
    *temp_pp = 0;
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.8 2006/05/29 06:41:38 adam Exp $
  
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -279,7 +279,7 @@ void EfaxController::sendfax_slot(void) 
+@@ -284,7 +284,7 @@ void EfaxController::sendfax_slot(void) 
  
      // if we reached this point, then the execvp() call must have failed
      // report error and exit - uses _exit() and not exit()
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.8 2006/05/29 06:41:38 adam Exp $
  		"and the PATH environmental variable\n");
      _exit(EXEC_ERROR); 
    } // end of child process
-@@ -604,8 +604,8 @@ std::pair<const char*, char* const*> Efa
+@@ -624,8 +624,8 @@ std::pair<const char*, char* const*> Efa
    
    *temp_pp = 0;
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.8 2006/05/29 06:41:38 adam Exp $
    
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -675,7 +675,7 @@ void EfaxController::receive(State mode)
+@@ -695,7 +695,7 @@ void EfaxController::receive(State mode)
  
        // if we reached this point, then the execvp() call must have failed
        // report the error and end this process - use _exit() and not exit()
diff --git a/comms/efax-gtk/patches/patch-ac b/comms/efax-gtk/patches/patch-ac
index b2606236aad..9359da999a6 100644
--- a/comms/efax-gtk/patches/patch-ac
+++ b/comms/efax-gtk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2006/05/29 06:41:38 adam Exp $
+$NetBSD: patch-ac,v 1.8 2006/09/24 16:56:16 adam Exp $
 
---- src/fax_list.cpp.orig	2006-03-06 23:33:40.000000000 +0100
+--- src/fax_list.cpp.orig	2006-08-13 16:18:08.000000000 +0200
 +++ src/fax_list.cpp
-@@ -607,7 +607,7 @@ std::pair<const char*, char* const*> Fax
+@@ -633,7 +633,7 @@ std::pair<const char*, char* const*> Fax
      // thread while we are accessing it here
      Thread::Mutex::Lock lock(*prog_config.mutex_p);
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2006/05/29 06:41:38 adam Exp $
      // shut up efix (comment out next line and uncomment following one if errors to be reported)
      efix_parms.push_back("-v");
      //efix_parms.push_back("-ve");
-@@ -754,8 +754,8 @@ std::pair<const char*, char* const*> Fax
+@@ -805,8 +805,8 @@ std::pair<const char*, char* const*> Fax
    
    *temp_pp = 0;
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ac,v 1.7 2006/05/29 06:41:38 adam Exp $
  
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -964,7 +964,7 @@ void FaxListDialog::print_fax_thread(voi
+@@ -1010,7 +1010,7 @@ void FaxListDialog::print_fax_thread(voi
  
        // if we reached this point, then the execvp() call must have failed
        // report error and then end process - use _exit(), not exit()
@@ -31,7 +31,7 @@ $NetBSD: patch-ac,v 1.7 2006/05/29 06:41:38 adam Exp $
  		  "and the PATH environmental variable\n");
        _exit(0);
      }
-@@ -1075,7 +1075,7 @@ void FaxListDialog::view_fax_thread(void
+@@ -1212,7 +1212,7 @@ void FaxListDialog::view_fax_thread(void
  
      // if we reached this point, then the execvp() call must have failed
      // report error and then end process - use _exit(), not exit()
diff --git a/comms/efax-gtk/patches/patch-ad b/comms/efax-gtk/patches/patch-ad
index eef728fd9d9..7e381833e27 100644
--- a/comms/efax-gtk/patches/patch-ad
+++ b/comms/efax-gtk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2006/05/29 06:41:38 adam Exp $
+$NetBSD: patch-ad,v 1.7 2006/09/24 16:56:16 adam Exp $
 
---- src/main.cpp.orig	2006-03-10 23:20:31.000000000 +0100
+--- src/main.cpp.orig	2006-08-13 15:31:06.000000000 +0200
 +++ src/main.cpp
-@@ -507,7 +507,7 @@ std::string configure_prog(bool reread) 
+@@ -522,7 +522,7 @@ std::string configure_prog(bool reread) 
  
      // we have finished reading the configuration file    
      // now enter parameters common to send and receive of faxes	
diff --git a/comms/efax-gtk/patches/patch-af b/comms/efax-gtk/patches/patch-af
new file mode 100644
index 00000000000..167d4927d68
--- /dev/null
+++ b/comms/efax-gtk/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/09/24 16:56:17 adam Exp $
+
+--- src/Makefile.in.orig	2006-09-24 11:20:56.000000000 +0200
++++ src/Makefile.in
+@@ -174,7 +174,7 @@ noinst_HEADERS = mainwindow.h dialogs.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./utils
++AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ @GTK_UNIX_PRINT_CFLAGS@ -I./utils
+ 
+ AM_CFLAGS = @GTK_CFLAGS@ -I./libegg
+ 
diff --git a/comms/efax-gtk/patches/patch-ag b/comms/efax-gtk/patches/patch-ag
new file mode 100644
index 00000000000..169d967abd9
--- /dev/null
+++ b/comms/efax-gtk/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/09/24 16:56:17 adam Exp $
+
+--- src/utils/Makefile.in.orig	2006-09-24 11:21:21.000000000 +0200
++++ src/utils/Makefile.in
+@@ -169,7 +169,7 @@ noinst_HEADERS = fdstream.h fdstream.tcc
+ 
+ INCLUDES = -DDATADIR=\"$(datadir)\" -DRC_DIR=\"$(sysconfdir)\" -DSIGC_VERSION=@SIGC_VER@
+ 
+-AM_CXXFLAGS = -D_XOPEN_SOURCE=600 @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ -I..
++AM_CXXFLAGS = @SIGC_CFLAGS@ @GTK_CFLAGS@ @GTHREAD_CFLAGS@ -I..
+ 
+ EXTRA_DIST = LGPL.TXT
+ subdir = src/utils