svn commit: r314632 - in head: audio/gnome-media databases/evolution-data-server deskutils/conduit deskutils/nautilus-sendto deskutils/planner devel/anjuta devel/devhelp devel/gconf2 devel/glade2 d...

Tue Mar 19 10:40:25 UTC 2013

Author: kwm
Date: Tue Mar 19 10:40:22 2013
New Revision: 314632
URL: http://svnweb.freebsd.org/changeset/ports/314632

Log:
  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

Modified:
  head/audio/gnome-media/Makefile
  head/databases/evolution-data-server/Makefile
  head/deskutils/conduit/Makefile
  head/deskutils/nautilus-sendto/Makefile
  head/deskutils/planner/Makefile
  head/devel/anjuta/Makefile
  head/devel/devhelp/Makefile
  head/devel/gconf2/Makefile
  head/devel/glade2/Makefile
  head/devel/gnome-vfs/Makefile
  head/devel/libglade2/Makefile
  head/devel/ptlib26/Makefile
  head/editors/abiword/Makefile
  head/editors/gedit-plugins/Makefile
  head/graphics/evince/Makefile
  head/mail/balsa/Makefile
  head/mail/evolution/Makefile
  head/misc/gnome2-reference/Makefile
  head/multimedia/totem-pl-parser/Makefile
  head/multimedia/totem/Makefile
  head/net/avahi/Makefile
  head/net/opal3/Makefile
  head/net/vinagre/Makefile
  head/ports-mgmt/packagekit/Makefile
  head/ports-mgmt/packagekit/pkg-plist
  head/print/libgnomeprint/Makefile
  head/security/seahorse-plugins/Makefile
  head/security/seahorse/Makefile
  head/sysutils/brasero/Makefile
  head/sysutils/gnome-settings-daemon/Makefile
  head/sysutils/hal/Makefile
  head/textproc/enchant/Makefile
  head/www/epiphany/Makefile
  head/x11-toolkits/libwnck/Makefile
  head/x11-toolkits/py-gtk2/Makefile
  head/x11/gdm/Makefile
  head/x11/gdm/distinfo
  head/x11/gdm/files/gdm.in
  head/x11/gdm/files/gdm.pam.in
  head/x11/gdm/files/patch-daemon_gdm-session-worker.c
  head/x11/gdm/pkg-plist
  head/x11/gnome-applets/Makefile
  head/x11/gnome-panel/Makefile
  head/x11/gnome-screensaver/Makefile
  head/x11/gnome2/Makefile
  head/x11/xscreensaver-gnome-hacks/Makefile
  head/x11/zenity/Makefile

Modified: head/audio/gnome-media/Makefile
==============================================================================

--- head/audio/gnome-media/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/audio/gnome-media/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,14 +1,10 @@
-# New ports collection makefile for:	gnomemedia2
-# Date created:				06 May 2002
-# Whom:					Joe Marcus Clarke <marcus at FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.155 2010/09/29 08:17:11 kwm Exp $
-#
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.164 2012/09/01 23:02:08 mezz Exp $
 
 PORTNAME=	gnome-media
 PORTVERSION=	2.32.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,6 +16,8 @@ BUILD_DEPENDS=	xml2po:${PORTSDIR}/textpr
 LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
 
+CONFLICTS=	gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@@ -27,8 +25,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -37,12 +35,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 		gnome-sound-recorder.schemas
 
-OPTIONS=	PULSEAUDIO "Enable Pulse Audio support" on
+OPTIONS_DEFINE=	PULSEAUDIO
+OPTIONS_DEFAULT=PULSEAUDIO
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PULSEAUDIO)
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=--enable-pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
@@ -54,4 +53,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|have_gladeui=true|have_gladeui=false|g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/databases/evolution-data-server/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.203 2010/11/15 17:19:55 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.218 2013/03/09 09:12:37 kwm Exp $
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
@@ -18,7 +18,6 @@ LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/
 		ical:${PORTSDIR}/devel/libical \
 		nss3:${PORTSDIR}/security/nss \
 		tasn1:${PORTSDIR}/security/libtasn1 \
-		sqlite3:${PORTSDIR}/databases/sqlite3 \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
 USE_BZIP2=	yes
@@ -28,6 +27,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
 		libxml2
 USE_OPENLDAP=	yes
+USE_SQLITE=	3
 USE_AUTOTOOLS=	libtool
 USE_BDB=	41+
 USE_LDCONFIG=	yes
@@ -40,26 +40,19 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_L
 
 PLIST_SUB=	VERSION="2.32" EVO_VERSION="1.2"
 
-#OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
-OPTIONS=	WEATHER		"Enable weather calendar backend"	on \
-		KERBEROS	"Adds Kerberos support"			on
+OPTIONS_DEFINE=	WEATHER KERBEROS
+OPTIONS_DEFAULT=WEATHER KERBEROS
+WEATHER_DESC=	Weather calendar backend
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_KERBEROS)
+.if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=	--with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif
 
-#.if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING)
-#CONFIGURE_ARGS+=	--enable-imap4=yes
-#PLIST_SUB+=		IMAP4=""
-#.else
-PLIST_SUB+=		IMAP4="@comment "
-#.endif
-
-.if defined(WITH_WEATHER)
-LIB_DEPENDS+=		gweather.1:${PORTSDIR}/net/libgweather
+.if ${PORT_OPTIONS:MWEATHER}
+LIB_DEPENDS+=		gweather:${PORTSDIR}/net/libgweather
 CONFIGURE_ARGS+=	--with-weather
 PLIST_SUB+=		WEATHER=""
 .else
@@ -83,4 +76,4 @@ post-patch:
 		s|-Wmissing-include-dirs||g' \
 			${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/deskutils/conduit/Makefile
==============================================================================
--- head/deskutils/conduit/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/deskutils/conduit/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,6 +1,7 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/deskutils/conduit/Makefile,v 1.7 2008/03/18 14:53:42 ahze Exp $
+
 PORTNAME=	conduit
 PORTVERSION=	0.3.17
 PORTREVISION=	6
@@ -32,17 +33,20 @@ INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	pygnome2 gnomeprefix
-OPTIONS=	NAUTILUS "Enable Nautilus Plugin" On \
-		EOG "Enable Eye-Of-Gnome Plugin" On
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	NAUTILUS EOG
+OPTIONS_DEFAULT=NAUTILUS EOG
+NAUTILUS_DESC=	Build Nautilus Plugin
+EOG_DESC=	Build Eye-Of-Gnome Plugin
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=	nautilus2
 CONFIGURE_ARGS+=	--enable-nautilus-extension
 .endif
 
-.if defined(WITH_EOG)
+.if ${PORT_OPTIONS:MEOG}
 BUILD_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
 RUN_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
 CONFIGURE_ARGS+=	--enable-eog-plugin
@@ -55,4 +59,4 @@ post-patch:
 		-e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \
 		-e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/deskutils/nautilus-sendto/Makefile
==============================================================================
--- head/deskutils/nautilus-sendto/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/deskutils/nautilus-sendto/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	nautilus-sendto
-# Date created:		2004-12-03
-# Whom:			Michael Johnson <ahze at FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze at FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.30 2010/09/30 06:21:18 kwm Exp $
 
@@ -19,37 +16,37 @@ GLIB_SCHEMAS=	org.gnome.Nautilus.Sendto.
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intlhack gnomeprefix nautilus2 gnomehack \
-		evolutiondataserver
-GNOME_DESKTOP_VERSION=2
+USES=		pathfix
+USE_GNOME=	intlhack gnomeprefix nautilus2 gnomehack evolutiondataserver
 USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-plugins="${SENDTO_PLUGINS}"
 
-OPTIONS=	PIDGIN	"Build pidgin sendto plugin" off \
-		UPNP	"Build upnp sendto plugin" off
+OPTIONS_DEFINE=	PIDGIN UPNP
+PIDGIN_DESC=	Build pidgin sendto plugin
+UPNP_DESC=	Build upnp sendto plugin
 
 # check configure script for allowed_plugins="..." for new plugins
 SENDTO_PLUGINS=	evolution gajim nautilus-burn removable-devices
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PIDGIN)
+.if ${PORT_OPTIONS:MPIDGIN}
 SENDTO_PLUGINS:=${SENDTO_PLUGINS} pidgin
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=	pidgin:${PORTSDIR}/net-im/pidgin
 PLIST_SUB+=	PIDGIN=""
 .else
 PLIST_SUB+=	PIDGIN="@comment "
 .endif
 
-.if defined(WITH_UPNP)
+.if ${PORT_OPTIONS:MUPNP}
 SENDTO_PLUGINS:=${SENDTO_PLUGINS} upnp
-LIB_DEPENDS+=	gupnp-1.0:${PORTSDIR}/net/gupnp
+LIB_DEPENDS+=	gupnp-1:${PORTSDIR}/net/gupnp
 PLIST_SUB+=	UPNP=""
 .else
 PLIST_SUB+=	UPNP="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/deskutils/planner/Makefile
==============================================================================
--- head/deskutils/planner/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/deskutils/planner/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	Planner
-# Date created:				15 July 2001
-# Whom:					Dmitry Sivachenko <demon at FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports-stable/deskutils/planner/Makefile,v 1.4 2009/04/16 00:34:24 kwm Exp $
-#
 
 PORTNAME=	planner
 PORTVERSION=	0.14.6
@@ -18,7 +14,8 @@ COMMENT=	Project management application 
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgnomeprintui \
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack libgnomeui libgnomeprintui \
 		libgsf desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
@@ -36,13 +33,13 @@ GCONF_SCHEMAS=	planner.schemas
 
 MAN1=		planner.1
 
-OPTIONS=	GDA "Enable database support (though libgda)" off
+OPTIONS_DEFINE=	GDA
+GDA_DESC=	Enable database support (though libgda)
 #		EVO "Enable evolution data server support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-
-.if defined(WITH_GDA)
+.if ${PORT_OPTIONS:MGDA}
 USE_GNOME+=	libgda3
 CONFIGURE_ARGS+=--with-database=gda3
 PLIST_SUB+=	GDA=""
@@ -50,15 +47,7 @@ PLIST_SUB+=	GDA=""
 PLIST_SUB+=	GDA="@comment "
 .endif
 
-#.if defined(WITH_EVO)
-#USE_GNOME+=	evolutiondataserver
-#CONFIGURE_ARGS+=--enable-eds --enable-eds-backend
-#PLIST_SUB+=	EVO=""
-#.else
-PLIST_SUB+=	EVO="@comment "
-#.endif
-
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/anjuta/Makefile
==============================================================================
--- head/devel/anjuta/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/anjuta/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	anjuta
-# Date created:				31 March 2001
-# Whom:					Dmitry Sivachenko <demon at FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta/Makefile,v 1.67 2010/11/13 08:07:29 kwm Exp $
-#
+#   $MCom: ports/devel/anjuta/Makefile,v 1.72 2012/12/13 20:33:05 kwm Exp $
 
 PORTNAME=	anjuta
 PORTVERSION=	2.32.1.1
@@ -19,10 +15,10 @@ COMMENT=	Integrated Development Environm
 BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
 		bash:${PORTSDIR}/shells/bash \
 		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
-		gladeui-1.10:${PORTSDIR}/devel/glade3 \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		gdl-1.3:${PORTSDIR}/x11-toolkits/gdl
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
+		gladeui-1:${PORTSDIR}/devel/glade3 \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
+		gdl-1:${PORTSDIR}/x11-toolkits/gdl
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		autogen:${PORTSDIR}/devel/autogen \
 		${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
@@ -32,6 +28,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 		gdb66:${PORTSDIR}/devel/gdb66 \
 		yelp:${PORTSDIR}/x11/yelp
 
+CONFLICTS=	anjuta-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -62,16 +60,17 @@ GCONF_SCHEMAS=	anjuta-build-basic-autoto
 
 MAN1=		anjuta.1 anjuta-launcher.1
 
-OPTIONS=	SVN "Build subversion plugin" off \
-		DEVHELP "Build devhelp plugin" on \
-		GRAPHVIZ "Build inheritance plugin" on
+OPTIONS_DEFINE=	SVN DEVHELP GRAPHVIZ
+OPTIONS_DEFAULT=DEVHELP GRAPHVIZ
+DEVHELP_DESC=	Devhelp support
+GRAPHVIZ_DESC=	inheritance plugin
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SVN)
+.if ${PORT_OPTIONS:MSVN}
 BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-LIB_DEPENDS+=	apr-1.4:${PORTSDIR}/devel/apr1
-LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	neon:${PORTSDIR}/www/neon29
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 PLIST_SUB+=	SVN=""
 .else
@@ -79,8 +78,8 @@ CONFIGURE_ARGS+=--disable-plugin-subvers
 PLIST_SUB+=	SVN="@comment "
 .endif
 
-.if defined(WITH_DEVHELP)
-LIB_DEPENDS+=	devhelp-2.1:${PORTSDIR}/devel/devhelp
+.if ${PORT_OPTIONS:MDEVHELP}
+LIB_DEPENDS+=	devhelp-2:${PORTSDIR}/devel/devhelp
 PLIST_SUB+=	DEVHELP=""
 .else
 CONFIGURE_ARGS+=--disable-plugin-devhelp
@@ -90,7 +89,7 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp
 PLIST_SUB+=	DEVHELP=""
 .endif
 
-.if defined(WITH_GRAPHVIZ)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
 CONFIGURE_ARGS+=--enable-graphviz
 BUILD_DEPENDS+=	neato:${PORTSDIR}/graphics/graphviz
 RUN_DEPENDS+=	neato:${PORTSDIR}/graphics/graphviz
@@ -111,7 +110,7 @@ post-configure:
 		${WRKSRC}/plugins/symbol-db/symbol-db-prefs.h
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \
 	doc/ScintillaDoc.html TODO
@@ -120,4 +119,4 @@ post-install:
 .endif
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/devhelp/Makefile
==============================================================================
--- head/devel/devhelp/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/devhelp/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,13 +1,10 @@
-# New ports collection makefile for:	devhelp
-# Date created:				29 May 2003
-# Whom:					Adam Weinberger <adamw at FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw at FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/devhelp/Makefile,v 1.38 2010/09/28 09:09:20 kwm Exp $
+#   $MCom: ports/devel/devhelp/Makefile,v 1.45 2012/09/01 23:02:09 mezz Exp $
 
 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -16,40 +13,44 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Developer help browser for GNOME 2
 
-LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique
+
+CONFLICTS=	devhelp-3.[0-9]*
 
 USE_BZIP2=	yes
 USE_XORG=	x11
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui libwnck
+USES=		pathfix
+USE_GNOME=	intlhack gnomeprefix libgnomeui libwnck
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	devhelp.schemas
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
-OPTIONS=		GEDIT "Enable GEdit plug-in support" off
+OPTIONS_DEFINE=	GEDIT
+GEDIT_DESC=	Enable GEdit plug-in support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GEDIT)
-BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
-RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
+.if ${PORT_OPTIONS:MGEDIT}
+BUILD_DEPENDS+=	gedit<3.0.0:${PORTSDIR}/editors/gedit
+RUN_DEPENDS+=	gedit<3.0.0:${PORTSDIR}/editors/gedit
 PLIST_SUB+=	GEDIT=""
 .else
 PLIST_SUB+=	GEDIT="@comment "
 .endif
 
 post-patch:
-.if defined(WITHOUT_GEDIT)
+.if ! ${PORT_OPTIONS:MGEDIT}
 	@${REINPLACE_CMD} -e 's|gedit-plugin||' \
 		${WRKSRC}/misc/Makefile.in
 	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_SINGLE_INCLUDES||g' \
 		${WRKSRC}/src/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/gconf2/Makefile
==============================================================================
--- head/devel/gconf2/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/gconf2/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gconf2
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade at FreeBSD.org>
-#
+# Created by: Ade Lovett <ade at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/gconf2/Makefile,v 1.124 2010/11/15 22:14:03 kwm Exp $
-#
 
 PORTNAME=	gconf2
 PORTVERSION=	2.32.0
@@ -25,12 +21,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \
+USES=		pathfix
+USE_GNOME=	gnomehier orbit2 gtk20 libxml2 ltverhack \
 		referencehack intlhack dconf
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
@@ -43,11 +40,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		gconftool-2.1 gsettings-data-convert.1 \
 		gsettings-schema-convert.1
 
-OPTIONS=	LDAP "Enable LDAP support" off
+OPTIONS_DEFINE=	LDAP
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-openldap
 PLIST_SUB+=	LDAP=""
@@ -59,6 +56,6 @@ PLIST_SUB+=	LDAP="@comment "
 post-install:
 	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif

Modified: head/devel/glade2/Makefile
==============================================================================
--- head/devel/glade2/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/glade2/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	glade2
-# Date created:		02 June 2002
-# Whom:			Joe Marcus Clarke <marcus at FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/glade2/Makefile,v 1.20 2007/08/04 03:51:29 marcus Exp $
-#
 
 PORTNAME=	glade
 PORTVERSION=	2.12.2
@@ -23,28 +19,25 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 desktopfileutils
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gtk20 desktopfileutils
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	GNOME "Enable gnome support" on #\
-#		GNOMEDB "Enable libgnomedb support" off
+OPTIONS_DEFINE=	GNOME
+OPTIONS_DEFAULT=GNOME
+GNOME_DESC=	Gnome support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--disable-gnome
-.else
+.if ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=		libgailgnome libgnomeui
 CONFIGURE_ARGS+=	--enable-gnome
+.else
+CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
-#.if defined(WITH_GNOMEDB)
-#USE_GNOME+=		libgnomedb
-#CONFIGURE_ARGS+=	--enable-gnome-db
-#.else
 CONFIGURE_ARGS+=	--disable-gnome-db
-#.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/gnome-vfs/Makefile
==============================================================================
--- head/devel/gnome-vfs/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/gnome-vfs/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnomevfs2
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade at FreeBSD.org>
-#
+# Created by: Ade Lovett <ade at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/gnome-vfs/Makefile,v 1.191 2010/09/29 12:30:29 kwm Exp $
-#
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.4
@@ -24,7 +20,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/mime/mag
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gnomemimedata gconf2 \
 		ltverhack referencehack
 USE_AUTOTOOLS=	libtool
 USE_OPENSSL=	yes
@@ -44,11 +41,12 @@ GCONF_SCHEMAS=	desktop_default_applicati
 		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
 		system_http_proxy.schemas system_smb.schemas
 
-OPTIONS=	SAMBA "Enable SMB volume support" on \
-		MDNS "Enable Bonjour/Rendezvous support" on \
-		HAL "Enable HAL support" on
+OPTIONS_DEFINE=	SAMBA MDNS HAL
+OPTIONS_DEFAULT=SAMBA MDNS HAL
+SAMBA_DESC=	Enable SMB volume support
+MDNS_DESC=	Enable Bonjour/Rendezvous support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
 USE_FAM=	yes
@@ -58,22 +56,22 @@ USE_FAM=	yes
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
 .endif
 
-.if !defined(WITHOUT_HAL)
+.if ${PORT_OPTIONS:MHAL}
 CONFIGURE_ARGS+=--enable-hal
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 .else
 CONFIGURE_ARGS+=--disable-hal
 .endif
 
-.if !defined(WITHOUT_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+.if ${PORT_OPTIONS:MSAMBA}
+LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
 .else
 PLIST_SUB+=	SAMBA="@comment "
 CONFIGURE_ARGS+=--disable-samba
 .endif
 
-.if !defined(WITHOUT_MDNS)
+.if ${PORT_OPTIONS:MMDNS}
 LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
 .else
 CONFIGURE_ARGS+=--disable-avahi
@@ -103,6 +101,6 @@ pre-configure:
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif

Modified: head/devel/libglade2/Makefile
==============================================================================
--- head/devel/libglade2/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/libglade2/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	libglade2
-# Date created:				18 August 1999
-# Whom:					Ade Lovett <ade at lovett.com>
-#
+# Created by: Ade Lovett <ade at lovett.com>
 # $FreeBSD$
 #   $MCom: ports/devel/libglade2/Makefile,v 1.26 2007/08/01 16:13:48 mezz Exp $
-#
 
 PORTNAME=	libglade2
 PORTVERSION=	2.6.4
@@ -26,7 +22,8 @@ RUN_DEPENDS=	xmlcatmgr:${PORTSDIR}/textp
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack libxml2 gtk20 referencehack
+USES=		pathfix
+USE_GNOME=	libxml2 gtk20 referencehack
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
@@ -37,11 +34,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
 		CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
 
-OPTIONS=		PYTHON  "Use Python"    on
+OPTIONS_DEFINE=	PYTHON
+OPTIONS_DEFAULT=PYTHON
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON
 
 USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""

Modified: head/devel/ptlib26/Makefile
==============================================================================
--- head/devel/ptlib26/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/devel/ptlib26/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -13,7 +13,7 @@ COMMENT=	A cross platform C++ library, u
 
 LICENSE=MPL
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	pwlib-1.* ptlib-2.4.* ptlib-2.8.*
 
@@ -29,43 +29,40 @@ CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}"
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
-OPTIONS=	ODBC		"Use ODBC" Off \
-		ALSA		"Use ALSA (experimental)" Off \
-		V4L		"Use Video4Linux" Off \
-		BSDVIDEO	"Enable BSD video support" On \
-		SDL		"Use SDL" On \
-		LDAP		"Enable LDAP support" Off
+OPTIONS_DEFINE=	ODBC ALSA V4L BSDVIDEO SDL LDAP
+OPTIONS_DEFAULT=BSDVIDEO SDL
+BSDVIDEO_DESC=	BSD video support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g}  \
 		PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//}
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 ALL_TARGET=	optshared debugshared
 BROKEN=		debug libs install broken
 .else
 ALL_TARGET=	optshared
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc:${PORTSDIR}/databases/unixODBC
 .else
 CONFIGURE_ARGS+=	--disable-odbc
 .endif
 
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 CONFIGURE_ARGS+=	--enable-alsa
 PLIST_SUB+=	ALSA=""
-LIB_DEPENDS+=		asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=		asound:${PORTSDIR}/audio/alsa-lib
 .else
 CONFIGURE_ARGS+=	--disable-alsa
 PLIST_SUB+=	ALSA="@comment "
 .endif
 
-.if defined(WITH_BSDVIDEO)
+.if ${PORT_OPTIONS:MBSDVIDEO}
 CONFIGURE_ARGS+=--enable-bsdvideo
 PLIST_SUB+=	BSDVIDEO=""
 WITH_VIDEO=1
@@ -74,7 +71,7 @@ CONFIGURE_ARGS+=--disable-bsdvideo
 PLIST_SUB+=	BSDVIDEO="@comment "
 .endif
 
-.if defined(WITH_V4L)
+.if ${PORT_OPTIONS:MV4L}
 CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -87,7 +84,7 @@ CONFIGURE_ARGS+=--disable-v4l
 PLIST_SUB+=	V4L="@comment "
 .endif
 
-.if defined(WITH_VIDEO)
+.if ${PORT_OPTIONS:MVIDEO}
 CONFIGURE_ARGS+=	--enable-video
 PLIST_SUB+=	VIDEODIR=""
 .else
@@ -95,13 +92,13 @@ CONFIGURE_ARGS+=	--disable-video
 PLIST_SUB+=	VIDEODIR="@comment "
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--enable-openldap --with-ldap-dir="${LOCALBASE}"
 .else
@@ -136,6 +133,8 @@ CONFIGURE_ARGS+=	--disable-dc
 #PLIST_SUB+=	DC1394="@comment "
 #.endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in
 	@${REINPLACE_CMD} -e 's|-lasound|-lasound -L${LOCALBASE}/lib|' ${WRKSRC}/plugins/sound_alsa/Makefile

Modified: head/editors/abiword/Makefile
==============================================================================
--- head/editors/abiword/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/editors/abiword/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -13,19 +13,20 @@ DIST_SUBDIR=	AbiWord
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	An open-source, cross-platform WYSIWYG word processor
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
 		png15:${PORTSDIR}/graphics/png \
 		wv-1.2:${PORTSDIR}/textproc/wv \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		fribidi.3:${PORTSDIR}/converters/fribidi \
-		psiconv.10:${PORTSDIR}/converters/psiconv \
-		goffice-0.8.8:${PORTSDIR}/devel/goffice
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		fribidi:${PORTSDIR}/converters/fribidi \
+		psiconv:${PORTSDIR}/converters/psiconv \
+		goffice-0.8:${PORTSDIR}/devel/goffice
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack libxml2 gtk20 desktopfileutils librsvg2
+USES=		pathfix
+USE_GNOME=	libxml2 gtk20 desktopfileutils librsvg2
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -40,27 +41,27 @@ PLIST_SUB+=	ABIVERSION=${ABIVERSION}
 
 MAN1=		abiword.1
 
-OPTIONS=	DEBUG "Enable debug" off \
-		BOOST "Build with boost" on \
-		SPELLCHECK "Enable spell checking support" on \
-		CLIPART "Install clipart" on \
-		TEMPLATES "Install additional templates" on
+OPTIONS_DEFINE=	DEBUG BOOST SPELLCHECK CLIPART TEMPLATES
+OPTIONS_DEFAULT=BOOST SPELLCHECK CLIPART TEMPLATES
+SPELLCHECK_DESC=	Spell checking support
+CLIPART_DESC=		Install clipart
+TEMPLATES_DESC=		Install additional templates
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug --enable-symbols
 .endif
 
-.if defined(WITH_BOOST)
+.if ${PORT_OPTIONS:MBOOST}
 CONFIGURE_ARGS+=	--with-boost
 LIB_DEPENDS+=		boost_system:${PORTSDIR}/devel/boost-libs
 .else
 CONFIGURE_ARGS+=	--without-boost
 .endif
 
-.if defined(WITH_SPELLCHECK)
-LIB_DEPENDS+=		enchant.1:${PORTSDIR}/textproc/enchant
+.if ${PORT_OPTIONS:MSPELLCHECK}
+LIB_DEPENDS+=		enchant:${PORTSDIR}/textproc/enchant
 CONFIGURE_ARGS+=	--enable-spell
 PLIST_SUB+=		DICT=""
 .else
@@ -68,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-spell
 PLIST_SUB+=		DICT="@comment "
 .endif
 
-.if defined(WITH_TEMPLATES)
+.if ${PORT_OPTIONS:MTEMPLATES}
 CONFIGURE_ARGS+=	--enable-templates
 PLIST_SUB+=		TEMPLATES=""
 .else
@@ -76,7 +77,7 @@ CONFIGURE_ARGS+=	--disable-templates
 PLIST_SUB+=		TEMPLATES="@comment "
 .endif
 
-.if defined(WITH_CLIPART)
+.if ${PORT_OPTIONS:MCLIPART}
 CONFIGURE_ARGS+=	--enable-clipart
 PLIST_SUB+=		CLIPART=""
 .else
@@ -93,4 +94,4 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}-${ABIVERSION}/plugins
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/editors/gedit-plugins/Makefile
==============================================================================
--- head/editors/gedit-plugins/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/editors/gedit-plugins/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gedit-plugins
-# Date created:				19 September 2003
-# Whom:					Adam Weinberger <adamw at FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw at FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/editors/gedit-plugins/Makefile,v 1.48 2010/10/29 14:47:24 kwm Exp $
-#
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.32.0
@@ -21,12 +17,15 @@ BUILD_DEPENDS=	gedit:${PORTSDIR}/editors
 RUN_DEPENDS=	gedit:${PORTSDIR}/editors/gedit \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap
 
+CONFLICTS=	gedit-plugins-3.[0-9]*
+
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack gnomeprefix intlhack gnomevfs2
+USES=		pathfix
+USE_GNOME=	gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -34,18 +33,12 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas \
 		gedit-drawspaces.schemas
 
-OPTIONS=	PYTHON "Build plugins that depend on python" off
-
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
+OPTIONS_DEFINE=	PYTHON
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${HAVE_GNOME:Mpygtksourceview}!="" && ${ARCH}!="sparc64" || defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=	pygtksourceview
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
 		${PYTHON_SITELIBDIR}/dbus/bus.py:${PORTSDIR}/devel/py-dbus \
@@ -64,4 +57,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
 	    	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/evince/Makefile
==============================================================================
--- head/graphics/evince/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
+++ head/graphics/evince/Makefile	Tue Mar 19 10:40:22 2013	(r314632)
@@ -1,14 +1,10 @@
-# New ports collection makefile for:	evince
-# Date created:				09 January 2005
-# Whom:					Adam Weinberger <adamw at FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw at FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/graphics/evince/Makefile,v 1.147 2010/09/28 07:27:12 kwm Exp $
-#
+#    $MCom: ports/graphics/evince/Makefile,v 1.159 2012/09/01 23:02:10 mezz Exp $
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,11 +13,14 @@ MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	GNOME 2 multi-format document viewer
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
-		spectre.1:${PORTSDIR}/print/libspectre
+LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		spectre:${PORTSDIR}/print/libspectre
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		yelp:${PORTSDIR}/x11/yelp
 
+CONFLICTS=	evince-3.[0-9]*
+
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
@@ -29,7 +28,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix desktopfileutils \
+USES=		pathfix
+USE_GNOME=	intlhack gnomeprefix desktopfileutils \
 		gnomedocutils ltasneededhack gconf2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -43,46 +43,47 @@ PLIST_SUB+=	VERSION=2.32
 
 MAN1=		evince.1
 
-OPTIONS=	DVI		"Enable DVI viewer support"		off \
-		T1LIB		"Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)"	off \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
