Mon Jun 22 16:50:38 2015 UTC ()
Substitute hardcoded path to the C++ wrapper.  Fixes CHECK_WRKREF builds.


(jperkin)
diff -r1.65 -r1.66 pkgsrc/sysutils/bacula/Makefile.common
cvs diff -r1.65 -r1.66 pkgsrc/sysutils/bacula/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/Makefile.common 2014/10/05 16:41:08 1.65
+++ pkgsrc/sysutils/bacula/Makefile.common 2015/06/22 16:50:38 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.65 2014/10/05 16:41:08 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.66 2015/06/22 16:50:38 jperkin Exp $
2# 2#
3# used by sysutils/bacula-clientonly/Makefile 3# used by sysutils/bacula-clientonly/Makefile
4# used by sysutils/bacula-tray-monitor/Makefile 4# used by sysutils/bacula-tray-monitor/Makefile
5# used by sysutils/bacula-wx-console/Makefile 5# used by sysutils/bacula-wx-console/Makefile
6# used by sysutils/bacula-qt-console/Makefile 6# used by sysutils/bacula-qt-console/Makefile
7 7
8DISTNAME= bacula-5.2.13 8DISTNAME= bacula-5.2.13
9CATEGORIES= sysutils 9CATEGORIES= sysutils
10MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} 10MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
11 11
12#PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} 12#PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
13#PATCHFILES= 13#PATCHFILES=
14#DIST_SUBDIR= ${DISTNAME} 14#DIST_SUBDIR= ${DISTNAME}
@@ -46,26 +46,31 @@ FILES_SUBST+= BACULA_DIR_USER=${BACULA_ @@ -46,26 +46,31 @@ FILES_SUBST+= BACULA_DIR_USER=${BACULA_
46FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER} 46FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER}
47 47
48SUBST_CLASSES+= egdir 48SUBST_CLASSES+= egdir
49SUBST_STAGE.egdir= pre-configure 49SUBST_STAGE.egdir= pre-configure
50SUBST_FILES.egdir= src/dird/Makefile.in 50SUBST_FILES.egdir= src/dird/Makefile.in
51SUBST_FILES.egdir+= src/console/Makefile.in 51SUBST_FILES.egdir+= src/console/Makefile.in
52SUBST_FILES.egdir+= src/filed/Makefile.in 52SUBST_FILES.egdir+= src/filed/Makefile.in
53SUBST_FILES.egdir+= src/stored/Makefile.in 53SUBST_FILES.egdir+= src/stored/Makefile.in
54SUBST_FILES.egdir+= src/gnome2-console/Makefile.in 54SUBST_FILES.egdir+= src/gnome2-console/Makefile.in
55SUBST_FILES.egdir+= src/wx-console/Makefile.in 55SUBST_FILES.egdir+= src/wx-console/Makefile.in
56SUBST_FILES.egdir+= src/tray-monitor/Makefile.in 56SUBST_FILES.egdir+= src/tray-monitor/Makefile.in
57SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' 57SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
58 58
 59SUBST_CLASSES+= fixwrap
 60SUBST_STAGE.fixwrap= post-build
 61SUBST_FILES.fixwrap= scripts/bacula_config
 62SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
 63
59CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 64CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
60CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula 65CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula
61CONFIGURE_ARGS+= --with-sbin-perm=0755 66CONFIGURE_ARGS+= --with-sbin-perm=0755
62CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR} 67CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR}
63CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR} 68CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR}
64CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline 69CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline
65 70
66.if ${OPSYS} == "Linux" 71.if ${OPSYS} == "Linux"
67CONFIGURE_ARGS+= --enable-smartalloc 72CONFIGURE_ARGS+= --enable-smartalloc
68.endif 73.endif
69.if ${OPSYS} == "DragonFly" 74.if ${OPSYS} == "DragonFly"
70CONFIGURE_ARGS+= --disable-xattr 75CONFIGURE_ARGS+= --disable-xattr
71.endif 76.endif