devel/gwenhywfar:

- Repocopy devel/gwenhywfar to devel/gwenhywfar-{fox16,gtk2,qt4}.
- devel/gwenhywfar is now a master port and new slave ports will allow the
  user to install the GUI libraries separately. This will make packaging
  easier for finance/gnucash and finance/kmymoney-kde4.

finance/aqbanking:
- finance/aqbanking has been updated to 5.0.25 and includes a shlib bump, so
  instead of making the user rebuild twice it is included here.
- Shlib bump aqbanking.33 -> aqbanking.34.
- Fix LICENSE.
- Convert to new OPTIONS framework.

finance/gnucash:
- Adjust LIB_DEPENDS for AQBANKING option so they are installed in the
  correct order.
- Drop unneeded LICENSE_FILE.
- Drop ABI version numbers from all LIB_DEPENDS (if you really want to keep
  them, at least keep the LIB_DEPENDS in the order I changed them to since
  aqbanking should be built last. Also aqbanking.33 -> aqbanking.34).
- Remove BROKEN message now that the dependency problem is solved.

finance/kmymoney-kde4:
- Convert to new OPTIONS framework.
- Drop WITH_* from PLIST_SUB.
- Drop ABI version numbers from all LIB_DEPENDS.
- Add USE_PKGCONFIG=build.
- Remove IGNORE message now that the dependency problem is solved.

Also clean up the header for the touched Makefiles.

PR:		ports/170492
Submitted by:   Jason E. Hale <bsdkaffee@gmail.com> (maintainer)

1 files changed, 10 insertions, 19 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index b6ac65d2f764..fa069c4291e2 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,13 +1,9 @@
-# Ports collection makefile for:  gnucash
-# Date created:			  Mon Feb 03, 1997
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
 # $FreeBSD$
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
-#
 
 PORTNAME=	gnucash
 PORTVERSION=	2.4.11
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -15,12 +11,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Quicken-like money and finance manager
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
     		${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
-LIB_DEPENDS=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
-		goffice-0.8.8:${PORTSDIR}/devel/goffice
+LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
+		goffice-0.8:${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 \
@@ -70,9 +65,10 @@ GCONF_SCHEMAS=	apps_gnucash_dialog_business_common.schemas \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAQBANKING}
-LIB_DEPENDS+=	aqbanking.33:${PORTSDIR}/finance/aqbanking \
-		gwengui-gtk2.0:${PORTSDIR}/devel/gwenhywfar \
-		ktoblzcheck.6:${PORTSDIR}/finance/ktoblzcheck
+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=""
@@ -83,7 +79,7 @@ PLIST_SUB+=	AQBANKING="@comment "
 
 .if ${PORT_OPTIONS:MOFX}
 CONFIGURE_ARGS+=--enable-ofx
-LIB_DEPENDS+=	ofx.5:${PORTSDIR}/finance/libofx
+LIB_DEPENDS+=	ofx:${PORTSDIR}/finance/libofx
 PLIST_SUB+=	OFX=""
 .else
 CONFIGURE_ARGS+=--disable-ofx
@@ -92,7 +88,7 @@ PLIST_SUB+=	OFX="@comment "
 
 .if ${PORT_OPTIONS:MDATABASE}
 CONFIGURE_ARGS+=--enable-dbi
-LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=	dbi:${PORTSDIR}/databases/libdbi
 PLIST_SUB+=	DATABASE=""
 .else
 CONFIGURE_ARGS+=--disable-dbi
@@ -105,7 +101,7 @@ CONFIGURE_ARGS+=--enable-locale-specific-tax
 
 .if ${PORT_OPTIONS:MWEBKIT}
 CONFIGURE_ARGS+=--with-html-engine=webkit
-LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
 .else
 USE_GNOME+=	gtkhtml3
 .endif
@@ -118,11 +114,6 @@ PLIST_SUB+=	PYTHON=""
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-pre-configure:
-.if !defined(PACKAGE_BUILDING) && ${PORT_OPTIONS:MAQBANKING} && !exists(${LOCALBASE}/lib/libgwengui-gtk2.so.0)
-BROKEN=	Please rebuild devel/gwenhywfar with the GTK2 option set
-.endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}