From owner-freebsd-gnome@FreeBSD.ORG Sat Oct 5 17:46:16 2013 Return-Path: Delivered-To: gnome@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 58FF527C; Sat, 5 Oct 2013 17:46:16 +0000 (UTC) (envelope-from mad@micro.madpilot.net) Received: from micro.madpilot.net (micro.madpilot.net [88.149.173.206]) by mx1.freebsd.org (Postfix) with ESMTP id F41702D45; Sat, 5 Oct 2013 17:46:15 +0000 (UTC) Received: from micro.madpilot.net (localhost [127.0.0.1]) by micro.madpilot.net (Postfix) with ESMTP id 3csZsz5XTMz3x; Sat, 5 Oct 2013 19:37:59 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from micro.madpilot.net ([127.0.0.1]) by micro.madpilot.net (micro.madpilot.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id lq47wyIUCxs3; Sat, 5 Oct 2013 19:37:57 +0200 (CEST) Received: by micro.madpilot.net (Postfix, from userid 1000) id 3csZsw6m6Fz3w; Sat, 5 Oct 2013 19:37:56 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org Subject: [PATCH] finance/gnucash: Support staging and option helpers From: Guido Falsi X-send-pr-version: 3.114 X-GNATS-Notify: Message-Id: <3csZsw6m6Fz3w@micro.madpilot.net> Date: Sat, 5 Oct 2013 19:37:56 +0200 (CEST) Cc: gnome@FreeBSD.org 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: Sat, 05 Oct 2013 17:46:16 -0000 >Submitter-Id: current-users >Originator: Guido Falsi >Organization: none >Confidential: no >Synopsis: [PATCH] finance/gnucash: Support staging and option helpers >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 9.2-STABLE amd64 >Environment: System: FreeBSD micro.madpilot.net 9.2-STABLE FreeBSD 9.2-STABLE #22 r255995: Wed Oct 2 22:15:55 CEST 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64 >Description: I modified the gnucash port to support staging. While here I also converted it to the new LIB_DEPENDS format and made it use the option helpers. >Fix: Index: Makefile =================================================================== --- Makefile (revision 329480) +++ 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,59 +72,16 @@ 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 \ @@ -119,6 +89,5 @@ @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ ${PYTHON_SITELIBDIR:S|${LOCALBASE}|${PREFIX}|}/${PORTNAME} .endif - @${CAT} ${PKGMESSAGE} .include Index: pkg-plist =================================================================== --- pkg-plist (revision 329480) +++ 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