summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-shell-extensions/Makefile3
-rw-r--r--x11/zenity/Makefile12
-rw-r--r--x11/zenity/pkg-plist1
-rw-r--r--x11/zenity3/Makefile13
-rw-r--r--x11/zenity3/pkg-plist1
5 files changed, 11 insertions, 19 deletions
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 64945397c..7034a2465 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -1,6 +1,6 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-#
+# $MCom$
PORTNAME= gnome-shell-extensions
PORTVERSION= 3.6.2
@@ -13,7 +13,6 @@ COMMENT= GNOME desktop shell extensions
LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop
RUN_DEPENDS= gnome-shell>=3.6.2:${PORTSDIR}/x11/gnome-shell
-NO_STAGE= yes
USE_BZIP2= yes
USES= gettext gmake pathfix pkgconfig
USE_GNOME= glib20 gnomedesktop3 intltool
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
diff --git a/x11/zenity3/Makefile b/x11/zenity3/Makefile
index 15ee5abe7..089ff6de6 100644
--- a/x11/zenity3/Makefile
+++ b/x11/zenity3/Makefile
@@ -1,6 +1,6 @@
# Created by: Franz Klammer <klammer@webonaut.com>
# $FreeBSD$
-# $MCom: ports/trunk/x11/zenity3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom$
PORTNAME= zenity
PORTVERSION= 3.6.0
@@ -16,8 +16,8 @@ LICENSE= LGPL20
BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
-NO_STAGE= yes
-LATEST_LINK= zenity3
+CONFLICTS= gtkada-1.2.* zenity-2.*
+
USES= gettext gmake pathfix pkgconfig
USE_GNOME= gnomeprefix gtk30 intlhack
USE_XORG= x11
@@ -25,11 +25,6 @@ USE_XZ= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= LIBS="-pthread"
-
-MAN1= zenity.1
-
-CONFLICTS= gtkada-1.2.*
OPTIONS_DEFINE= NOTIFY
OPTIONS_DEFAULT=NOTIFY
@@ -37,7 +32,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/zenity3/pkg-plist b/x11/zenity3/pkg-plist
index 568fb4099..8a2f4f3c1 100644
--- a/x11/zenity3/pkg-plist
+++ b/x11/zenity3/pkg-plist
@@ -1,5 +1,6 @@
bin/gdialog
bin/zenity
+man/man1/zenity.1.gz
share/help/C/zenity/calendar.page
share/help/C/zenity/color-selection.page
share/help/C/zenity/entry.page