From owner-svn-ports-all@FreeBSD.ORG Wed Oct 9 12:10:24 2013 Return-Path: Delivered-To: svn-ports-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 4BC5940B; Wed, 9 Oct 2013 12:10:24 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 2A25421CC; Wed, 9 Oct 2013 12:10:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99CAORD044106; Wed, 9 Oct 2013 12:10:24 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99CANGd044103; Wed, 9 Oct 2013 12:10:23 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201310091210.r99CANGd044103@svn.freebsd.org> From: Guido Falsi Date: Wed, 9 Oct 2013 12:10:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329886 - head/finance/gnucash X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 12:10:24 -0000 Author: madpilot Date: Wed Oct 9 12:10:23 2013 New Revision: 329886 URL: http://svnweb.freebsd.org/changeset/ports/329886 Log: - Support staging - Convert to new LIB_DEPENDS format - Use option helpers Approved by: gnome (kwm) Modified: head/finance/gnucash/Makefile head/finance/gnucash/pkg-plist Modified: head/finance/gnucash/Makefile ============================================================================== --- head/finance/gnucash/Makefile Wed Oct 9 12:07:12 2013 (r329885) +++ head/finance/gnucash/Makefile Wed Oct 9 12:10:23 2013 (r329886) @@ -14,8 +14,8 @@ LICENSE= GPLv3 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 @@ DATABASE_DESC= Enable SQL database backe 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 @@ LDFLAGS+= -L${LOCALBASE}/lib 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 @@ GCONF_SCHEMAS= apps_gnucash_dialog_busin 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 Modified: head/finance/gnucash/pkg-plist ============================================================================== --- head/finance/gnucash/pkg-plist Wed Oct 9 12:07:12 2013 (r329885) +++ head/finance/gnucash/pkg-plist Wed Oct 9 12:10:23 2013 (r329886) @@ -334,6 +334,7 @@ lib/libgnc-qof.so.1 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