Update to 2.3.1

Add PKG_OPTION gtk2 to compile with gtk2 support instead of gtk1. Please
note the warnings below.

Changelog:

18/08/06
        v2.3.1  - Fixed the bug, introduced in v2.3.0, where the "Hide
                  typing" check button always appeared in the input boxes,
                  regardless of the existence of a password field.

13/08/06
        v2.3.0  - Added a new --password=1|2 syntax to allow a password
                  field in one of the first fields of --2inputsbox and
                  --3inputsbox.
                - Added optional <red> <green> <blue> parameters for the
                  --colorsel widget.
                - Corrected a bug in the --treeview widget which was failing
                  to properly build a tree when decreasing the level of an
                  item by more than 1, compared to the level of the previous
                  item.
                - Corrected a bug in the --colorsel widget which triggered a
                  GTK warning when the --icon option was used.
                - Adapted a patch from Jean-Philippe Guillemin for the GTK2
                  version of Xdialog (this version is still seriously
                  broken:
                  DO NOT use it in production projects), implementing the
                  use
                  of the GTK2 stock icons for the Xdialog buttons.

06/05/06
        v2.2.1  - Corrected the bug in the --dselect widget which was
                  returning a filename by default, instead of the directory
                  name. Also removed the file specific fields and buttons
                  from
                  the directory selector.
                - Corrected a typo in the man page.

26/01/06
        v2.2.0	- Added preliminary GTK2 support (adapted from a patch by
                  Andrew Van Uitert). Run 'configure' with the --with-gtk2
                  option to enable the compilation against GTK2.
                  !!!! BEWARE !!!!  This should be considered alpha-code,
                  and the GTK2 version of Xdialog does not yet implement
                  everything the GTK1 version got. It also got many problems
                  when running on non-UTF8 systems... For -SERIOUS- use, use
                  the GTK+ v1.2.10 version of Xdialog !
                - Added the --timeout option for compatibility with cdialog
                  (requested by Michelle Konzack).
                - Partly successful attempt at fixing a problem with some
                  patched GTK versions (Mandrake's, for instance) which are
                  reseting the theme each time all windows are closed (thus
                  breaking --rc-file). Still an issue with the fixed fonts
                  of
                  the XDIALOG_HIGH_DIALOG_COMPAT mode, because of another
                  weird patch (rclocal patch): get unpatched version of GTK+
                  v1.2.10. Such a version is available on Xdialog's website.
                - The default fixed font is now:
                  "-*-*-medium-r-normal-*-*-*-*-*-m-70-*-*"
                  (removed the iso8859-1 specification).
                - Implemented a custom log message handler to prevent
                  GTK/GDK/
                  GLIB from using stdout as the message output.
                - Added XDIALOG_NO_GMSGS environment variable support to
                  forbid
                  (when TRUE) emission of GTK/GDK/GLIB messages on stderr.
                - Brazillian Protuguese translation updates (courtesy of
                  Ricardo Bertagna).
                - Upgrade to gettext-0.14.1.

23/07/04
        v2.1.2	- Added the ESC keyboard shortcut for the CANCEL/NO button.
	        - Added the Indonesian, Dutch, Polish, Italian, Catalan and
                  Swedish translations.
                - Changed Xmessage and textbox samples for compatibility
                  with bash-less systems.
                - Updated for gettext v0.13.1.
                - Added fixes in the spec file for automake bugs.

9 files changed, 69 insertions, 113 deletions

diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 3e7cbc3de11..607cd935239 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2006/11/11 16:53:10 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2008/08/29 16:43:58 sborrill Exp $
 #
 
-DISTNAME=		Xdialog-2.1.1
+DISTNAME=		Xdialog-2.3.1
 PKGNAME=		${DISTNAME:S/^X/x/}
-PKGREVISION=		3
 CATEGORIES=		x11 misc
-MASTER_SITES=		http://thgodef.nerim.net/xdialog/	\
-			http://thgodef.nerim.net/xdialog/archives/
+MASTER_SITES=		http://xdialog.free.fr/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -34,5 +32,6 @@ post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/samples/$${f} ${EGDIR};	\
 	done
 
-.include "../../x11/gtk/buildlink3.mk"
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdialog/PLIST b/x11/xdialog/PLIST
index 4fcc9560cc0..4234750fda1 100644
--- a/x11/xdialog/PLIST
+++ b/x11/xdialog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/08/29 16:43:58 sborrill Exp $
 bin/Xdialog
 man/man1/Xdialog.1
 share/doc/html/xdialog/2ranges.png
@@ -78,12 +78,18 @@ share/examples/xdialog/textbox
 share/examples/xdialog/timebox
 share/examples/xdialog/treeview
 share/examples/xdialog/yesno
+share/locale/ca/LC_MESSAGES/Xdialog.mo
 share/locale/de/LC_MESSAGES/Xdialog.mo
 share/locale/es/LC_MESSAGES/Xdialog.mo
 share/locale/fr/LC_MESSAGES/Xdialog.mo
 share/locale/hu/LC_MESSAGES/Xdialog.mo
+share/locale/id/LC_MESSAGES/Xdialog.mo
+share/locale/it/LC_MESSAGES/Xdialog.mo
+share/locale/nl/LC_MESSAGES/Xdialog.mo
 share/locale/no_NO/LC_MESSAGES/Xdialog.mo
+share/locale/pl/LC_MESSAGES/Xdialog.mo
 share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
 share/locale/ru/LC_MESSAGES/Xdialog.mo
+share/locale/sv_SE/LC_MESSAGES/Xdialog.mo
 @dirrm share/examples/xdialog
 @dirrm share/doc/html/xdialog
diff --git a/x11/xdialog/distinfo b/x11/xdialog/distinfo
index 73fe2be3248..ce809963edf 100644
--- a/x11/xdialog/distinfo
+++ b/x11/xdialog/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.6 2008/08/29 16:43:58 sborrill Exp $
 
-SHA1 (Xdialog-2.1.1.tar.bz2) = fc412c3a80ed5040eb84790990b3a95e75d1a20d
-RMD160 (Xdialog-2.1.1.tar.bz2) = 1e2b58e5ecc7086a2206ced437c737285a72579a
-Size (Xdialog-2.1.1.tar.bz2) = 439548 bytes
-SHA1 (patch-aa) = 8869174d43ecf415caa68a2dc3ccdc122f0a162c
-SHA1 (patch-ab) = caee58c681f467e84f0f1f8237d58bbe1faf2d3a
-SHA1 (patch-ac) = 1c2109802baca4970b5d1f00a53ca0147ea39496
-SHA1 (patch-ad) = b87bec96eaf785b016bfeacbaab9ce34225c2d29
-SHA1 (patch-ae) = a15f73ab6acdd626838272eb2fe40d9e4b879aa3
+SHA1 (Xdialog-2.3.1.tar.bz2) = 292c552506633c54a28d51aa290277b7b5c0c708
+RMD160 (Xdialog-2.3.1.tar.bz2) = 12085dfddc9217fe5f07510c76755eb75446e658
+Size (Xdialog-2.3.1.tar.bz2) = 457938 bytes
+SHA1 (patch-ac) = c7f922ac80d0938e73ae50824f9e18855390ffd2
+SHA1 (patch-ad) = 8f5ee338a95eb082f95705e9d2f528199841317c
+SHA1 (patch-ae) = f613366909f25ed952b3ae33e8542f4a561f2c4b
diff --git a/x11/xdialog/options.mk b/x11/xdialog/options.mk
new file mode 100644
index 00000000000..7ab7a7d6bc7
--- /dev/null
+++ b/x11/xdialog/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2008/08/29 16:43:58 sborrill Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.xdialog
+PKG_SUPPORTED_OPTIONS=		gtk2
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+= --with-gtk2
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+.include "../../x11/gtk/buildlink3.mk"
+.endif
diff --git a/x11/xdialog/patches/patch-aa b/x11/xdialog/patches/patch-aa
deleted file mode 100644
index ad17eb489d3..00000000000
--- a/x11/xdialog/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/05/13 23:33:02 salo Exp $
-
---- samples/Xmessage.orig	2001-04-10 17:33:50.000000000 +0200
-+++ samples/Xmessage	2003-05-14 00:09:14.000000000 +0200
-@@ -19,7 +19,7 @@
- FONT="--fixed-font"
- TIMEOUT=""
- 
--if [ "$1" == "" ] ; then
-+if [ "$1" = "" ] ; then
- 	echo "usage: Xmessage [-options] [message]
- 
- where options include:
-@@ -93,7 +93,7 @@
- 
- # We cannot emulate the "-buttons" option, so give up and use the true "xmessage"
- # if this option was specified in the command line...
--if [ "$BUTTONS" == "true" ] ; then
-+if [ "$BUTTONS" = "true" ] ; then
- 	echo "Buttons related options (-buttons, -default, -print) not supported,"
- 	echo "invoking \"xmessage\" intead..." 1>&2
- 	xmessage "$OPTIONS"
-@@ -107,7 +107,7 @@
- 	# the textbox or the tailbox.
- 	#
- 	# So first start Xdialog as an asynchronous process...
--	if [ "$FILE" == "" ] ; then
-+	if [ "$FILE" = "" ] ; then
- 		echo "$TEXT" | \
- 		Xdialog --title "$TITLE" --wmclass "$WMCLASS" $PLACEMENT $FONT --no-cancel \
- 			--tailbox "-" $YSIZE $XSIZE &
-@@ -125,7 +125,7 @@
- 	while (( $TIMEOUT > 0 )) ; do
- 		sleep 1
- 		STILL_THERE=`ps | awk --source "$SOURCE"`
--		if [ "$STILL_THERE" == "" ] ; then
-+		if [ "$STILL_THERE" = "" ] ; then
- 			exit 0
- 		fi
- 		let TIMEOUT=$TIMEOUT-1
-@@ -135,7 +135,7 @@
- 	exit 0
- else
- 	# No timeout, just start Xdialog synchronously then...
--	if [ "$FILE" == "" ] ; then
-+	if [ "$FILE" = "" ] ; then
- 		echo "$TEXT" | \
- 		Xdialog --title "$TITLE" --wmclass "$WMCLASS" $PLACEMENT $FONT --no-cancel \
- 			--tailbox "-" $YSIZE $XSIZE
diff --git a/x11/xdialog/patches/patch-ab b/x11/xdialog/patches/patch-ab
deleted file mode 100644
index c4dbb2122e8..00000000000
--- a/x11/xdialog/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/05/13 23:33:02 salo Exp $
-
---- samples/textbox.orig	2001-04-10 17:31:24.000000000 +0200
-+++ samples/textbox	2003-05-14 00:39:59.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- EOF
- 
--cat /etc/bashrc | expand >> /tmp/textbox.tmp.$$
-+cat /etc/services | expand >> /tmp/textbox.tmp.$$
- 
- $DIALOG --title "TEXT BOX" --textbox "/tmp/textbox.tmp.$$" 0 0
- 
diff --git a/x11/xdialog/patches/patch-ac b/x11/xdialog/patches/patch-ac
index b36d5962358..8efbadcc3dd 100644
--- a/x11/xdialog/patches/patch-ac
+++ b/x11/xdialog/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/05/13 23:33:02 salo Exp $
+$NetBSD: patch-ac,v 1.2 2008/08/29 16:43:58 sborrill Exp $
 
---- doc/Xdialog.man.orig	2001-12-02 09:51:47.000000000 +0100
-+++ doc/Xdialog.man	2003-05-14 01:15:07.000000000 +0200
-@@ -260,11 +260,11 @@
+--- doc/Xdialog.man.orig	2008-08-29 15:18:19.000000000 +0100
++++ doc/Xdialog.man	2008-08-29 15:20:05.000000000 +0100
+@@ -268,11 +268,11 @@
  .br 
  \fI%%datadir%%/locale/*/LC_MESSAGES/Xdialog.mo\fP 
  .br 
@@ -17,15 +17,15 @@ $NetBSD: patch-ac,v 1.1 2003/05/13 23:33:02 salo Exp $
  .SH "ENVIRONMENT VARIABLES"
  .LP 
  \fIXDIALOG_HIGH_DIALOG_COMPAT\fR
-@@ -294,9 +294,9 @@
- See the notes about \fBXDIALOG_HIGH_DIALOG_COMPAT\fR above.
+@@ -306,9 +306,9 @@
+ Setting this variable to 1 will prevent the Gdk, GLib and Gtk library from emitting messages via g_log().
  .SH "EXAMPLES"
  .LP 
 -Sample scripts are available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/samples/\fR directory.
 +Sample scripts are available in the \fI%%datadir%%/examples/xdialog\fR directory.
  .br 
 -Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/Xdialog\-%%version%%/\fR directory.
-+Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/html/dialog\fR directory.
++Full HTML doc with screen shots, examples and FAQ is available in the \fI%%datadir%%/doc/html/xdialog\fR directory.
  .SH "AUTHORS"
  .LP 
  Thierry Godefroy <xdialog@free.fr> (from v1.1.0 onwards)
diff --git a/x11/xdialog/patches/patch-ad b/x11/xdialog/patches/patch-ad
index d12edbc95d2..e3195f89bdf 100644
--- a/x11/xdialog/patches/patch-ad
+++ b/x11/xdialog/patches/patch-ad
@@ -1,27 +1,25 @@
-$NetBSD: patch-ad,v 1.1 2003/05/14 18:53:39 salo Exp $
+$NetBSD: patch-ad,v 1.2 2008/08/29 16:43:58 sborrill Exp $
 
---- doc/Makefile.in.orig	2003-04-02 21:30:29.000000000 +0200
-+++ doc/Makefile.in	2003-05-14 20:03:07.000000000 +0200
-@@ -90,11 +90,11 @@
- 
+--- doc/Makefile.in.orig	2008-08-29 15:26:07.000000000 +0100
++++ doc/Makefile.in	2008-08-29 15:26:31.000000000 +0100
+@@ -164,9 +164,9 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign no-dependencies
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = 
- 
++docdir =
  CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1
- 
 -doc_DATA = index.html compatibility.html changelog.html license.html $(srcdir)/*.html $(srcdir)/*.png
 +doc_DATA = index.html compatibility.html changelog.html license.html
- 
  man_MANS = Xdialog.1
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -210,7 +210,7 @@
- install-exec-am:
- install-exec: install-exec-am
+ all: all-am
+ 
+@@ -347,7 +347,7 @@
+ 
+ info-am:
  
--install-data-am: install-man install-docDATA
+-install-data-am: install-docDATA install-man
 +install-data-am: install-man
- install-data: install-data-am
  
- install-am: all-am
+ install-exec-am:
+ 
diff --git a/x11/xdialog/patches/patch-ae b/x11/xdialog/patches/patch-ae
index 89e55db3845..00fcc3c8cf9 100644
--- a/x11/xdialog/patches/patch-ae
+++ b/x11/xdialog/patches/patch-ae
@@ -1,13 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2003/05/14 18:53:39 salo Exp $
+$NetBSD: patch-ae,v 1.2 2008/08/29 16:43:58 sborrill Exp $
 
---- Makefile.in.orig	2003-05-14 20:08:32.000000000 +0200
-+++ Makefile.in	2003-05-14 20:28:18.000000000 +0200
-@@ -92,7 +92,7 @@
- 
- SUBDIRS = lib intl src po doc
- 
+--- Makefile.in.orig	2008-08-29 16:27:35.000000000 +0100
++++ Makefile.in	2008-08-29 16:27:52.000000000 +0100
+@@ -186,9 +186,9 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ SUBDIRS = m4 lib src po doc
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = 
- 
- CONFIG_CLEAN_FILES = ltmain.sh ltconfig
- 
++docdir =
+ CONFIG_CLEAN_FILES = ltmain.sh ltconfig autom4te.cache/*
+-doc_DATA = $(srcdir)/samples/*
++doc_DATA =
+ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = config.rpath
+ all: config.h