Update to 1.8:

* Fix quote and output bugs [Christian]
* Hook up 'activate' on text entry [Glynn, raf@noduck.net]
* Fix up Solaris build [Damien]
* Fix up spec file [Glynn]
* Add locale header [Leonardo]
* Make dialogs resizable [Ingo]
* Unmark translation messages [Christian]
* Fix up gdialog wrapper [Peter]

4 files changed, 18 insertions, 21 deletions

diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index f791a3ef04c..354c029cba2 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/06 22:07:00 jmmv Exp $
 #
 
-DISTNAME=	zenity-1.6
-PKGREVISION=	3
+DISTNAME=	zenity-1.8
 CATEGORIES=	x11 gnome2
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/1.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/1.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
@@ -23,6 +22,7 @@ USE_X11=		yes
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/libgnomecanvas/buildlink2.mk"
 .include "../../textproc/intltool/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/zenity/PLIST b/x11/zenity/PLIST
index ca6d4ed8352..ede9f11983e 100644
--- a/x11/zenity/PLIST
+++ b/x11/zenity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/03 23:40:39 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/06 22:07:00 jmmv Exp $
 bin/gdialog
 bin/zenity
 man/man1/zenity.1
@@ -15,6 +15,7 @@ share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/C/legal.xml
 share/gnome/help/zenity/C/zenity.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/zenity-0.1.mo
@@ -26,6 +27,9 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/zenity-0.1.mo
@@ -34,8 +38,11 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/zenity-0.1.mo
@@ -48,6 +55,7 @@ ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/zenity-0.1.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/zenity-0.1.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
@@ -69,6 +77,8 @@ share/zenity/zenity.png
 @dirrm share/zenity/clothes
 @dirrm share/zenity
 @dirrm share/omf/zenity
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/zenity/C/figures
 @dirrm share/gnome/help/zenity/C
 @dirrm share/gnome/help/zenity
+@comment in gnome2-dirs: @dirrm share/gnome/help
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index c307d305356..f4ee982284a 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/03 23:40:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/02/06 22:07:00 jmmv Exp $
 
-SHA1 (zenity-1.6.tar.bz2) = e7c861d26b3869c1061890470367273438dfab6b
-Size (zenity-1.6.tar.bz2) = 417606 bytes
-SHA1 (patch-aa) = 67fb03e5eb039913c1821aa07aa29af720324e71
+SHA1 (zenity-1.8.tar.bz2) = a3de5d75df934432b60ed119ed712692b8365675
+Size (zenity-1.8.tar.bz2) = 440948 bytes
diff --git a/x11/zenity/patches/patch-aa b/x11/zenity/patches/patch-aa
deleted file mode 100644
index 90f97b1bbbc..00000000000
--- a/x11/zenity/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/03 23:40:39 xtraeme Exp $
-
---- src/main.c.orig	2003-10-12 04:51:37.000000000 +0200
-+++ src/main.c	2003-10-12 04:51:48.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include "zenity.h"
- #include <stdlib.h>
-+#include <locale.h> 
- #include <popt.h>
- #include <langinfo.h>
-