From owner-svn-soc-all@FreeBSD.ORG Tue Jul 30 03:33:43 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5A82C9F3 for ; Tue, 30 Jul 2013 03:33:43 +0000 (UTC) (envelope-from jmuniz@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 474E8207F for ; Tue, 30 Jul 2013 03:33:43 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6U3XhgR090054 for ; Tue, 30 Jul 2013 03:33:43 GMT (envelope-from jmuniz@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6U3XhS9090052 for svn-soc-all@FreeBSD.org; Tue, 30 Jul 2013 03:33:43 GMT (envelope-from jmuniz@FreeBSD.org) Date: Tue, 30 Jul 2013 03:33:43 GMT Message-Id: <201307300333.r6U3XhS9090052@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: r255328 - 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: Tue, 30 Jul 2013 03:33:43 -0000 Author: jmuniz Date: Tue Jul 30 03:33:42 2013 New Revision: 255328 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=255328 Log: Improved the PackageKit port Makefile. Removed '?'s because this is not a slave port. Moved docbook-utils dependency to where it belongs: DOCS. Added p5-SGMLSpm, libffi, and p5-XML-Parser to dependencies. Fixed a few variables that were not in braces. Moved manpages to DOCS option, making it default. Combined the back end options into a single selection group. Updated the descriptions of the options to prepare for Matt's back end. Worked on standardizing the syntax. Got rid of the tests to determine the default back end. Simplified the back end option code. Fixed issue where PackageKit-qt4 could not be built with Qt 4.8; it was a simple matter of regenerating the moc files. 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 Tue Jul 30 03:18:32 2013 (r255327) +++ soc2013/jmuniz/PackageKit/PackageKit-0.6.11/packagekit/Makefile Tue Jul 30 03:33:42 2013 (r255328) @@ -4,19 +4,22 @@ PORTNAME= PackageKit PORTVERSION= 0.6.11 -PORTREVISION?= 4 +PORTREVISION= 4 CATEGORIES= ports-mgmt sysutils MASTER_SITES= http://www.packagekit.org/releases/ MAINTAINER= gnome@FreeBSD.org -COMMENT?= 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 +BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/bin/sgmlspl:${PORTSDIR}/textproc/p5-SGMLSpm/pkg-plist LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ - ck-connector:${PORTSDIR}/sysutils/consolekit + ck-connector:${PORTSDIR}/sysutils/consolekit \ + libffi:${PORTSDIR}/devel/libffi \ + Expat:${PORTSDIR}/textproc/p5-XML-Parser + 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 @@ -42,80 +45,78 @@ MAKE_JOBS_UNSAFE=yes -.if !defined(SLAVEPORT) -OPTIONS_DEFINE= MANPAGES PORTS PKGNG DUMMY + +.if !defined(${SLAVEPORT}) +OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= BACKEND +OPTIONS_SINGLE_BAKCEND= PORTS PKGNG DUMMY OPTIONS_DEFAULT=PORTS -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 +PORTS_DESC= Ruby back end for traditional or new binary packages +PKGNG_DESC= C back end for PGN Next Generation, specifically +DUMMY_DESC= The dummy back end for developers .include -. if ${PORT_OPTIONS:MMANPAGES} -BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ +.if ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils \ + ${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/xml/docbook/4.2/catalog.xml:${PORTSDIR}/textproc/docbook-xml MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 -. else +.else CONFIGURE_ARGS+=--disable-man-pages -. endif +.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 +.if ${PORT_OPTIONS:MDUMMY} +CONFIGURE_ARGS+=--with-default-backend=dummy \ + --enable-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 +.if ${PORT_OPTIONS:MPORTS} RUN_DEPENDS+= ${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade USE_RUBY= yes -CONFIGURE_ARGS+=--enable-ports -PLIST_SUB+= PORTS="" -. endif +CONFIGURE_ARGS+=--enable-ports \ + --with-default-backend=ports +PLIST_SUB+= PORTS="" \ + BACKENDS="" +.endif -. if ${PORT_OPTIONS:MPKGNG} +.if ${PORT_OPTIONS:MPKGNG} RUN_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/ports-mgmt/pkg CONFIGURE_ARGS+=--enable-pkgng \ --with-default-backend=pkgng -PLIST_SUB+= PKGNG="" +PLIST_SUB+= PKGNG="" \ + BACKENDS="" .endif CONFIGURE_ARGS+=--disable-gtk-module PLIST_SUB+= GTK="@comment " - CONFIGURE_ARGS+=--disable-qt .elif defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4" LIB_DEPENDS+= packagekit-glib2:${PORTSDIR}/ports-mgmt/packagekit - CONFIGURE_ARGS+=--enable-qt LIB_DEPENDS+= cppunit-1.12:${PORTSDIR}/devel/cppunit USE_QT4+= dbus gui xml sql moc_build #.include "${PORTSDIR}/Mk/bsd.qt.mk" .endif +post-fetch: +.if defined(${SLAVEPORT}) && ${SLAVEPORT}=="qt4" + (cd ${WRKSRC}/lib/packagekit-qt/src && \ + moc-qt4 ./client.h -o ./client.moc && \ + moc-qt4 ./clientprivate.h -o ./clientprivate.moc && \ + moc-qt4 ./daemonproxy.h -o ./daemonproxy.moc && \ + moc-qt4 ./enum.h -o ./enum.moc && \ + moc-qt4 ./transaction.h -o ./transaction.moc && \ + moc-qt4 ./transactionprivate.h -o ./transactionprivate.moc && \ + moc-qt4 ./transactionproxy.h -o ./transactionproxy.moc) +.endif + post-patch: @${REINPLACE_CMD} -E -e 's/.*WARNINGFLAGS_CPP.*-Werror/#$$&/' \ -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure @@ -127,7 +128,7 @@ '/xsltproc/s|.xsl [$$]? &> /dev|.xsl $$? > /dev|g' post-install: -.if !defined(SLAVEPORT) +.if !defined(${SLAVEPORT}) @${INSTALL_DATA} ${WRKSRC}/data/transactions.db \ ${PREFIX}/share/PackageKit/transactions.db @-update-mime-database ${PREFIX}/share/mime > /dev/null