From e062529900dddea46f308a5958ffb4136f5bcb04 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sat, 2 Jun 2012 18:33:32 +0000
Subject: As the sqlite plugin in the PLIST is unconditional, and sqlite3 is
 innocuous and small compared to kde3, and built into netbsd-6 anyway, and the
 package finds sqlite3 regardless of whether it's buildlinked, always depend
 on sqlite3. Should fix build on netbsd-5.

Remove commented-out traces of a sqlite3 option from options.mk.

PKGREVISION++
---
 finance/kmymoney2/Makefile   |  5 +++--
 finance/kmymoney2/options.mk | 11 +++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'finance')

diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 3be23401fe0..6e0fda67d66 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2012/04/27 12:31:47 obache Exp $
+# $NetBSD: Makefile,v 1.59 2012/06/02 18:33:32 dholland Exp $
 
 DISTNAME=	kmymoney2-1.0.5
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
 EXTRACT_SUFX=  .tar.bz2
@@ -46,4 +46,5 @@ REPLACE_PERL+=	admin/fixuifiles
 BUILDLINK_ABI_DEPENDS.qt3-libs+=	qt3-libs>=3.3.8nb9
 .endif
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/kmymoney2/options.mk b/finance/kmymoney2/options.mk
index 24db94b62d7..ab9a5e115ab 100644
--- a/finance/kmymoney2/options.mk
+++ b/finance/kmymoney2/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2009/09/02 10:05:52 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2012/06/02 18:33:32 dholland Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kmymoney2
-PKG_SUPPORTED_OPTIONS=	libofx #sqlite3
-PKG_SUGGESTED_OPTIONS=	libofx #sqlite3
+PKG_SUPPORTED_OPTIONS=	libofx
+PKG_SUGGESTED_OPTIONS=	libofx
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,8 +12,3 @@ PLIST_VARS+=		libofx #sqlite3
 .include "../../finance/libofx/buildlink3.mk"
 PLIST.libofx=		yes
 .endif
-
-#.if !empty(PKG_OPTIONS:Msqlite3)
-#.include "../../databases/sqlite3/buildlink3.mk"
-#PLIST.sqlite3=		yes
-#.endif
-- 
cgit v1.2.3