fix builds on a system which doesn't have already-existing _bacula users/groups.
spotted by naddy@, ok merdely@ aja@
This commit is contained in:
parent
b7fafd5fa1
commit
0b88f3cbcc
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.39 2012/03/06 20:11:33 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.40 2012/03/08 17:34:34 sthen Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -7,6 +7,7 @@ COMMENT-server= network backup solution (server)
|
||||
COMMENT-bat= network backup solution (gui-client)
|
||||
|
||||
V= 5.2.6
|
||||
REVISION= 0
|
||||
DISTNAME= bacula-$V
|
||||
FULLPKGNAME-main= bacula-client-$V
|
||||
FULLPKGPATH-main= ${PKGPATH},-main
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2012/03/06 20:11:33 sthen Exp $
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2012/03/08 17:34:34 sthen Exp $
|
||||
|
||||
stop building when an error occurs, rather than just keep on with the
|
||||
next subdir..
|
||||
|
||||
--- Makefile.in.orig Tue Jan 24 13:41:48 2012
|
||||
+++ Makefile.in Tue Jan 24 13:42:10 2012
|
||||
--- Makefile.in.orig Tue Feb 21 15:59:33 2012
|
||||
+++ Makefile.in Wed Mar 7 22:15:48 2012
|
||||
@@ -43,18 +43,18 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -27,3 +27,16 @@ next subdir..
|
||||
do (cd $$I; echo "==>Entering directory `pwd`"; \
|
||||
$(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
|
||||
echo ""; echo ""; exit 1;)); \
|
||||
@@ -101,12 +101,6 @@ installdirs:
|
||||
-if test ! -d $(DESTDIR)$(working_dir) ; then \
|
||||
$(MKDIR) $(DESTDIR)$(working_dir); \
|
||||
chmod 770 $(DESTDIR)$(working_dir); \
|
||||
- fi
|
||||
- -if test "x$(dir_user)" != "x" ; then \
|
||||
- chown $(dir_user) $(DESTDIR)$(working_dir); \
|
||||
- fi
|
||||
- -if test "x$(dir_group)" != "x" ; then \
|
||||
- chgrp $(dir_group) $(DESTDIR)$(working_dir); \
|
||||
fi
|
||||
|
||||
gnomedirs:
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-src_dird_Makefile_in,v 1.1 2011/11/24 09:29:55 ajacoutot Exp $
|
||||
$OpenBSD: patch-src_dird_Makefile_in,v 1.2 2012/03/08 17:34:34 sthen Exp $
|
||||
|
||||
Reorder LDFLAGS (prefer -L.libs over /usr/local/lib) so that bacula can
|
||||
be rebuilt while already installed.
|
||||
|
||||
--- src/dird/Makefile.in.orig Wed Nov 23 16:30:36 2011
|
||||
+++ src/dird/Makefile.in Wed Nov 23 16:31:32 2011
|
||||
--- src/dird/Makefile.in.orig Tue Feb 21 15:59:33 2012
|
||||
+++ src/dird/Makefile.in Wed Mar 7 22:15:15 2012
|
||||
@@ -68,14 +68,14 @@ bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT
|
||||
../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
|
||||
../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
|
||||
@ -22,3 +22,13 @@ be rebuilt while already installed.
|
||||
-lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
|
||||
$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
|
||||
strip $@
|
||||
@@ -113,9 +113,6 @@ install: all
|
||||
fi; \
|
||||
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
|
||||
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
|
||||
- @if test "x${dir_group}" != "x"; then \
|
||||
- chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
|
||||
- fi
|
||||
@if test -f ${DESTDIR}${scriptdir}/query.sql; then \
|
||||
echo " ==> Saving existing query.sql to query.sql.old"; \
|
||||
$(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
|
||||
|
13
sysutils/bacula/patches/patch-src_filed_Makefile_in
Normal file
13
sysutils/bacula/patches/patch-src_filed_Makefile_in
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-src_filed_Makefile_in,v 1.1 2012/03/08 17:34:34 sthen Exp $
|
||||
--- src/filed/Makefile.in.orig Wed Mar 7 22:13:02 2012
|
||||
+++ src/filed/Makefile.in Wed Mar 7 22:15:25 2012
|
||||
@@ -145,9 +145,6 @@ install: all
|
||||
fi; \
|
||||
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
|
||||
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
|
||||
- @if test "x${fd_group}" != "x"; then \
|
||||
- chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
|
||||
- fi
|
||||
@if test -f static-bacula-fd; then \
|
||||
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
|
||||
fi
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-src_stored_Makefile_in,v 1.2 2011/12/12 09:15:09 sthen Exp $
|
||||
$OpenBSD: patch-src_stored_Makefile_in,v 1.3 2012/03/08 17:34:34 sthen Exp $
|
||||
|
||||
Reorder LDFLAGS (prefer -L.libs over /usr/local/lib) so that bacula can
|
||||
be rebuilt while already installed.
|
||||
|
||||
--- src/stored/Makefile.in.orig Sat Nov 26 14:08:12 2011
|
||||
+++ src/stored/Makefile.in Sun Dec 4 11:52:17 2011
|
||||
--- src/stored/Makefile.in.orig Tue Feb 21 15:59:33 2012
|
||||
+++ src/stored/Makefile.in Wed Mar 7 22:15:20 2012
|
||||
@@ -95,12 +95,12 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan
|
||||
|
||||
bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
||||
@ -65,3 +65,13 @@ be rebuilt while already installed.
|
||||
-lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||||
@@ -173,9 +173,6 @@ install: all
|
||||
fi; \
|
||||
echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
|
||||
${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
|
||||
- @if test "x${sd_group}" != "x"; then \
|
||||
- chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \
|
||||
- fi
|
||||
@if test -f static-bacula-sd; then \
|
||||
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user