From owner-svn-soc-all@FreeBSD.ORG Wed Jul 17 12:52:38 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B5B27351 for ; Wed, 17 Jul 2013 12:52:38 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) by mx1.freebsd.org (Postfix) with ESMTP id A7283E0B for ; Wed, 17 Jul 2013 12:52:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HCqcno066752 for ; Wed, 17 Jul 2013 12:52:38 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6HCqcFJ066742 for svn-soc-all@FreeBSD.org; Wed, 17 Jul 2013 12:52:38 GMT (envelope-from jmuniz@FreeBSD.org) Date: Wed, 17 Jul 2013 12:52:38 GMT Message-Id: <201307171252.r6HCqcFJ066742@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to jmuniz@FreeBSD.org using -f From: jmuniz@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r254878 - soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jul 2013 12:52:38 -0000 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 . 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 "