From 0fef6aea68fd5d827215b2eaa0c8bbc96267fcc9 Mon Sep 17 00:00:00 2001
From: mezz <mezz@FreeBSD.org>
Date: Mon, 7 Apr 2008 20:22:18 +0000
Subject: -Update to 2.22.1. -Remove USE_XLIB and remove gconf2 dependency.
 -Add libnotify option, enable by default.

---
 x11/zenity/Makefile  | 21 +++++++++++++++------
 x11/zenity/distinfo  |  6 +++---
 x11/zenity/pkg-plist |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'x11')

diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index fe4e9e25f535..00b0dd39c6e1 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.22.0
+PORTVERSION=	2.22.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,9 +18,8 @@ COMMENT=	Display GNOME dialogs from the command line
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack libgnomecanvas gnomedocutils intlhack
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -33,4 +31,15 @@ MAN1=		zenity.1
 
 CONFLICTS=	gtkada-1.2.*
 
-.include <bsd.port.mk>
+OPTIONS=	NOTIFY "Enable libnotify support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+=		notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=	--enable-libnotify
+.else
+CONFIGURE_ARGS+=	--disable-libnotify
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 3507e2a8df1e..759db273c7d1 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/zenity-2.22.0.tar.bz2) = f482090f1bd4946a2f8aee8e73200b04
-SHA256 (gnome2/zenity-2.22.0.tar.bz2) = d7c1277b7e69b41c1e21814a6cd613220b06b522fbfbf931f42b1c4b557bfaee
-SIZE (gnome2/zenity-2.22.0.tar.bz2) = 1821422
+MD5 (gnome2/zenity-2.22.1.tar.bz2) = 4e1e1f080e7253ee4f6a5cee3306c78d
+SHA256 (gnome2/zenity-2.22.1.tar.bz2) = 6a3914b927970467efb5da938c57fbe9c4078cf088e1d2accab5488ff5cba4be
+SIZE (gnome2/zenity-2.22.1.tar.bz2) = 1845688
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 2b697946e3c0..3ccc853a415e 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -113,8 +113,8 @@ share/locale/am/LC_MESSAGES/zenity.mo
 share/locale/ar/LC_MESSAGES/zenity.mo
 share/locale/as/LC_MESSAGES/zenity.mo
 share/locale/az/LC_MESSAGES/zenity.mo
-share/locale/be@latin/LC_MESSAGES/zenity.mo
 share/locale/be/LC_MESSAGES/zenity.mo
+share/locale/be@latin/LC_MESSAGES/zenity.mo
 share/locale/bg/LC_MESSAGES/zenity.mo
 share/locale/bn/LC_MESSAGES/zenity.mo
 share/locale/bn_IN/LC_MESSAGES/zenity.mo
-- 
cgit