diff options
| author | tron <tron> | 2012-06-09 13:11:27 +0000 |
|---|---|---|
| committer | tron <tron> | 2012-06-09 13:11:27 +0000 |
| commit | e0830cd3a2a2209700ab1f5c2d7d16121fff57a1 (patch) | |
| tree | dfe71c4bbd51e878042c07b3c621f62e34fdb15b | |
| parent | 5b38518e65124d8b32cb53521a8694f21e385923 (diff) | |
| download | pkgsrc-e0830cd3a2a2209700ab1f5c2d7d16121fff57a1.tar.gz | |
Pullup ticket #3829 - requested by dholland
finance/kmymoney2: build fix
Revisions pulled up:
- finance/kmymoney2/Makefile 1.59 via patch
- finance/kmymoney2/options.mk 1.4
---
Module Name: pkgsrc
Committed By: dholland
Date: Sat Jun 2 18:33:32 UTC 2012
Modified Files:
pkgsrc/finance/kmymoney2: Makefile options.mk
Log Message:
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++
| -rw-r--r-- | finance/kmymoney2/Makefile | 5 | ||||
| -rw-r--r-- | finance/kmymoney2/options.mk | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile index 160850680f6..2b812c32d5a 100644 --- a/finance/kmymoney2/Makefile +++ b/finance/kmymoney2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2012/03/03 00:13:04 wiz Exp $ +# $NetBSD: Makefile,v 1.57.2.1 2012/06/09 13:11:27 tron Exp $ DISTNAME= kmymoney2-1.0.5 -PKGREVISION= 6 +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..dd28fb10065 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.3.22.1 2012/06/09 13:11:27 tron 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 |