Sat Jun 9 13:11:27 2012 UTC ()
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++


(tron)
diff -r1.57 -r1.57.2.1 pkgsrc/finance/kmymoney2/Makefile
diff -r1.3 -r1.3.22.1 pkgsrc/finance/kmymoney2/options.mk
cvs diff -r1.57 -r1.57.2.1 pkgsrc/finance/kmymoney2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/finance/kmymoney2/Attic/Makefile 2012/03/03 00:13:04 1.57
+++ pkgsrc/finance/kmymoney2/Attic/Makefile 2012/06/09 13:11:27 1.57.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.57 2012/03/03 00:13:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.57.2.1 2012/06/09 13:11:27 tron Exp $
2 2
3DISTNAME= kmymoney2-1.0.5 3DISTNAME= kmymoney2-1.0.5
4PKGREVISION= 6 4PKGREVISION= 8
5CATEGORIES= finance kde 5CATEGORIES= finance kde
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmymoney2/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= gary@duzan.org 9MAINTAINER= gary@duzan.org
10HOMEPAGE= http://kmymoney2.sourceforge.net/ 10HOMEPAGE= http://kmymoney2.sourceforge.net/
11COMMENT= Personal finance manager for KDE 11COMMENT= Personal finance manager for KDE
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake msgfmt perl pkg-config bash 16USE_TOOLS+= gmake msgfmt perl pkg-config bash
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
@@ -36,14 +36,15 @@ CONFIGURE_ARGS+= --enable-mt @@ -36,14 +36,15 @@ CONFIGURE_ARGS+= --enable-mt
36 36
37REPLACE_PERL+= admin/fixuifiles 37REPLACE_PERL+= admin/fixuifiles
38 38
39.include "../../meta-pkgs/kde3/kde3.mk" 39.include "../../meta-pkgs/kde3/kde3.mk"
40.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 40.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
41.include "../../sysutils/desktop-file-utils/desktopdb.mk" 41.include "../../sysutils/desktop-file-utils/desktopdb.mk"
42.include "../../textproc/libxml2/buildlink3.mk" 42.include "../../textproc/libxml2/buildlink3.mk"
43.include "../../x11/kdebase3/buildlink3.mk" 43.include "../../x11/kdebase3/buildlink3.mk"
44.include "../../x11/kdelibs3/buildlink3.mk" 44.include "../../x11/kdelibs3/buildlink3.mk"
45.if (${OPSYS} == "NetBSD") 45.if (${OPSYS} == "NetBSD")
46BUILDLINK_ABI_DEPENDS.qt3-libs+= qt3-libs>=3.3.8nb9 46BUILDLINK_ABI_DEPENDS.qt3-libs+= qt3-libs>=3.3.8nb9
47.endif 47.endif
48.include "../../x11/qt3-libs/buildlink3.mk" 48.include "../../x11/qt3-libs/buildlink3.mk"
 49.include "../../databases/sqlite3/buildlink3.mk"
49.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.3.22.1 pkgsrc/finance/kmymoney2/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/finance/kmymoney2/Attic/options.mk 2009/09/02 10:05:52 1.3
+++ pkgsrc/finance/kmymoney2/Attic/options.mk 2012/06/09 13:11:27 1.3.22.1
@@ -1,19 +1,14 @@ @@ -1,19 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2009/09/02 10:05:52 wiz Exp $ 1# $NetBSD: options.mk,v 1.3.22.1 2012/06/09 13:11:27 tron Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.kmymoney2 3PKG_OPTIONS_VAR= PKG_OPTIONS.kmymoney2
4PKG_SUPPORTED_OPTIONS= libofx #sqlite3 4PKG_SUPPORTED_OPTIONS= libofx
5PKG_SUGGESTED_OPTIONS= libofx #sqlite3 5PKG_SUGGESTED_OPTIONS= libofx
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= libofx #sqlite3 9PLIST_VARS+= libofx #sqlite3
10 10
11.if !empty(PKG_OPTIONS:Mlibofx) 11.if !empty(PKG_OPTIONS:Mlibofx)
12.include "../../finance/libofx/buildlink3.mk" 12.include "../../finance/libofx/buildlink3.mk"
13PLIST.libofx= yes 13PLIST.libofx= yes
14.endif 14.endif
15 
16#.if !empty(PKG_OPTIONS:Msqlite3) 
17#.include "../../databases/sqlite3/buildlink3.mk" 
18#PLIST.sqlite3= yes 
19#.endif