Changes 3.0.3:

	Provide a settings option to omit the destination fax number from
	the fax page top header line

	Use a mutex to ensure that writes to the Notifier pipe are atomic
	between threads

	Some fixes for 64 bit systems:

	Fixes for (harmless) warnings issued by gcc-4.0

7 files changed, 36 insertions, 37 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 170da43dfa7..cc7afa26e5e 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/22 21:35:27 adam Exp $
 
-DISTNAME=	efax-gtk-2.2.15.src
-PKGNAME=	efax-gtk-2.2.15
+DISTNAME=	efax-gtk-3.0.3.src
+PKGNAME=	efax-gtk-3.0.3
 CATEGORIES=	comms
-MASTER_SITES=	http://www.cvine.freeserve.co.uk/efax-gtk/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.cvine.freeserve.co.uk/efax-gtk/
+HOMEPAGE=	http://efax-gtk.sourceforge.net/
 COMMENT=	GTK frontend for efax
 
 DEPENDS+=	efax>=0.9:../../comms/efax
@@ -22,8 +22,5 @@ CONFIGURE_ARGS+=	--with-spooldir=${VARBASE}/spool/efax
 EGDIR=			${PREFIX}/share/examples
 CONF_FILES=		${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc
 
-.include "../../devel/libsigc++2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtkmm24/buildlink3.mk"
-
+.include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/PLIST b/comms/efax-gtk/PLIST
index a19ebf0161a..f12e8ca50d5 100644
--- a/comms/efax-gtk/PLIST
+++ b/comms/efax-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/30 13:49:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/07/22 21:35:27 adam Exp $
 bin/efax-gtk
 man/man1/efax-gtk.1
 share/applications/efax-gtk.desktop
@@ -7,6 +7,8 @@ ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/efax-gtk.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/efax-gtk.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/efax-gtk.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/efax-gtk.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/efax-gtk.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/efax-gtk.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/efax-gtk.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/efax-gtk.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/efax-gtk.mo
diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo
index a0d9f5f6029..49f20cad018 100644
--- a/comms/efax-gtk/distinfo
+++ b/comms/efax-gtk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/03/30 13:49:28 adam Exp $
+$NetBSD: distinfo,v 1.7 2005/07/22 21:35:27 adam Exp $
 
-SHA1 (efax-gtk-2.2.15.src.tgz) = 119ff4f08c3dd2e7c9238310dda62f4d33bea7de
-RMD160 (efax-gtk-2.2.15.src.tgz) = e0531c813a3e1eb4dd893f3bba1a273d9d5dc13f
-Size (efax-gtk-2.2.15.src.tgz) = 708848 bytes
-SHA1 (patch-aa) = cb333234fecc9777f0667508086fb23303e3accf
-SHA1 (patch-ab) = 9c5bfb781e39955a5fa25d72424c3cd0b7cb4eaf
-SHA1 (patch-ac) = dc991277bbcecd44c166bff0880e136fc7443337
-SHA1 (patch-ad) = 615bee9838f29b03ad5f81afd7dc4ed5e648ca62
+SHA1 (efax-gtk-3.0.3.src.tgz) = d906677a9563c144815b752d40480a5f17f633f8
+RMD160 (efax-gtk-3.0.3.src.tgz) = 2aad97a6dccf5cbdc8620828ff76dc42a6630a9d
+Size (efax-gtk-3.0.3.src.tgz) = 793184 bytes
+SHA1 (patch-aa) = 2d21549d13d44b1e01817ab9bda269eaa9c7fb73
+SHA1 (patch-ab) = 0abdf8fc0c363c4896d8720e026bb02b45ac77de
+SHA1 (patch-ac) = 4efe6ad2591ba879dd12da2674106f171ac933c9
+SHA1 (patch-ad) = 62e507d74e8ca4327ed2e7771887d1eb4c8b3e4e
diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa
index b95276d618b..9fe2b82479b 100644
--- a/comms/efax-gtk/patches/patch-aa
+++ b/comms/efax-gtk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/03/30 13:49:28 adam Exp $
+$NetBSD: patch-aa,v 1.5 2005/07/22 21:35:27 adam Exp $
 
---- Makefile.in.orig	2005-02-26 14:41:26.000000000 +0000
+--- Makefile.in.orig	2005-07-16 11:46:32.000000000 +0000
 +++ Makefile.in
-@@ -141,7 +141,7 @@ sharedstatedir = @sharedstatedir@
+@@ -142,7 +142,7 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/30 13:49:28 adam Exp $
  
  desktopdir = $(datadir)/applications
  
-@@ -265,12 +265,12 @@ uninstall-desktopDATA:
+@@ -266,12 +266,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 0bb6597da0e..00699eae02b 100644
--- a/comms/efax-gtk/patches/patch-ab
+++ b/comms/efax-gtk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2005/03/30 13:49:28 adam Exp $
+$NetBSD: patch-ab,v 1.4 2005/07/22 21:35:27 adam Exp $
 
---- src/efax_controller.cpp.orig	2005-03-30 15:38:46.000000000 +0000
+--- src/efax_controller.cpp.orig	2005-06-14 20:37:33.000000000 +0000
 +++ src/efax_controller.cpp
-@@ -234,8 +234,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.3 2005/03/30 13:49:28 adam Exp $
  
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -290,7 +290,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.3 2005/03/30 13:49:28 adam Exp $
  		"and the PATH environmental variable\n");
      _exit(EXEC_ERROR); 
    } // end of child process
-@@ -634,8 +634,8 @@ std::pair<const char*, char* const*> Efa
+@@ -627,8 +627,8 @@ std::pair<const char*, char* const*> Efa
    
    *temp_pp = 0;
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.3 2005/03/30 13:49:28 adam Exp $
    
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -742,7 +742,7 @@ void EfaxController::receive(State mode)
+@@ -734,7 +734,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 7c57dcbce9f..5213fd7a53f 100644
--- a/comms/efax-gtk/patches/patch-ac
+++ b/comms/efax-gtk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2005/03/30 13:49:28 adam Exp $
+$NetBSD: patch-ac,v 1.4 2005/07/22 21:35:27 adam Exp $
 
---- src/fax_list.cpp.orig	2005-03-30 15:43:12.000000000 +0000
+--- src/fax_list.cpp.orig	2005-06-03 19:07:41.000000000 +0000
 +++ src/fax_list.cpp
-@@ -533,7 +533,7 @@ std::pair<const char*, char* const*> Fax
+@@ -571,7 +571,7 @@ std::pair<const char*, char* const*> Fax
    std::vector<std::string> efix_parms;
    std::string temp;
      
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2005/03/30 13:49:28 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");
-@@ -679,8 +679,8 @@ std::pair<const char*, char* const*> Fax
+@@ -717,8 +717,8 @@ std::pair<const char*, char* const*> Fax
    
    *temp_pp = 0;
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ac,v 1.3 2005/03/30 13:49:28 adam Exp $
  
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -886,7 +886,7 @@ void FaxListDialog::print_fax_thread(voi
+@@ -917,7 +917,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.3 2005/03/30 13:49:28 adam Exp $
  		  "and the PATH environmental variable\n");
        _exit(0);
      }
-@@ -1004,7 +1004,7 @@ void FaxListDialog::view_fax_thread(void
+@@ -1028,7 +1028,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 4f09fd33a04..1baddb1a8a2 100644
--- a/comms/efax-gtk/patches/patch-ad
+++ b/comms/efax-gtk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2005/03/30 13:49:28 adam Exp $
+$NetBSD: patch-ad,v 1.3 2005/07/22 21:35:27 adam Exp $
 
---- src/main.cpp.orig	2005-03-30 15:44:28.000000000 +0000
+--- src/main.cpp.orig	2005-06-14 20:08:17.000000000 +0000
 +++ src/main.cpp
-@@ -429,7 +429,7 @@ Glib::ustring configure_prog(bool reread
+@@ -462,7 +462,7 @@ std::string configure_prog(bool reread) 
  
      // we have finished reading the configuration file    
      // now enter parameters common to send and receive of faxes