Update to 3.2.13

* Depend on x11/c++-gtk-utils, instead of x11/gtkmm

Changelog:
Version 3.2.13 (11th April 2014)
--------------

	Fix API breakage in GTK+-3.12 (the buttons of GtkDialog objects
	have been made internal instead of non-internal children of the
	action area box) (dialog.h, dialog.cpp).

	Put icon in efax and efax-gtk about dialogs (dialogs.cpp).

	Replace AC_CONFIG_HEADER macro with AC_CONFIG_HEADERS when
	configuring (Samuli Suominen) (configure.ac).

	Update build system to automake-1.13.3 (config.guess, config.sub,
	depcomp, INSTALL).

	Update desktop file (Samuli Suominen) (efax-gtk.desktop).

Version 3.2.12 (1st June 2013)
--------------

	Force GType initialisation of GtkEntry for GtkSettings
	(mainwindow.cpp).

	Correct entry sizing in settings dialog (settings.cpp).

	Improve tray icon sizing (tray_icon.cpp).

	Permit the program to build against c++-gtk-utils-2.2 (this
	requires increasing the c++-gtk-utils-1.2 dependency to 1.2.13,
	and increasing the c++-gtk-utils-2.0 dependency to 2.0.1)
	(acinclude.m4, README; mainwindow.h, mainwindow.cpp).

	Cause bootstrap.sh to build translation files (bootstrap.sh).

	Update build system to automake-1.13.1 (configure.ac,
	config.guess, config.sub, depcomp, INSTALL, install-sh, missing;
	src/Makefile.am; efax/Makefile.am).

Version 3.2.11 (1st January 2013)
--------------

	Workaround for a bug in GtkFileChooserDialog in later versions of
	gtk+-2.24 (dialogs.cpp).

	Change efax-gtk.desktop to meet
	http://specifications.freedesktop.org/menu-spec/menu-spec-latest.html
	recommendations (efax-gtk.desktop).

	Add French translation (Charlie Ledocq) (po/fr.po, LINGUAS).

Version 3.2.10 (21st October 2012)
--------------

        Update build system to automake-1.12.1 and autoconf-2.69.

	Suppress gtk+-3 deprecation warnings (acinclude.m4).

	Set locale even if NLS not set (main.cpp).

	Deal better with GtkMessageDialog format string (dialog.cpp).

	Use automake silent rules (configure.ac).

	Correct icon entry in efax-gtk.desktop file (efax-gtk.desktop).

	Simplify file chooser selection code (dialogs.cpp).

	Call atexit() instead of glib's now deprecated g_atexit() (the use
	of atexit() in this program is entirely safe) (main.cpp).

	Remove unnecessary pointer value check in present_prog()
	(main.cpp).

	Add Spanish translation (Antonio Trujillo) (po/LINGUAS, po/es.po,
	po/efax-gtk.pot; mainwindow.cpp).

	Update copyright notices (COPYING, README; addressbook.h,
	addressbook.cpp, dialogs.h, dialogs.cpp, efax_controller.h,
	efax_controller.cpp, fax_list.h, fax_list.cpp, fax_list_manager.h,
	fax_list_manager.cpp, file_list.h, file_list.cp, gpl.h,
	helpfile.h, helpfile.cpp, logger.h, logger.cpp, main.cpp,
	mainwindow.h, mainwindow.cpp, prog_defs.h, redial_queue.h,
	redial_queue.cpp, settings.h, settings.cpp, settings_help.h,
	settings_help.cpp, socket_list.h, socket_list.cpp,
	socket_notify.h, socket_notify.cpp, socket_server.h,
	socket_server.cpp, tray_icon.h, tray_icon.cpp;
	utils/cairo_handle.h, utils/icon_info_handle.h,
	utils/mono_tiff_print_manager.h,
	utils/mono_tiff_print_manager.cpp,
	utils/pango_layout_iter_handle.h, utils/selected_rows_handle.h,
	utils/selected_rows_handle.cpp, utils/sem_sync.h,
	utils/tiff_handle.h, utils/toolbar_append_widget.h,
	utils/toolbar_append_widget.cpp, utils/tree_path_handle.h,
	utils/tree_row_reference_handle.h, utils/utf8_utils.h,
	utils/utf8_utils.cpp;
	efax-gtk-faxfilter/efax-gtk-socket-client.cpp.

	Update documentation (README).

	Update configuration scripts (acinclude.m4).

Version 3.2.9 (21st December 2011)
-------------

	Have a hard dependency on c++-gtk-utils-1.2 >= 1.2.7 or
	c++-gtk-utils-2.0 >= 2.0.0-rc1, so that C++0x/11 can be more
	easily supported, and maintainability is improved (README,
	acinclude.m4, configure.ac, src/Makefile.am,
	src/utils/Makefile.am, po/POTFILES.in; delete src/internal
	directory and its contents.)

	Make the settings help dialogs of a reasonable size with GTK+3
	(settings_help.cpp).

	Permit IPv6 addresses to be specified with a wildcard and only
	one, or no, ':' character (socket_server.cpp).

	Explicitly set shadow type of fax input frame (mainwindow.cpp).

	Change library linking order (src/Makefile.am and
	efax/Makefile.am).

	Remove unnecessary configure checks (acinclude.m4, configure.ac
	and src/Makefile.am)

	Upgrade gettext to version 0.18 and include m4 macros
	(po/Makefile.in.in, po/Rules-quot, m4 directory, Makefile.am).

	Add proper header checks at configuration time (configure.ac).

Version 3.2.8 (30th March 2011)
-------------

	Permit IPv6 addresses in domain name form as well as in numeric
	format (socket_server.h and socket_server.cpp).

	Improve error checking and so suppress gcc-4.6 warning
	(mainwindow.cpp; utils/mono_tiff_print_manager.cpp).

	Upgrade internal c++-gtk-utils version.

Version 3.2.7.1 (16th March 2011)
---------------

	Correct style change handling (mainwindow.h, mainwindow.cpp).

	Update comments in efax-gtkrc on "SOCK_OTHER_ADDRESSES:" for IPv6
	(efax-gtkrc).

Version 3.2.7 (14th March 2011)
-------------

	Change default gtk target to gtk+3, and permit
	--with-gtk-version=gtk2 and --with=gtk-version=gtk3 as well as
	--with-gtk-version=gtk+2 and --with=gtk-version=gtk+3
	(acinclude.m4, README).

	Provide option for server to accept IPv6 connections (efax-gtkrc;
	prog_defs.h, main.cpp, mainwindow.cpp, settings.h, settings.cpp,
	settings_help.h, settings_help.cpp, socket_server.h and
	socket_server.cpp).

	Use GtkStyleContext for a GTK+3 compile (acinclude.m4;
	addressbook.cpp, dialogs.h, dialogs.cpp, fax_list.cpp,
	fax_list-manager.cpp, helpfile.cpp, logger.cpp, main.cpp,
	mainwindow.h and mainwindow.cpp).

	Correct non-sh-ism in configuration files (acinclude.m4).

	Include efax-gtk.png icon in rpm spec file (efax-gtk.spec.in).

        Minor adjustments to MonoTiffPrintManager implementation
	(utils/mono_tiff_print_manager.h and
	utils/mono_tiff_print_manager.cpp).

	Provide some explicit casts for std::pair constructor required by
	C++0x (dialogs.cpp, fax_list.cpp, file_list.cpp, socket_list.cpp).

	Provide compile option for c++-gtk-utils-2.0 (acinclude.m4,
	README; efax_controller.cpp, fax_list.cpp, gpl.h, logger.cpp,
	socket_server.h and socket_server.cpp).

	Surpress warning about std::auto_ptr being deprecated when
	compiling under C++0x (acinclude.m4).

	Upgrade internal c++-gtk-utils version to 1.2.12 (and also adjust
	the configuration files for that (acinclude.m4, configure.ac;
	src/internal/c++-gtk-utils/Makefile.am)).

Version 3.2.6 (13th November 2010)
-------------

	Do not require dbus-glib where glib >= 2.26 is installed
	(acinclude.4, configure.ac, src/Makefile.am,
	src/internal/c++-gtk-utils/Makefile.am with upgraded
	c++-gtk-utils).

	Fixes for gtk+-2.91 (acinclude.m4, addressbook.cpp, dialogs.cpp,
	fax_list.cpp, fax_list_manager.cpp, helpfile.cpp, logger.cpp,
	main.cpp, mainwindow.h, mainwindow.cpp, settings.cpp and
	socket_notify.cpp).

	Improve widget sizing for widgets displaying text
	(efax_controller.h, mainwindow.h and mainwindow.cpp).

	Fix compilation error with gtk+-2.12 (mainwindow.cpp).

	Remove anachronistic comment (utils/mono_tiff_print_manager.cpp).

	Upgrade internal c++-gtk-utils version to 1.2.7.

Version 3.2.5 (13th October 2010)
-------------

	Fix segfault when printing faxes with cairo-1.10
	(utils/mono_tiff_print_manager.h and
	utils/mono_tiff_print_manager.cpp).

	Use cairo rather than the GDK drawing functions to draw the
	indicator of whether there are print jobs from the socket to be
	faxed (mainwindow.h, mainwindow.cpp and utils/cairo_handle.h).

	Use gtk_tree_view_convert_bin_window_to_widget_coords() instead of
	gtk_widget_get_pointer() in order to obtain the pointer position
	in widget co-ordinates for tree view motion notify events
	(fax_list_manager.cpp).

	Modify argument handling for efax message functions to avoid an
	invalid double call to vfprintf() on the same va_list value (this
	bug is triggered on some systems when using the 'fax' script but
	does not directly affect efax-gtk) (efax/efaxmsg.c, efax/PATCHES).

	Upgrade internal c++-gtk-utils version to 1.2.6.

Version 3.2.4 (2nd August 2010)
-------------

	Fix uncaught exception where a file to be faxed is not in valid
	postscript/PDF format (efax_controller.cpp).

	Include the former gnome stock_send-fax icon as the standard icon
	for efax-gtk (Makefile.am, efax-gtk.desktop, efax-gtk.png,
	AUTHORS; main.cpp).

	Use XkbBell() rather than XBell() where available (acinclude.m4,
	main.cpp).

	Include pkg-config test for x11.pc, if available (acinclude.m4 and
	src/Makefile.am).

	Further build fixes for Debian Hurd (src/efax_controller.cpp and
	src/fax_list.cpp; efax/efaxmsg.c).

	Update Hungarian translation (László Csordás) (hu.po and
	mainwindow.cpp).

	Remove redundant anonymous namespace for callbacks with C linkage
	(addressbook.h, addressbook.cpp, dialogs.h, dialogs.cpp,
	fax_list.h, fax_list.cpp, fax_list_manager.h,
	fax_list_manager.cpp, file_list.h, file_list.cpp, helpfile.h,
	helpfile.cpp, logger.h, logger.cpp, mainwindow.h, mainwindow.cpp,
	redial_queue.h, redial_queue.cpp, settings.h, settings.cpp,
	settings_help.h, settings_help.cpp, socket_list.h,
	socket_list.cpp, socket_notify.h, socket_notify.cpp, tray_icon.h,
	tray_icon.cpp, utils/mono_tiff_print_manager.h,
	utils/mono_tiff_print_manager.cpp, utils/selected_rows_handle.h,
	utils/selected_rows_handle.cpp).

	Correct linkage specification of present_prog() (main.cpp).

	Use Cgu::start_timeout_seconds() rather than Cgu::start_timeout()
	where available (fax_list_manager.cpp, logger.cpp).

	Remove redundant comments (prog_defs.h,
	utils/toolbar_append_widget.cpp).

	Upgrade internal c++-gtk-utils version to 1.2.4.

6 files changed, 42 insertions, 57 deletions

diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index c35543306e5..4e2ac531fe0 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2014/05/05 00:47:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2014/07/19 06:44:05 ryoon Exp $
 
-DISTNAME=	efax-gtk-3.2.3.src
-PKGNAME=	efax-gtk-3.2.3
-PKGREVISION=	20
+DISTNAME=	efax-gtk-3.2.13.src
+PKGNAME=	${DISTNAME:S/.src//}
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
 EXTRACT_SUFX=	.tgz
@@ -21,19 +20,19 @@ CONFIGURE_ARGS+=	--with-spooldir=${VARBASE}/spool/efax
 LDFLAGS.DragonFly=	-lX11
 LDFLAGS.SunOS+=		-lX11 -lsocket -lnsl
 
+OWN_DIRS_PERMS+=	${VARBASE}/spool/efax lp lp 755
+
 EGDIR=			${PREFIX}/share/examples
 CONF_FILES=		${EGDIR}/efax-gtkrc ${PKG_SYSCONFDIR}/efax-gtkrc
 
 SUBST_CLASSES+=		xopen
 SUBST_MESSAGE.xopen=	Removing _XOPEN_SOURCE=600 definition
-SUBST_STAGE.xopen=	post-patch
+SUBST_STAGE.xopen=	pre-configure
 SUBST_FILES.xopen=	src/Makefile.in src/utils/Makefile.in
-SUBST_FILES.xopen+=	src/internal/c++-gtk-utils/Makefile.in
 SUBST_SED.xopen=	-e 's,-D_XOPEN_SOURCE=600,,'
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../x11/gtkmm/buildlink3.mk"
+.include "../../x11/c++-gtk-utils/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/efax-gtk/PLIST b/comms/efax-gtk/PLIST
index c5a95597b00..079f1284b16 100644
--- a/comms/efax-gtk/PLIST
+++ b/comms/efax-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/01/07 13:46:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/07/19 06:44:05 ryoon Exp $
 bin/efax-0.9a
 bin/efax-gtk
 bin/efix-0.9a
@@ -12,6 +12,8 @@ share/locale/ca/LC_MESSAGES/efax-gtk.mo
 share/locale/de/LC_MESSAGES/efax-gtk.mo
 share/locale/el/LC_MESSAGES/efax-gtk.mo
 share/locale/en_GB/LC_MESSAGES/efax-gtk.mo
+share/locale/es/LC_MESSAGES/efax-gtk.mo
+share/locale/fr/LC_MESSAGES/efax-gtk.mo
 share/locale/he/LC_MESSAGES/efax-gtk.mo
 share/locale/hu/LC_MESSAGES/efax-gtk.mo
 share/locale/it/LC_MESSAGES/efax-gtk.mo
@@ -21,3 +23,4 @@ share/locale/sq/LC_MESSAGES/efax-gtk.mo
 share/locale/sv/LC_MESSAGES/efax-gtk.mo
 share/locale/zh_CN/LC_MESSAGES/efax-gtk.mo
 share/locale/zh_TW/LC_MESSAGES/efax-gtk.mo
+share/pixmaps/efax-gtk.png
diff --git a/comms/efax-gtk/distinfo b/comms/efax-gtk/distinfo
index f6c8819086c..e578aab8407 100644
--- a/comms/efax-gtk/distinfo
+++ b/comms/efax-gtk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2010/06/12 00:08:54 wiz Exp $
+$NetBSD: distinfo,v 1.24 2014/07/19 06:44:05 ryoon Exp $
 
-SHA1 (efax-gtk-3.2.3.src.tgz) = 4c46b1cdbf2c7ab7fb82bccb48a2e655a76c302d
-RMD160 (efax-gtk-3.2.3.src.tgz) = 642b8a742515a8f8ed1c0ed78d59911401a1bf9d
-Size (efax-gtk-3.2.3.src.tgz) = 1280080 bytes
-SHA1 (patch-aa) = 6e45e4779af6c8fd2f729daf988049ec1c31b5ed
+SHA1 (efax-gtk-3.2.13.src.tgz) = 78ff25f2cdf4b4602fa0a7c92b26e3e8aeb14c7e
+RMD160 (efax-gtk-3.2.13.src.tgz) = 74054326b2de7f3ad54b9ec792f6e91e01c15281
+Size (efax-gtk-3.2.13.src.tgz) = 1245015 bytes
+SHA1 (patch-aa) = 6e8e744170010b07c893222fefb9c387a9400c0f
 SHA1 (patch-ab) = bb6ce03029f07ffd041fc04fb2c5196f1522b11c
 SHA1 (patch-ac) = 37437cfc0ca259cecfd25aa4652c8009cfdb8066
-SHA1 (patch-ad) = a80a536aed81ac60a5f3e9a414c944bd33281707
+SHA1 (patch-efax-gtk-faxfilter_Makefile.in) = 9b57a2afbabe172c894ea914b2fdf7542c172276
diff --git a/comms/efax-gtk/patches/patch-aa b/comms/efax-gtk/patches/patch-aa
index 570cdd115cf..5c5d456b708 100644
--- a/comms/efax-gtk/patches/patch-aa
+++ b/comms/efax-gtk/patches/patch-aa
@@ -1,22 +1,21 @@
-$NetBSD: patch-aa,v 1.11 2010/06/10 06:44:00 adam Exp $
+$NetBSD: patch-aa,v 1.12 2014/07/19 06:44:05 ryoon Exp $
 
---- Makefile.in.orig	2010-06-04 08:50:10.000000000 +0000
+--- Makefile.in.orig	2014-04-11 10:10:35.000000000 +0000
 +++ Makefile.in
-@@ -392,15 +392,15 @@ uninstall-desktopDATA:
- 	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples"
+@@ -518,7 +518,7 @@ install-sysconfDATA: $(sysconf_DATA)
  	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	if test -n "$$list"; then \
+ 	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
++	  $(MKDIR_P) "$(DESTDIR)$(datadir)/examples" || exit 1; \
+ 	fi; \
  	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
+@@ -526,7 +526,7 @@ install-sysconfDATA: $(sysconf_DATA)
  	done | $(am__base_list) | \
  	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
 -	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples'"; \
 +	  $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples" || exit $$?; \
  	done
  
diff --git a/comms/efax-gtk/patches/patch-ad b/comms/efax-gtk/patches/patch-ad
deleted file mode 100644
index c4e2b6a2566..00000000000
--- a/comms/efax-gtk/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2010/06/10 06:44:00 adam Exp $
-
---- configure.orig	2010-06-03 20:27:33.000000000 +0000
-+++ configure
-@@ -4999,7 +4999,7 @@ $as_echo_n "checking which version of gt
- # Check whether --with-gtk-version was given.
- if test "${with_gtk_version+set}" = set; then :
-   withval=$with_gtk_version;
--    if test "x$withval" == "xgtk+2";  then
-+    if test "x$withval" = "xgtk+2";  then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+2" >&5
- $as_echo "gtk+2" >&6; }
-       CGU_GTK_VERSION=2
-@@ -5098,7 +5098,7 @@ $as_echo "no" >&6; }
-      as_fn_error "Library requirements (gtk+-2.0 >= 2.12.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-   fi
- 
--    elif test "x$withval" == "xgtk+3";  then
-+    elif test "x$withval" = "xgtk+3";  then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk+3" >&5
- $as_echo "gtk+3" >&6; }
-       CGU_GTK_VERSION=3
-@@ -5197,7 +5197,7 @@ $as_echo "no" >&6; }
-      as_fn_error "Library requirements (gtk+-3.0 >= 2.90.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
-   fi
- 
--    elif test "x$withval" == "xauto";  then
-+    elif test "x$withval" = "xauto";  then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto" >&5
- $as_echo "auto" >&6; }
- 
diff --git a/comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in b/comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in
new file mode 100644
index 00000000000..6f7541bd1ca
--- /dev/null
+++ b/comms/efax-gtk/patches/patch-efax-gtk-faxfilter_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-efax-gtk-faxfilter_Makefile.in,v 1.1 2014/07/19 06:44:05 ryoon Exp $
+
+--- efax-gtk-faxfilter/Makefile.in.orig	2014-04-11 10:10:35.000000000 +0000
++++ efax-gtk-faxfilter/Makefile.in
+@@ -664,8 +664,8 @@ uninstall-am: uninstall-spoolPROGRAMS un
+ 
+ 
+ install-data-hook:
+-	-chown lp $(spooldir) 2> /dev/null
+-	-chgrp lp $(spooldir) 2> /dev/null
++	#-chown lp $(spooldir) 2> /dev/null
++	#-chgrp lp $(spooldir) 2> /dev/null
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.