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

2 files changed, 29 insertions, 35 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index a2d254c501da..da9c6f6ff552 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -13,19 +13,20 @@ DIST_SUBDIR=	AbiWord
 MAINTAINER=	gnome@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>
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 7fb8d73f8600..1e4fc89a3d2e 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gedit-plugins
-# Date created:				19 September 2003
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@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/gedit \
 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>