Changes 3.0.6:

	Add simplified Chinese translation

	Provide internationalisation support for the efax program to which
	efax-gtk is a front end

	Make the fax top header line of a sent fax charset independent,
	and remove some incorrect codeset conversions

	Deal with two minor timing/race issues

	Make Notifier::make_id() a static method, since it only uses local
	or static objects

	Instead of omitting the call to setlocale() in efax/efix.c, after
	setting the locales to match their environment, reset LC_NUMERIC
	to the "C" locale

	Update Hungarian translation

6 files changed, 26 insertions, 25 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index a0f1718b44c..f9e3e68bc75 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/09/27 15:13:03 adam Exp $
+# $NetBSD: Makefile,v 1.22 2005/10/17 09:25:42 adam Exp $
 
-DISTNAME=	efax-gtk-3.0.5.src
-PKGNAME=	efax-gtk-3.0.5
+DISTNAME=	efax-gtk-3.0.6.src
+PKGNAME=	efax-gtk-3.0.6
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
 EXTRACT_SUFX=	.tgz
@@ -12,7 +12,7 @@ COMMENT=	GTK frontend for efax
 
 DEPENDS+=	efax>=0.9:../../comms/efax
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/comms/efax-gtk/PLIST b/comms/efax-gtk/PLIST
index f12e8ca50d5..37cf51f0080 100644
--- a/comms/efax-gtk/PLIST
+++ b/comms/efax-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/07/22 21:35:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/10/17 09:25:42 adam Exp $
 bin/efax-gtk
 man/man1/efax-gtk.1
 share/applications/efax-gtk.desktop
@@ -12,3 +12,4 @@ ${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
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/efax-gtk.mo
diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo
index 148d5cfbe0e..7488364635c 100644
--- a/comms/efax-gtk/distinfo
+++ b/comms/efax-gtk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/09/27 15:13:03 adam Exp $
+$NetBSD: distinfo,v 1.10 2005/10/17 09:25:42 adam Exp $
 
-SHA1 (efax-gtk-3.0.5.src.tgz) = 70448abde653d0be18c4a40c81aea950385cb991
-RMD160 (efax-gtk-3.0.5.src.tgz) = a47044c2520147edce4c32050295ef9ecdcab965
-Size (efax-gtk-3.0.5.src.tgz) = 805098 bytes
-SHA1 (patch-aa) = 5a13ae318ebe3e75a3cad5098203ee7953c57d0a
-SHA1 (patch-ab) = 815db7f142b69e08bdcffadd5147a49c4d0f6ae5
+SHA1 (efax-gtk-3.0.6.src.tgz) = e5c30a40e3329aeb3db5d16f1f8ca2ecb36884a1
+RMD160 (efax-gtk-3.0.6.src.tgz) = d7a48b2961f5155f24bbffb24560a6abce92e308
+Size (efax-gtk-3.0.6.src.tgz) = 893306 bytes
+SHA1 (patch-aa) = 31791c664d6672c9c0e9b3891e3de855e9d6f0a2
+SHA1 (patch-ab) = 1a9823dfcbb2404f45f775f0ca610ced450bc944
 SHA1 (patch-ac) = 41578729f6c59736fab8ef1550d9dd0fec6e254b
-SHA1 (patch-ad) = ab85c62b42e19ddb7fcacc1dfebde04a115c7437
+SHA1 (patch-ad) = e7f65a337f67dedb41fc1b2d59988e1a9d91f6f7
diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa
index 3659c0b1e59..74ed5ba4adc 100644
--- a/comms/efax-gtk/patches/patch-aa
+++ b/comms/efax-gtk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2005/08/16 12:56:57 adam Exp $
+$NetBSD: patch-aa,v 1.7 2005/10/17 09:25:42 adam Exp $
 
---- Makefile.in.orig	2005-08-13 16:41:35.000000000 +0000
+--- Makefile.in.orig	2005-09-18 22:09:47.000000000 +0000
 +++ Makefile.in
-@@ -144,7 +144,7 @@ sharedstatedir = @sharedstatedir@
+@@ -146,7 +146,7 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2005/08/16 12:56:57 adam Exp $
  
  desktopdir = $(datadir)/applications
  
-@@ -268,12 +268,12 @@ uninstall-desktopDATA:
+@@ -288,12 +288,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 00a9d5be058..0412bec3608 100644
--- a/comms/efax-gtk/patches/patch-ab
+++ b/comms/efax-gtk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2005/09/27 15:13:03 adam Exp $
+$NetBSD: patch-ab,v 1.7 2005/10/17 09:25:43 adam Exp $
 
---- src/efax_controller.cpp.orig	2005-08-28 22:41:09.000000000 +0000
+--- src/efax_controller.cpp.orig	2005-09-19 23:52:27.000000000 +0000
 +++ src/efax_controller.cpp
-@@ -228,8 +228,8 @@ std::pair<const char*, char* const*> Efa
+@@ -220,8 +220,8 @@ std::pair<const char*, char* const*> Efa
  
    *temp_pp = 0;
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.6 2005/09/27 15:13:03 adam Exp $
  
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -283,7 +283,7 @@ void EfaxController::sendfax_slot(void) 
+@@ -275,7 +275,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.6 2005/09/27 15:13:03 adam Exp $
  		"and the PATH environmental variable\n");
      _exit(EXEC_ERROR); 
    } // end of child process
-@@ -625,8 +625,8 @@ std::pair<const char*, char* const*> Efa
+@@ -597,8 +597,8 @@ std::pair<const char*, char* const*> Efa
    
    *temp_pp = 0;
  
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.6 2005/09/27 15:13:03 adam Exp $
    
    return std::pair<const char*, char* const*>(prog_name, exec_parms);
  }
-@@ -696,7 +696,7 @@ void EfaxController::receive(State mode)
+@@ -668,7 +668,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-ad b/comms/efax-gtk/patches/patch-ad
index dc874562adc..901eefe9774 100644
--- a/comms/efax-gtk/patches/patch-ad
+++ b/comms/efax-gtk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2005/08/16 12:56:57 adam Exp $
+$NetBSD: patch-ad,v 1.5 2005/10/17 09:25:43 adam Exp $
 
---- src/main.cpp.orig	2005-08-13 14:20:09.000000000 +0000
+--- src/main.cpp.orig	2005-09-16 21:43:04.000000000 +0000
 +++ src/main.cpp
-@@ -484,7 +484,7 @@ std::string configure_prog(bool reread) 
+@@ -491,7 +491,7 @@ std::string configure_prog(bool reread) 
  
      // we have finished reading the configuration file    
      // now enter parameters common to send and receive of faxes