[pkgsrc/trunk]: pkgsrc/sysutils/bacula * Remove redundant lines for PKG_OPTIONS.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc9a490b1122
branches:  trunk
changeset: 485509:fc9a490b1122
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Dec 14 15:10:15 2004 +0000

description:
* Remove redundant lines for PKG_OPTIONS.
* Use PGSQL_PREFIX to find postgresql*-lib prefix
* USE_LANGUAGES+= c++

diffstat:

 sysutils/bacula/Makefile.common |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 4dfc5d1764f3 -r fc9a490b1122 sysutils/bacula/Makefile.common
--- a/sysutils/bacula/Makefile.common   Tue Dec 14 15:09:03 2004 +0000
+++ b/sysutils/bacula/Makefile.common   Tue Dec 14 15:10:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/12/14 14:51:07 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/12/14 15:10:15 xtraeme Exp $
 #
 
 DISTNAME=              bacula-1.36.0
@@ -12,6 +12,7 @@
 .include "Makefile.options"
 
 USE_BUILDLINK3=                yes
+USE_LANGUAGES+=                c++
 USE_PKGLOCALEDIR=      yes
 USE_PKGINSTALL=                yes
 GNU_CONFIGURE=         yes
@@ -37,11 +38,13 @@
 CONFIGURE_ARGS+=       --with-dir-user=${BACULA_DIR_USER} --with-dir-group=${BACULA_GROUP}
 CONFIGURE_ARGS+=       --with-sd-user=${BACULA_SD_USER} --with-sd-group=${BACULA_GROUP}
 .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)
-CONFIGURE_ARGS+=       -with-postgresql=${BUILDLINK_PREFIX.postgresql-lib}
+.  include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-postgresql=${PGSQL_PREFIX}
 BACULA_DB=             postgresql
 .endif
 
@@ -69,13 +72,6 @@
 pre-install:
        ${MKDIR} ${EXAMPLESDIR}
 
-.if !empty(PKG_OPTIONS:Mcatalog-sqlite)
-.include "../../databases/sqlite/buildlink3.mk"
-.endif
-.if !empty(PKG_OPTIONS:Mcatalog-pgsql)
-.include "../../mk/pgsql.buildlink3.mk"
-.endif
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"