From 22d748d9e6156f93555717ea9f3214e36e167770 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Thu, 16 Jan 2014 21:18:10 +0000
Subject: Remove NO_STAGE completely from MC. Misc small cleanups.

gnome-keyring is a dry commit.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18972 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/zenity/Makefile  | 12 ++++--------
 x11/zenity/pkg-plist |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'x11/zenity')

diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index c51d957e3..9d9dea9cb 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,6 +1,6 @@
 # Created by: Franz Klammer <klammer@webonaut.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/zenity/Makefile 18393 2013-04-26 21:23:07Z kwm $
+#   $MCom$
 
 PORTNAME=	zenity
 PORTVERSION=	2.32.1
@@ -15,7 +15,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
 
-NO_STAGE=	yes
+CONFLICTS=	gtkada-1.2.* zenity3-*
+
 USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
 USE_BZIP2=	yes
 USES=		gettext gmake pathfix pkgconfig
@@ -23,11 +24,6 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	LIBS="-lintl ${PTHREAD_LIBS}"
-
-MAN1=		zenity.1
-
-CONFLICTS=	gtkada-1.2.*
 
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
@@ -35,7 +31,7 @@ OPTIONS_DEFAULT=NOTIFY
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=		notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		libnotify.so:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--enable-libnotify
 .else
 CONFIGURE_ARGS+=	--disable-libnotify
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 96e303ee5..394244024 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -1,5 +1,6 @@
 bin/gdialog
 bin/zenity
+man/man1/zenity.1.gz
 share/gnome/help/zenity/C/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-error-screenshot.png
-- 
cgit v1.2.3