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, 43 deletions

diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index dd6c63d00bfe..643e93356a19 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	packagekit
-# Date created:				15 Aug 2009
-# Whom:					Anders F Bjorklund <afb@users.sourceforge.net>
-#
+# Created by: Anders F Bjorklund <afb@users.sourceforge.net>
 # $FreeBSD$
 #   $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.26 2010/10/10 15:49:51 marcus Exp $
 
@@ -12,22 +9,22 @@ CATEGORIES=	ports-mgmt sysutils
 MASTER_SITES=	http://www.packagekit.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	A DBUS packaging abstraction layer
+COMMENT?=	DBUS packaging abstraction layer
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \
 		${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
-		ck-connector.0:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof \
-		${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+		polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
+		ck-connector:${PORTSDIR}/sysutils/consolekit
+#RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof \
+#		${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \
+#		${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	glib20 intltool
+USE_GNOME=	glib20 intltool gnomehier
+USE_SQLITE=	3
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	2.5+
@@ -48,53 +45,43 @@ MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 MAKE_JOBS_UNSAFE=yes
 
 .if !defined(SLAVEPORT)
-OPTIONS=PORTS "Use portupgrade for management, dummy if disabled" on \
-	PORTDOCS "Build documentation" on
-# gtk module seems to be broken/disabled/gone?
-#	GTK20 "Enable GTK+ modules" off \
+OPTIONS_DEFINE=	PORTS MANPAGES
+OPTIONS_DEFAULT=PORTS
+PORTS_DESC=Use portupgrade for management, dummy if disabled
 
-.if defined(NO_INSTALL_MANPAGES)
-CONFIGURE_ARGS+=--disable-man-pages
-.else
+.include <bsd.port.options.mk>
+
+. if ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 MAN1=	pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1
-.endif
-.endif
-
-.include <bsd.port.pre.mk>
+. else
+CONFIGURE_ARGS+=--disable-man-pages
+. endif
 
-.if defined(WITH_PORTS)
+. if ${PORT_OPTIONS:MPORTS}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
 USE_RUBY=	yes
 CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports
 PLIST_SUB+=	PORTS=""
-.else
+. else
 CONFIGURE_ARGS+=--disable-ports --with-default-backend=dummy
 PLIST_SUB+=	PORTS="@comment "
-.endif
+. endif
 
-#.if defined(WITH_GTK)
-#USE_GNOME+=	gtk20
-#CONFIGURE_ARGS+=--enable-gtk-module
-#PLIST_SUB+=	GTK=""
-#.else
 CONFIGURE_ARGS+=--disable-gtk-module
 PLIST_SUB+=	GTK="@comment "
-#.endif
 
-.if defined(SLAVEPORT)
-LIB_DEPENDS+=	packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit
+CONFIGURE_ARGS+=--disable-qt
+
+.elif defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4"
+LIB_DEPENDS+=	packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit
 
-.if ${SLAVEPORT}=="qt4"
 CONFIGURE_ARGS+=--enable-qt
-LIB_DEPENDS+=	cppunit-1.12.1:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS+=	cppunit-1.12:${PORTSDIR}/devel/cppunit
 USE_QT4+=	dbus gui xml sql moc_build
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
-.endif
-.else
-CONFIGURE_ARGS+=--disable-qt
+#.include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
 
 post-patch:
@@ -114,4 +101,4 @@ post-install:
 	@-update-mime-database ${PREFIX}/share/mime > /dev/null
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ports-mgmt/packagekit/pkg-plist b/ports-mgmt/packagekit/pkg-plist
index 912208dc1c07..10601f0ad7ea 100644
--- a/ports-mgmt/packagekit/pkg-plist
+++ b/ports-mgmt/packagekit/pkg-plist
@@ -432,7 +432,6 @@ share/polkit-1/actions/org.freedesktop.packagekit.policy
 %%PORTS%%@dirrm share/PackageKit
 @dirrm %%PYTHON_SITELIBDIR%%/packagekit
 @dirrm lib/packagekit-backend
-@dirrmtry lib/girepositry-1.0
 @dirrm include/PackageKit/packagekit-glib2
 @dirrm include/PackageKit/backend
 @dirrm include/PackageKit