kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix gnucash configure script to accept guile 1.8

Browse source 
- Add options to gnucash port to choose which guile version to use
- Remove superceded UPDATING entry

Approved by:	kwm (gnome, implicit)
This commit is contained in:
Guido Falsi 2014-10-05 13:32:37 +00:00
parent cc5c75bd95
commit 16f2776819
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=370067
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
UPDATING
View file

@ -50,18 +50,6 @@ you update your ports collection, before attempting any port upgrades.
Please check your configuration.
20140930:
AFFECTS: users of finance/gnucash
AUTHOR: madpilot@FreeBSD.org
The new version of gnucsh requires guile 2.0. If the update fails
because the old guile 1.8 library is still present you will need
to manally remove gnucash, guile and, if installed, boehm-gc:
# pkg delete gnucash guile boehm-gc
and then install gnucash again the usual way.
20140929:
AFFECTS: users of comms/usbmuxd
AUTHOR: avilla@FreeBSD.org

16
finance/gnucash/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= gnucash
PORTVERSION= 2.6.4
PORTREVISION= 1
CATEGORIES= finance gnome
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
@ -12,22 +13,25 @@ COMMENT= Quicken-like money and finance manager
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
BUILD_DEPENDS= guile:${PORTSDIR}/lang/guile2
LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
libgoffice-0.8.so:${PORTSDIR}/devel/goffice
RUN_DEPENDS= guile:${PORTSDIR}/lang/guile2 \
p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote
OPTIONS_DEFINE= AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS
OPTIONS_SINGLE= GV
OPTIONS_SINGLE_GV= GUILE1 GUILE2
OPTIONS_DEFAULT= GUILE1
AQBANKING_DESC= AqBanking support (HBCI/OpenHBCI)
OFX_DESC= OFX support
DATABASE_DESC= Enable SQL database backends
LOCALE_TAX_DESC= Enable localized tax categories
GTKMM_DESC= Enable GTKMM based UI
GUILE1_DESC= Use lang/guile
GUILE2_DESC= Use lang/guile2
OPTIONS_SUB= yes
AQBANKING_CONFIGURE_ENABLE=aqbanking
@ -47,6 +51,12 @@ PYTHON_USE= PYTHON=yes
GTKMM_USE= GNOME=gtkmm24
GTKMM_CONFIGURE_ON= --enable-gtkmm
GTKMM_CONFIGURE_OFF= --disable-gtkmm
GUILE1_LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile
GUILE1_BUILD_DEPENDS= ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
GUILE1_RUN_DEPENDS= ${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
GUILE2_LIB_DEPENDS= libguile-2.0.so:${PORTSDIR}/lang/guile2
GUILE2_BUILD_DEPENDS= ${LOCALBASE}/share/guile/2.0/slibcat:${PORTSDIR}/lang/slib-guile2
GUILE2_RUN_DEPENDS= ${LOCALBASE}/share/guile/2.0/slibcat:${PORTSDIR}/lang/slib-guile2
USE_XORG= x11
USES= desktop-file-utils gettext gmake libtool perl5 pkgconfig shebangfix tar:bzip2

10
finance/gnucash/files/patch-configure Normal file
View file

@ -0,0 +1,10 @@
--- configure.orig 2014-09-28 02:56:29.000000000 +0200
+++ configure 2014-10-05 01:43:56.028480737 +0200
@@ -20513,6 +20513,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
succeeded=yes
+ GUILE_EFFECTIVE_VERSION=1.8
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GUILE_CFLAGS" >&5
$as_echo_n "checking GUILE_CFLAGS... " >&6; }