Date: Sat, 5 Oct 2013 19:37:56 +0200 (CEST) From: Guido Falsi <madpilot@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@FreeBSD.org Subject: [PATCH] finance/gnucash: Support staging and option helpers Message-ID: <3csZsw6m6Fz3w@micro.madpilot.net>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
.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 <bsd.port.mk>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3csZsw6m6Fz3w>