socsvn commit: r254878 - soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit

jmuniz at FreeBSD.org jmuniz at FreeBSD.org
Wed Jul 17 12:52:38 UTC 2013


Author: jmuniz
Date: Wed Jul 17 12:52:37 2013
New Revision: 254878
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254878

Log:
  Updated PackageKit port Makefile: added pkgng option; enhanced back end selection; fixed manpages option, by adding docbook-xml to its dependencies; incremented the revision number; removed invalid argument: --disable-managed; performed satisfactory initial testing; and removed an empty line.

Modified:
  soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile

Modified: soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile
==============================================================================
--- soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile	Wed Jul 17 11:51:24 2013	(r254877)
+++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile	Wed Jul 17 12:52:37 2013	(r254878)
@@ -4,7 +4,7 @@
 
 PORTNAME=	PackageKit
 PORTVERSION=	0.6.11
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	ports-mgmt sysutils
 MASTER_SITES=	http://www.packagekit.org/releases/
 
@@ -33,7 +33,6 @@
 CONFIGURE_ARGS+=--with-security-framework=polkit \
 		--localstatedir=/var \
 		--disable-gtk-doc \
-		--disable-managed \
 		--disable-browser-plugin \
 		--disable-gstreamer-plugin \
 		--disable-networkmanager \
@@ -44,31 +43,65 @@
 MAKE_JOBS_UNSAFE=yes
 
 .if !defined(SLAVEPORT)
-OPTIONS_DEFINE=	PORTS MANPAGES
+OPTIONS_DEFINE=	MANPAGES PORTS PKGNG DUMMY
 OPTIONS_DEFAULT=PORTS
-PORTS_DESC=Use portupgrade for management, dummy if disabled
+PORTS_DESC=	Include back end to use portupgrade and pkg
+PKGNG_DESC=	Include pkgng back end for software management
+DUMMY_DESC=	Include dummy back end for testing purposes
 
 .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
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		${LOCALBASE}/share/xml/docbook/4.2/catalog.xml:${PORTSDIR}/textproc/docbook-xml
 MAN1=	pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1
 . else
 CONFIGURE_ARGS+=--disable-man-pages
 . endif
 
+. if ${PORT_OPTIONS:MDUMMY} || ( ! ${PORT_OPTIONS:MDUMMY} && ! ${PORT_OPTIONS:MPORTS} && ! ${PORT_OPTIONS:MPKGNG} )
+. if ! ${PORT_OPTIONS:MPORTS} && ! ${PORT_OPTIONS:MPKGNG}
+CONFIGURE_ARGS+=--with-default-backend=dummy
+PLIST_SUB+=	BACKENDS="@comment "
+.endif
+CONFIGURE_ARGS+=--enable-dummy 
+.else
+CONFIGURE_ARGS+=--disable-dummy
+.endif
+
+. if ${PORT_OPTIONS:MPORTS} || ${PORT_OPTIONS:MPKGNG
+PLIST_SUB+=	BACKENDS=""
+. endif
+
+. if ! ${PORT_OPTIONS:MPORTS}
+CONFIGURE_ARGS+=--disable-ports
+PLIST_SUB+=	PORTS="@comment "
+. endif
+
+. if ! ${PORT_OPTIONS:MPKGNG}
+CONFIGURE_ARGS+=--disable-pkgng
+PLIST_SUB+=	PKGNG="@comment "
+. endif
+
 . if ${PORT_OPTIONS:MPORTS}
+. if ! ${PORT_OPTIONS:MPKGNG}
+CONFIGURE_ARGS+=--with-default-backend=ports
+. endif
 RUN_DEPENDS+=	${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
 USE_RUBY=	yes
-CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports
+CONFIGURE_ARGS+=--enable-ports
 PLIST_SUB+=	PORTS=""
-. else
-CONFIGURE_ARGS+=--disable-ports --with-default-backend=dummy
-PLIST_SUB+=	PORTS="@comment "
 . endif
 
+. if ${PORT_OPTIONS:MPKGNG}
+RUN_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/ports-mgmt/pkg
+CONFIGURE_ARGS+=--enable-pkgng \
+		--with-default-backend=pkgng
+PLIST_SUB+=	PKGNG=""
+.endif
+
 CONFIGURE_ARGS+=--disable-gtk-module
 PLIST_SUB+=	GTK="@comment "
 


More information about the svn-soc-all mailing list