pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/bacula Move .if blocks for options from Makef...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d115688e792
branches:  trunk
changeset: 503525:7d115688e792
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 22 19:33:06 2005 +0000

description:
Move .if blocks for options from Makefile to options.mk.

diffstat:

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

diffs (57 lines):

diff -r 9ed1896e0164 -r 7d115688e792 sysutils/bacula/Makefile
--- a/sysutils/bacula/Makefile  Tue Nov 22 19:28:31 2005 +0000
+++ b/sysutils/bacula/Makefile  Tue Nov 22 19:33:06 2005 +0000
@@ -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 -r 9ed1896e0164 -r 7d115688e792 sysutils/bacula/options.mk
--- a/sysutils/bacula/options.mk        Tue Nov 22 19:28:31 2005 +0000
+++ b/sysutils/bacula/options.mk        Tue Nov 22 19:33:06 2005 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index