From owner-freebsd-gnome@FreeBSD.ORG Mon Oct 7 19:50:02 2013 Return-Path: Delivered-To: gnome@smarthost.ysv.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 C17D1136 for ; Mon, 7 Oct 2013 19:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F8ED2D35 for ; Mon, 7 Oct 2013 19:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r97Jo22T078607 for ; Mon, 7 Oct 2013 19:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r97Jo2ff078606; Mon, 7 Oct 2013 19:50:02 GMT (envelope-from gnats) Date: Mon, 7 Oct 2013 19:50:02 GMT Message-Id: <201310071950.r97Jo2ff078606@freefall.freebsd.org> To: gnome@FreeBSD.org From: Guido Falsi Subject: Re: ports/182706: [PATCH] finance/gnucash: Support staging and option helpers X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Guido Falsi List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2013 19:50:02 -0000 The following reply was made to PR ports/182706; it has been noted by GNATS. From: Guido Falsi To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/182706: [PATCH] finance/gnucash: Support staging and option helpers Date: Mon, 07 Oct 2013 21:43:48 +0200 This is a multi-part message in MIME format. --------------000905030106060506090009 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Forgot to attach the patch. -- Guido Falsi --------------000905030106060506090009 Content-Type: text/x-patch; name="gnucash.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gnucash.diff" Index: Makefile =================================================================== --- Makefile (revision 329720) +++ Makefile (working copy) @@ -14,8 +14,8 @@ BUILD_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile \ ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile -LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/libgnome-keyring \ - goffice-0.8:${PORTSDIR}/devel/goffice +LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \ + libgoffice-0.8.so:${PORTSDIR}/devel/goffice RUN_DEPENDS= guile>=1.8.6:${PORTSDIR}/lang/guile \ ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ @@ -30,6 +30,21 @@ LOCALE_TAX_DESC= Enable localized tax categories WEBKIT_DESC= Use webkit instead of gtkhtml for the HTML engine +OPTIONS_SUB= yes +AQBANKING_CONFIGURE_ENABLE=aqbanking +AQBANKING_LIB_DEPENDS= libgwengui-gtk2.so:${PORTSDIR}/devel/gwenhywfar-gtk2 \ + libktoblzcheck.so:${PORTSDIR}/finance/ktoblzcheck \ + libaqbanking.so:${PORTSDIR}/finance/aqbanking +OFX_CONFIGURE_ENABLE= ofx +OFX_LIB_DEPENDS= libofx.so:${PORTSDIR}/finance/libofx +DATABASE_CONFIGURE_ENABLE=dbi +DATABASE_LIB_DEPENDS= libdbi.so:${PORTSDIR}/databases/libdbi +LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax +WEBKIT_CONFIGURE_ON= --with-html-engine=webkit +WEBKIT_LIB_DEPENDS= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 +PYTHON_CONFIGURE_ON= --enable-python-bindings +PYTHON_USE= PYTHON=yes + USE_BZIP2= yes USES= gettext gmake pkgconfig perl5 INSTALLS_ICONS= yes @@ -41,8 +56,6 @@ CONFIGURE_ARGS= --disable-error-on-warning \ --disable-doxygen -MAN1= gnucash.1 - GCONF_SCHEMAS= apps_gnucash_dialog_business_common.schemas \ apps_gnucash_dialog_commodities.schemas \ apps_gnucash_dialog_common.schemas \ @@ -59,66 +72,22 @@ apps_gnucash_window_pages_account_tree.schemas \ apps_gnucash_window_pages_register.schemas -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAQBANKING} -LIB_DEPENDS+= gwengui-gtk2:${PORTSDIR}/devel/gwenhywfar-gtk2 \ - ktoblzcheck:${PORTSDIR}/finance/ktoblzcheck \ - aqbanking:${PORTSDIR}/finance/aqbanking - GCONF_SCHEMAS+= apps_gnucash_dialog_hbci.schemas -CONFIGURE_ARGS+=--enable-aqbanking -PLIST_SUB+= AQBANKING="" -.else -CONFIGURE_ARGS+=--disable-aqbanking -PLIST_SUB+= AQBANKING="@comment " .endif -.if ${PORT_OPTIONS:MOFX} -CONFIGURE_ARGS+=--enable-ofx -LIB_DEPENDS+= ofx:${PORTSDIR}/finance/libofx -PLIST_SUB+= OFX="" -.else -CONFIGURE_ARGS+=--disable-ofx -PLIST_SUB+= OFX="@comment " -.endif - -.if ${PORT_OPTIONS:MDATABASE} -CONFIGURE_ARGS+=--enable-dbi -LIB_DEPENDS+= dbi:${PORTSDIR}/databases/libdbi -PLIST_SUB+= DATABASE="" -.else -CONFIGURE_ARGS+=--disable-dbi -PLIST_SUB+= DATABASE="@comment " -.endif - -.if ${PORT_OPTIONS:MLOCALE_TAX} -CONFIGURE_ARGS+=--enable-locale-specific-tax -.endif - -.if ${PORT_OPTIONS:MWEBKIT} -CONFIGURE_ARGS+=--with-html-engine=webkit -LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 -.else +.if ! ${PORT_OPTIONS:MWEBKIT} USE_GNOME+= gtkhtml3 .endif -.if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+=--enable-python-bindings -USE_PYTHON= yes -PLIST_SUB+= PYTHON="" -.else -PLIST_SUB+= PYTHON="@comment " -.endif - post-install: .if ${PORT_OPTIONS:MPYTHON} @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - ${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME} + ${STAGEDIR}${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - ${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME} + ${STAGEDIR}${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME} .endif - @${CAT} ${PKGMESSAGE} .include Index: pkg-plist =================================================================== --- pkg-plist (revision 329720) +++ pkg-plist (working copy) @@ -334,6 +334,7 @@ libexec/gnucash/overrides/gnucash-env libexec/gnucash/overrides/gnucash-make-guids libexec/gnucash/overrides/guile +man/man1/gnucash.1.gz share/applications/gnucash.desktop share/gnucash/accounts/C/acctchrt_brokerage.gnucash-xea share/gnucash/accounts/C/acctchrt_business.gnucash-xea --------------000905030106060506090009--