Subject: Re: patch: bacula option group, plus a fix in the docs
To: None <tech-pkg@netbsd.org>
From: Geert Hendrickx <ghen@telenet.be>
List: tech-pkg
Date: 10/10/2005 16:44:04
On Fri, Oct 07, 2005 at 01:55:50PM +0200, Geert Hendrickx wrote:
> * add catalog-mysql option

Index: Makefile.common
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/sysutils/bacula/Makefile.common,v
retrieving revision 1.8
diff -u -r1.8 Makefile.common
--- Makefile.common	7 Oct 2005 11:30:35 -0000	1.8
+++ Makefile.common	10 Oct 2005 14:42:18 -0000
@@ -46,6 +46,11 @@
 CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX}
 BACULA_DB=		postgresql
 .endif
+.if !empty(PKG_OPTIONS:Mcatalog-mysql)
+.  include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
+BACULA_DB=		mysql
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
Index: options.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/sysutils/bacula/options.mk,v
retrieving revision 1.2
diff -u -r1.2 options.mk
--- options.mk	7 Oct 2005 11:33:28 -0000	1.2
+++ options.mk	10 Oct 2005 14:42:18 -0000
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula
 PKG_OPTIONS_REQUIRED_GROUPS=	database
-PKG_OPTIONS_GROUP.database=	catalog-sqlite catalog-pgsql
+PKG_OPTIONS_GROUP.database=	catalog-sqlite catalog-pgsql catalog-mysql
 PKG_SUGGESTED_OPTIONS=		catalog-sqlite
 
 .include "../../mk/bsd.options.mk"

I didn't have to modify the PLIST due to nice ${BACULA_DB} variable
substitution. 

	Geert