Convert almost all gnome@ ports to OptionsNG, trim header, use USES=pathfix

instead of gnomehack and pet portlint.
Add conflicts with future gnome3 versions.

Reviewed by:	miwi, bapt

12 files changed, 132 insertions, 198 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index e5a702086f7..06c3b8a7fe1 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:   gdm2
-# Date created:        20 May 2002
-# Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $
-#
+#   $MCom: ports/x11/gdm/Makefile,v 1.192 2012/09/03 16:28:28 mezz Exp $
 
 PORTNAME=	gdm
-PORTVERSION=	2.30.5
-PORTREVISION=	6
+PORTVERSION=	2.30.7
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,21 +14,23 @@ COMMENT=	GNOME 2 version of xdm display manager
 
 BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
-		polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \
+LIB_DEPENDS=	ck-connector:${PORTSDIR}/sysutils/consolekit \
+		polkit-gtk-1:${PORTSDIR}/sysutils/polkit-gnome \
     		execinfo:${PORTSDIR}/devel/libexecinfo \
-		upower-glib.1:${PORTSDIR}/sysutils/upower \
-		xklavier.12:${PORTSDIR}/x11/libxklavier \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+		upower-glib:${PORTSDIR}/sysutils/upower \
+		xklavier:${PORTSDIR}/x11/libxklavier \
+		canberra-gtk:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
 		gnome-session:${PORTSDIR}/x11/gnome-session \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
+CONFLICTS=	gdm-3.[0-9]*
+
 USERS=		gdm
 GROUPS=		gdm
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
@@ -40,7 +38,8 @@ INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier gconf2 librsvg2 \
+USES=		pathfix
+USE_GNOME=	intlhack gnomehier gconf2 librsvg2 \
 		gnomedocutils gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
@@ -58,19 +57,20 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNOME_LOCALSTATEDIR=	/var
 
-OPTIONS=	IPV6 "Enable IPv6 support" off \
-		KEYRING "Enable GnomeKeyring/PAM integration" on
+OPTIONS_DEFINE=	IPV6 KEYRING
+OPTIONS_DEFAULt=KEYRING
+KEYRING_DESC=	GnomeKeyring/PAM integration
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_KEYRING)
-SUB_LIST+=	PAM_KEYRING=\#
-.else
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+.if ${PORT_OPTIONS:MKEYRING}
+LIB_DEPENDS+=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 SUB_LIST+=	PAM_KEYRING=
+.else
+SUB_LIST+=	PAM_KEYRING=\#
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
@@ -106,4 +106,4 @@ post-install:
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 11fd7392b7e..1346e9a0ca6 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdm-2.30.5.tar.bz2) = faa1cbaecf84a7015f8bfd242200deae9b7c18bf6f7ad38335fd1503e023f92d
-SIZE (gnome2/gdm-2.30.5.tar.bz2) = 2406523
+SHA256 (gnome2/gdm-2.30.7.tar.xz) = e5a098ebf0fdb5aff669dfca6e696433c4c8962c005bd13f296b7e13a60bc03b
+SIZE (gnome2/gdm-2.30.7.tar.xz) = 1715056
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index bdc726d08d8..9feb8801fe6 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,30 +1,26 @@
 #!/bin/sh
-
 # $FreeBSD$
-#    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $
-#
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.50 2012/01/15 18:18:36 kwm Exp $
+
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
 #
 # Add the following to /etc/rc.conf to start GDM at boot time:
 #
 # gdm_enable="YES"
+#
 
 . /etc/rc.subr
 . %%GNOME_SUBR%%
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
-
-name="gdm"
-rcvar=gdm_enable
-
-load_rc_config ${name}
-
-gnome_enable=${gnome_enable:-NO}
 gdm_enable=${gdm_enable-${gnome_enable}}
 gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO}
 gdm_lang=${gdm_lang-${LANG}}
 
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
+
+name="gdm"
+rcvar=gdm_enable
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/sbin/gdm-binary"
@@ -32,14 +28,15 @@ start_cmd="gdm_start"
 
 gdm_start()
 {
-    local iter
-
+    if ! checkyesno gdm_enable ; then
+	return 0
+    fi
     echo "Starting ${name}."
 
     # make sure there is no pam configuration for gdm service in base system
     if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
 	cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled
-	unlink /etc/pam.d/gdm
+    	rm -f /etc/pam.d/gdm
     fi
 
     ( iter=0
@@ -52,9 +49,6 @@ gdm_start()
     done
     iter=0
     while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do
-	if [ ! -x %%LOCALBASE%%/bin/lshal ]; then
-	    err 1 "%%LOCALBASE%%/bin/lshal is not installed"
-	fi
 	if [ ${iter} -eq 60 ]; then
 	    break
 	fi
@@ -64,4 +58,5 @@ gdm_start()
     LANG=${gdm_lang} ${command} ${gdm_flags} ) &
 }
 
+load_rc_config ${name}
 run_rc_command "$1"
diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in
index 52ad31672ad..d6382bb34a6 100644
--- a/x11/gdm/files/gdm.pam.in
+++ b/x11/gdm/files/gdm.pam.in
@@ -1,6 +1,6 @@
 #
 # $FreeBSD$
-#    $MCom: ports-stable/x11/gdm/files/gdm.pam.in,v 1.3 2010/07/21 13:50:46 kwm Exp $
+#    $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.17 2011/06/02 11:58:24 kwm Exp $
 #
 # PAM configuration for the "gdm" service
 #
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
index 31baf67050e..a15c9165855 100644
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -1,5 +1,5 @@
---- daemon/gdm-session-worker.c.orig	2010-08-11 13:40:07.000000000 -0400
-+++ daemon/gdm-session-worker.c	2011-08-13 23:37:04.000000000 -0400
+--- daemon/gdm-session-worker.c.orig	2011-06-02 09:50:17.000000000 -0500
++++ daemon/gdm-session-worker.c	2011-06-24 17:59:50.000000000 -0500
 @@ -31,6 +31,9 @@
  #include <errno.h>
  #include <grp.h>
@@ -10,7 +10,7 @@
  
  #ifdef  HAVE_LOGINDEVPERM
  #include <libdevinfo.h>
-@@ -341,7 +344,7 @@ gdm_session_execute (const char *file,
+@@ -341,7 +344,7 @@
                           * what to search if PATH is unset. POSIX may, dunno.
                           */
  
@@ -19,50 +19,7 @@
                  }
  
                  len = strlen (file) + 1;
-@@ -1035,17 +1038,6 @@ gdm_cache_copy_file (GdmSessionWorker *w
-                                    error->message);
-                         g_error_free (error);
-                  } else {
--                         int res;
--
--                         res = chown (cachefilename,
--                                      worker->priv->uid,
--                                      worker->priv->gid);
--                         if (res == -1) {
--                                 g_warning ("GdmSessionWorker: Error setting owner of cache file: %s",
--                                            g_strerror (errno));
--                         }
--
--                        g_chmod (cachefilename, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-                         g_debug ("Copy successful");
-                 }
- 
-@@ -1183,7 +1175,23 @@ gdm_session_worker_uninitialize_pam (Gdm
-                 return;
- 
-         if (worker->priv->state >= GDM_SESSION_WORKER_STATE_SESSION_OPENED) {
--                gdm_session_worker_cache_userfiles (worker);
-+                pid_t pid;
-+
-+                pid = fork ();
-+
-+                if (pid == 0) {
-+                        if (setuid (worker->priv->uid) < 0) {
-+                                g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno));
-+                                _exit (1);
-+                        }
-+
-+                        gdm_session_worker_cache_userfiles (worker);
-+                        _exit (0);
-+                }
-+
-+                if (pid > 0) {
-+                        gdm_wait_on_pid (pid);
-+                }
-                 pam_close_session (worker->priv->pam_handle, 0);
-                 gdm_session_auditor_report_logout (worker->priv->auditor);
- 
-@@ -2027,15 +2035,16 @@ gdm_session_worker_start_user_session (G
+@@ -2032,15 +2035,16 @@
                  char  *cachedirname;
                  char  *home_dir;
                  int    fd;
@@ -83,7 +40,7 @@
  
                  if (setsid () < 0) {
                          g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -2043,6 +2052,26 @@ gdm_session_worker_start_user_session (G
+@@ -2048,6 +2052,25 @@
                          _exit (2);
                  }
  
@@ -93,7 +50,6 @@
 +                        g_debug ("%s: setusercontext () failed for %s. "
 +                                  "Aborting.", "gdm_session_worker_start_user_session",
 +                                login ? login : "(null)");
-+			_exit (1);
 +                }
 +
 +                /* Propagate PATH environment variable from user context to child processes */
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index acabde1043d..80a3d947dfa 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -10,6 +10,8 @@ etc/gdm/Xsession
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
 etc/gdm/gdm.schemas
+etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop
+etc/gdm/home/.local/share/applications/mimeapps.list
 etc/pam.d/gdm
 libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
 libexec/gdm-crash-logger
@@ -223,6 +225,9 @@ share/pixmaps/nohost.png
 @dirrm etc/gdm/PostSession
 @dirrm etc/gdm/PostLogin
 @dirrm etc/gdm/Init
+@dirrmtry etc/gdm/home/.local/share/applications
+@dirrmtry etc/gdm/home/.local/share
+@dirrmtry etc/gdm/home/.local
 @unexec rm -rf %D/etc/gdm/home/.gconf*
 @dirrmtry etc/gdm/home
 @dirrmtry etc/gdm
@@ -230,11 +235,6 @@ share/pixmaps/nohost.png
 @dirrmtry etc/dm
 @dirrmtry share/log/gdm
 @dirrmtry share/log
-@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
-@unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true
-@unexec rmdir /var/cache 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index ad16bdd1887..534a88ddbd0 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomeapplets2
-# Date created:				26th May 2000
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11/gnome-applets/Makefile,v 1.219 2011/04/10 19:41:38 mezz Exp $
-#
 
 PORTNAME=	gnome-applets
 PORTVERSION=	2.32.1.1
@@ -18,11 +14,11 @@ COMMENT=	Applets components for the GNOME 2 Desktop Environment
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		gweather.1:${PORTSDIR}/net/libgweather \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
-		xklavier.12:${PORTSDIR}/x11/libxklavier \
-		gucharmap.7:${PORTSDIR}/deskutils/gucharmap
+LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop \
+		gweather:${PORTSDIR}/net/libgweather \
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
+		xklavier:${PORTSDIR}/x11/libxklavier \
+		gucharmap:${PORTSDIR}/deskutils/gucharmap
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTSDIR}/sysutils/system-tools-backends \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
@@ -32,9 +28,8 @@ USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel gnomedocutils \
-		libgnomekbd
-WANT_GNOME=	yes
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gnomepanel gnomedocutils libgnomekbd
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-mixer-applet \
@@ -46,36 +41,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
 		mixer.schemas multiload.schemas stickynotes.schemas
 
-OPTIONS=	MINI_COMMANDER "Enable mini-commander applet" off
+OPTIONS_DEFINE=	MINI_COMMANDER
+MINI_COMMANDER_DESC=	Mini-commander applet
 
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
-	!defined(WITHOUT_LIBNOTIFY)
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-CFLAGS+=	-fPIC
-PLIST_SUB=	BATTERY="@comment "
-.else
-GCONF_SCHEMAS+=	battstat.schemas
-PLIST_SUB=	BATTERY=""
-.endif
-
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-PLIST_SUB+=	CPUFREQ="@comment "
-.else
-PLIST_SUB+=	CPUFREQ=""
-GCONF_SCHEMAS+=	cpufreq-applet.schemas
+	!${PORT_OPTIONS:MNOTIFY}
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 .endif
 
-.if defined(WITH_MINI_COMMANDER)
+.if ${PORT_OPTIONS:MMINI_COMMANDER}
 CONFIGURE_ARGS+=	--enable-mini-commander
 GCONF_SCHEMAS+=	mini-commander-global.schemas mini-commander.schemas
 PLIST_SUB+=	COMMANDER="" OLDCOMMANDER="@comment "
@@ -93,6 +69,23 @@ PLIST_SUB+=	PYTHON=""
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386" && ${ARCH} != "amd64"
+CFLAGS+=	-fPIC
+PLIST_SUB=	BATTERY="@comment "
+.else
+GCONF_SCHEMAS+=	battstat.schemas
+PLIST_SUB=	BATTERY=""
+.endif
+
+.if ${ARCH} != "i386" && ${ARCH} != "amd64"
+PLIST_SUB+=	CPUFREQ="@comment "
+.else
+PLIST_SUB+=	CPUFREQ=""
+GCONF_SCHEMAS+= cpufreq-applet.schemas
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 	    	's|" == "|" = "|g'
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 96b627b3a43..4ffd81761c3 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.230 2010/11/17 13:01:32 kwm Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.237 2012/10/25 09:21:00 kwm Exp $
 #
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,9 +20,11 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	gweather.1:${PORTSDIR}/net/libgweather \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	gweather:${PORTSDIR}/net/libgweather \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		canberra-gtk:${PORTSDIR}/audio/libcanberra
+
+CONFLICTS=	gnome-panel-3.[0-9]* mate-panel-*
 
 USE_GETTEXT=	yes
 USE_XORG=	ice sm x11 xau xrandr
@@ -30,9 +32,9 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
-WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
@@ -46,24 +48,21 @@ GCONF_SCHEMAS=	clock.schemas fish.schemas \
 		panel-toplevel.schemas window-list.schemas \
 		workspace-switcher.schemas
 
-OPTIONS=	EVOLUTION "use the Evolution calendar if installed" on \
-		BONOBO "Support for bonobo applets aka Gnome 2 applets" on
-
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
+OPTIONS_DEFINE=	EVOLUTION BONOBO
+OPTIONS_DEFAULT=EVOLUTION BONOBO
+EVOLUTION_DESC=	Use the Evolution calendar
+BONOBO_DESC=	Support for bonobo applets aka Gnome 2 applets
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!=""
+.if ${PORT_OPTIONS:MEVOLUTION}
 USE_GNOME+=	evolutiondataserver
 #CONFIGURE_ARGS+=--enable-eds
 .else
 CONFIGURE_ARGS+=--disable-eds
 .endif
 
-.if defined(WITH_BONOBO)
+.if ${PORT_OPTIONS:MBONOBO}
 USE_GNOME+=	libbonoboui
 CONFIGURE_ARGS+=--enable-bonobo
 PLIST_SUB+=	BONOBO=""
@@ -86,6 +85,6 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/gnome-panel/modules
 	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 65dd6f4ef49..d7d155cc4ce 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-screensaver
-# Date created:		09 June 2005
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.124 2011/04/09 16:54:20 mezz Exp $
-#
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.125 2012/09/03 16:28:29 mezz Exp $
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.30.2
@@ -16,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
-LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 CONFLICTS=	gnome-screensaver-3.[0-9]*
@@ -26,8 +22,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	xtst xxf86vm
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
-		gnomedesktop
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gnomemenus libgnomekbd gnomedesktop
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
@@ -46,12 +42,14 @@ SCREENSAVER_DIR=	share/applications/screensavers
 
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
-OPTIONS=	PAM "Pluggable Authentication Module support" on \
-		KEYRING "Enable GnomeKeyring integration (needs PAM)" on
+OPTIONS_DEFINE=	PAM KEYRING
+OPTIONS_DEFAULT=PAM KEYRING
+PAM_DESC=	Pluggable Authentication Module support
+KEYRING_DESC=	GnomeKeyring integration (needs PAM)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 RUN_DEPENDS+=		pam_helper:${PORTSDIR}/security/pam_helper
 CONFIGURE_ARGS+=	--enable-authentication-scheme=helper \
 			--with-passwd-helper=${LOCALBASE}/bin/pam_helper
@@ -61,7 +59,7 @@ CONFIGURE_ARGS+=	--disable-pam
 PLIST_SUB+=		PAM="@comment "
 .endif
 
-.if defined(WITH_KEYRING) && defined(WITH_PAM)
+.if ${PORT_OPTIONS:MKEYRING} && ${PORT_OPTIONS:MPAM}
 SUB_LIST+=		PAM_KEYRING=
 RUN_DEPENDS+=		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
 .else
@@ -69,12 +67,12 @@ SUB_LIST+=		PAM_KEYRING=\#
 .endif
 
 pre-everything::
-.if defined(WITHOUT_PAM) && defined(WITH_KEYRING)
+.if !${PORT_OPTIONS:MPAM} && ${PORT_OPTIONS:MKEYRING}
 	@${ECHO_MSG} "Keyring integration is disabled because it needs PAM."
 .endif
 
 post-patch:
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
 		${WRKSRC}/src/gs-auth-pam.c
 .endif
@@ -95,8 +93,8 @@ post-install:
 		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
 			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
 			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 	${INSTALL_DATA} ${WRKDIR}/gnome-screensaver.pam ${PREFIX}/etc/pam.d/gnome-screensaver
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index b20b190355e..00da270ff0e 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome2
-# Date created:		21 May 2002
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/x11/gnome2/Makefile,v 1.300 2010/11/18 01:37:46 kwm Exp $
-#
 
 PORTNAME=	gnome2
 PORTVERSION=	2.32.1
@@ -67,8 +63,9 @@ USE_PYTHON=	yes
 .endif
 
 .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-OPTIONS=	XSCREENSAVER "Use xscreensaver as screen saver app" off \
-		MAPI "Depend on evolution-mapi (pulls in samba4)" off
+OPTIONS_DEFINE=	XSCHEENSAVER
+XSCREENSAVER_DESC=	Use xscreensaver as screen saver app
+#		MAPI "Depend on evolution-mapi (pulls in samba4)
 .endif
 
 do-install:	# empty
@@ -101,14 +98,14 @@ RUN_DEPENDS+=	cheese:${PORTSDIR}/multimedia/cheese
 .if ${ARCH} == "i386"
 #RUN_DEPENDS+=	tomboy:${PORTSDIR}/deskutils/tomboy
 .endif
-.if defined(WITH_MAPI)
+.if ${PORT_OPTIONS:MMAPI}
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi
 .endif
 .endif
 .endif
 
 .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite"
-.if defined(WITH_XSCREENSAVER)
+.if ${PORT_OPTIONS:MXSCREENSAVER}
 RUN_DEPENDS+=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
 .else
 RUN_DEPENDS+=	gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver
diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index 7f7afc08829..03b0e19b3bf 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xscreensaver-gnome-hacks
-# Date created:				12 September 2005
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xscreensaver-gnome-hacks
 PORTREVISION=	1
@@ -17,7 +13,8 @@ PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS=	xscreensaver-[0-9]* xscreensaver-gnome-[0-9]*
 
-OPTIONS=	ALL_FORTUNES "Enable support for all fortunes" off
+OPTIONS_DEFINE=	ALL_FORTUNES
+ALL_FORTUNES_DESC=	Enable support for all fortunes
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-nodriver
 
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 955acf5c884..5bfbd2bc19c 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	zenity
-# Date created:				01 Mar 2003
-# Whom:					Franz Klammer <klammer@webonaut.com>
-#
+# Created by: Franz Klammer <klammer@webonaut.com>
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.111 2010/11/16 10:25:21 kwm Exp $
-#
+#   $MCom: ports/x11/zenity/Makefile,v 1.119 2013/01/09 18:51:14 kwm Exp $
 
 PORTNAME=	zenity
 PORTVERSION=	2.32.1
@@ -20,7 +16,8 @@ BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20 gnomedocutils intlhack
+USES=		pathfix
+USE_GNOME=	gnomeprefix gtk20 gnomedocutils intlhack
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -28,20 +25,22 @@ INSTALLS_OMF=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 
 MAN1=		zenity.1
 
 CONFLICTS=	gtkada-1.2.*
 
-OPTIONS=	NOTIFY "Enable libnotify support" on
+OPTIONS_DEFINE=	NOTIFY
+OPTIONS_DEFAULT=NOTIFY
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		notify:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=	--enable-libnotify
 .else
 CONFIGURE_ARGS+=	--disable-libnotify
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>