pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/sysutils/bacula * Use VARBASE



details:   https://anonhg.NetBSD.org/pkgsrc/rev/05f214a350ee
branches:  trunk
changeset: 485507:05f214a350ee
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Dec 14 14:51:07 2004 +0000

description:
* Use VARBASE
* Remove duplicated users/groups variables
* Use pgsql.buildlink3.mk instead of using postgresql74-lib

diffstat:

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

diffs (46 lines):

diff -r 16ca825be1c5 -r 05f214a350ee sysutils/bacula/Makefile.common
--- a/sysutils/bacula/Makefile.common   Tue Dec 14 14:28:43 2004 +0000
+++ b/sysutils/bacula/Makefile.common   Tue Dec 14 14:51:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/12/14 14:51:07 xtraeme Exp $
 #
 
 DISTNAME=              bacula-1.36.0
@@ -17,11 +17,8 @@
 GNU_CONFIGURE=         yes
 
 PKG_SYSCONFSUBDIR?=    bacula
-BACULA_PIDDIR?=                /var/run/bacula
-BACULA_WORKINGDIR?=    /var/spool/bacula
-BACULA_GROUP?=         bacula
-BACULA_DIR_USER?=      bacula-dir
-BACULA_SD_USER?=       bacula-sd
+BACULA_PIDDIR?=                ${VARBASE}/run/bacula
+BACULA_WORKINGDIR?=    ${VARBASE}/spool/bacula
 
 OWN_DIRS_PERMS=                ${BACULA_PIDDIR} root ${BACULA_GROUP} 770
 OWN_DIRS_PERMS+=       ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
@@ -40,11 +37,11 @@
 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)
-CONFIGURE_ARGS+=       --with-sqlite=${PREFIX}
+CONFIGURE_ARGS+=       --with-sqlite=${BUILDLINK_PREFIX.sqlite}
 BACULA_DB=             sqlite
 .endif
 .if !empty(PKG_OPTIONS:Mcatalog-pgsql)
-CONFIGURE_ARGS+=       -with-postgresql=${PREFIX}
+CONFIGURE_ARGS+=       -with-postgresql=${BUILDLINK_PREFIX.postgresql-lib}
 BACULA_DB=             postgresql
 .endif
 
@@ -76,7 +73,7 @@
 .include "../../databases/sqlite/buildlink3.mk"
 .endif
 .if !empty(PKG_OPTIONS:Mcatalog-pgsql)
-.include "../../databases/postgresql74-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"



Home | Main Index | Thread Index | Old Index