From a756ddf11b1ceaa7f41d5c39ba89718f2902a8c6 Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Tue, 22 Nov 2005 19:33:06 +0000
Subject: Move .if blocks for options from Makefile to options.mk.

---
 sysutils/bacula/Makefile   | 18 +-----------------
 sysutils/bacula/options.mk | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 9ce856bb9d0..35c4d5d4488 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,25 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/11/22 18:35:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/22 19:33:06 tv Exp $
 
 CONFLICTS+=		bacula-client-[0-9]*
 
 .include "options.mk"
 
-.if !empty(PKG_OPTIONS:Mcatalog-sqlite)
-.  include "../../databases/sqlite/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-sqlite=${BUILDLINK_PREFIX.sqlite}
-BACULA_DB=		sqlite
-.endif
-.if !empty(PKG_OPTIONS:Mcatalog-pgsql)
-.  include "../../mk/pgsql.buildlink3.mk"
-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
-
 PLIST_SUBST+=		BACULA_DB=${BACULA_DB}
 MESSAGE_SUBST+=		PREFIX=${PREFIX}
 MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk
index b8af5bd8c1e..3b2e003b541 100644
--- a/sysutils/bacula/options.mk
+++ b/sysutils/bacula/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/10/31 09:45:47 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2005/11/22 19:33:06 tv Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula
 PKG_OPTIONS_REQUIRED_GROUPS=	database
@@ -6,3 +6,17 @@ PKG_OPTIONS_GROUP.database=	catalog-sqlite catalog-pgsql catalog-mysql
 PKG_SUGGESTED_OPTIONS=		catalog-sqlite
 
 .include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcatalog-sqlite)
+.  include "../../databases/sqlite/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sqlite=${BUILDLINK_PREFIX.sqlite}
+BACULA_DB=		sqlite
+.elif !empty(PKG_OPTIONS:Mcatalog-pgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX}
+BACULA_DB=		postgresql
+.elif !empty(PKG_OPTIONS:Mcatalog-mysql)
+.  include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
+BACULA_DB=		mysql
+.endif
-- 
cgit v1.2.3