svn commit: r501125 - in head/sysutils: . bareos17-client bareos17-server bareos17-server/files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Thu May 9 18:04:42 UTC 2019
Author: acm
Date: Thu May 9 18:04:39 2019
New Revision: 501125
URL: https://svnweb.freebsd.org/changeset/ports/501125
Log:
- Copy bareos-* ports to bareos17-* ports. bareos-* ports will be updated to
latest version
- Fix bareos17-server build [1]
- Fix installation of sample files
- Bump PORTREVISION
PR: 230456 237165
Reported by: ohartmann at walstatt.org [1], okrg at ukr.net [1]
Added:
head/sysutils/bareos17-client/
- copied from r501099, head/sysutils/bareos-client/
head/sysutils/bareos17-server/
- copied from r501099, head/sysutils/bareos-server/
Modified:
head/sysutils/Makefile
head/sysutils/bareos17-client/Makefile
head/sysutils/bareos17-server/Makefile
head/sysutils/bareos17-server/files/patch-src-dird-Makefile.in
head/sysutils/bareos17-server/files/patch-src-filed-Makefile.in
head/sysutils/bareos17-server/files/patch-src-stored-Makefile.in
Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile Thu May 9 17:57:16 2019 (r501124)
+++ head/sysutils/Makefile Thu May 9 18:04:39 2019 (r501125)
@@ -87,6 +87,8 @@
SUBDIR += bareos16-client
SUBDIR += bareos16-client-static
SUBDIR += bareos16-server
+ SUBDIR += bareos17-client
+ SUBDIR += bareos17-server
SUBDIR += bastille
SUBDIR += batmon
SUBDIR += battmond
Modified: head/sysutils/bareos17-client/Makefile
==============================================================================
--- head/sysutils/bareos-client/Makefile Thu May 9 14:23:45 2019 (r501099)
+++ head/sysutils/bareos17-client/Makefile Thu May 9 18:04:39 2019 (r501125)
@@ -7,13 +7,13 @@ COMMENT= Backup archiving recovery open sourced (clien
BROKEN_aarch64= Fails to link: missing sbrk
-CONFLICTS= bareos16-client-*
+CONFLICTS= bareos16-client-* bareos-client-*
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
PLIST= ${PKGDIR}/pkg-plist.client
-MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server
+MASTERDIR= ${.CURDIR}/../../sysutils/bareos17-server
OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO
LMDB_DESC= Enable build of LMDB support
Modified: head/sysutils/bareos17-server/Makefile
==============================================================================
--- head/sysutils/bareos-server/Makefile Thu May 9 14:23:45 2019 (r501099)
+++ head/sysutils/bareos17-server/Makefile Thu May 9 18:04:39 2019 (r501125)
@@ -1,9 +1,9 @@
-# $FreeBSD$
+$FreeBSD$
-PORTNAME= bareos
+PORTNAME= bareos17
DISTVERSIONPREFIX= Release/
DISTVERSION= 17.2.7
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
@@ -21,6 +21,8 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
USES+= libtool:keepla pkgconfig readline:port shebangfix
USE_GITHUB= yes
+GH_ACCOUNT= ${PORTNAME:S/17//}
+GH_PROJECT= ${PORTNAME:S/17//}
USERS= bareos
GROUPS= ${USERS}
@@ -35,6 +37,8 @@ SHEBANG_FILES= ${WRKSRC}/src/cats/make_catalog_backup.
CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+ETCDIR= ${PREFIX}/etc/${PORTNAME:S/17//}
+
OPTIONS_DEFAULT= OPENSSL
OPTIONS_SINGLE= CRYPTO
OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS
@@ -72,7 +76,7 @@ PYTHON_CONFIGURE_OFF= --with-python=no
PYTHON_PLUGIN= yes
.if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+= libbareos.so:sysutils/bareos-client
+LIB_DEPENDS+= libbareos.so:sysutils/bareos17-client
USE_RC_SUBR?= bareos-dir bareos-sd
.endif
Modified: head/sysutils/bareos17-server/files/patch-src-dird-Makefile.in
==============================================================================
--- head/sysutils/bareos-server/files/patch-src-dird-Makefile.in Thu May 9 14:23:45 2019 (r501099)
+++ head/sysutils/bareos17-server/files/patch-src-dird-Makefile.in Thu May 9 18:04:39 2019 (r501125)
@@ -1,6 +1,6 @@
---- src/dird/Makefile.in 2016-10-16 10:14:36.000000000 -0500
-+++ src/dird/Makefile.in 2016-11-09 15:47:36.135752000 -0500
-@@ -52,6 +52,7 @@
+--- src/dird/Makefile.in 2018-07-12 07:38:58.000000000 -0500
++++ src/dird/Makefile.in 2019-05-09 09:40:05.828917000 -0500
+@@ -56,6 +56,7 @@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp
JANSSON_CPPFLAGS = @JANSSON_INC@
@@ -8,7 +8,20 @@
DIRD_RESTYPES = catalog client console counter director fileset job jobdefs messages pool profile schedule storage
-@@ -83,7 +84,7 @@
+@@ -77,46 +78,46 @@
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(JANSSON_CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
+
+ bareos-dir: Makefile $(SVROBJS) \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) \
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ @NDMP_DEPS@
+ @echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
$(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \
$(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \
@@ -16,8 +29,14 @@
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) $(JANSSON_LDFLAGS)
bareos-dbcheck: Makefile $(DBCHKOBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -94,7 +95,7 @@
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \
-lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
@@ -25,8 +44,14 @@
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
testfind: Makefile $(TSTFNDOBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -105,7 +106,7 @@
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \
-lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
@@ -34,19 +59,34 @@
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
static-bareos-dir: Makefile $(SVROBJS) \
- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -160,8 +161,8 @@
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE) \
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+ @NDMP_DEPS@
+ @echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
+@@ -160,13 +161,8 @@
+ if test -f "$$f"; then \
+ RESDIR="$$DESTCONFDIR/$$RESTYPE"; \
+ RES=`basename "$$f"`; \
+- if test -f "$$RESDIR/$$RES"; then \
+- destconf="$$RESDIR/$$RES.new"; \
+- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
+- else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
-+ destconf="$$RESDIR/$$RES.sample"; \
-+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- fi; \
+- fi; \
++ destconf="$$RESDIR/$$RES.sample"; \
++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${dir_group}" != "x"; then \
-@@ -170,11 +171,6 @@
+ chgrp -f ${dir_group} $$destconf || true; \
+@@ -174,11 +170,6 @@
fi; \
done; \
done
Modified: head/sysutils/bareos17-server/files/patch-src-filed-Makefile.in
==============================================================================
--- head/sysutils/bareos-server/files/patch-src-filed-Makefile.in Thu May 9 14:23:45 2019 (r501099)
+++ head/sysutils/bareos17-server/files/patch-src-filed-Makefile.in Thu May 9 18:04:39 2019 (r501125)
@@ -1,19 +1,44 @@
---- src/files/Makefile.in 2016-10-16 10:14:36.000000000 -0500
-+++ src/filed/Makefile.in 2016-11-10 01:33:16.120709000 -0500
-@@ -25,6 +25,7 @@
- GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
+--- src/filed/Makefile.in 2018-07-12 07:38:58.000000000 -0500
++++ src/filed/Makefile.in 2019-05-09 09:43:00.397777000 -0500
+@@ -21,10 +21,11 @@
+ DEBUG=@DEBUG@
+ GETTEXT_LIBS = @LIBINTL@
+-OPENSSL_LIBS_NONSHARED = @OPENSSL_LIBS_NONSHARED@
+-GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
++OPENSSL_LIBS = @OPENSSL_LIBS@
++GNUTLS_LIBS = @GNUTLS_LIBS@
+
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
first_rule: all
+@@ -39,12 +40,12 @@
+
+ FDLIBS += @LMDB_LIBS@
+ FDLIBS += @CAP_LIBS@
+-FDLIBS += @ZLIB_LIBS_NONSHARED@
+-FDLIBS += @LZO_LIBS_NONSHARED@
+-FDLIBS += @FASTLZ_LIBS_NONSHARED@
+-FDLIBS += @AFS_LIBS_NONSHARED@
+-FDLIBS += @ACL_LIBS_NONSHARED@
+-FDLIBS += @XATTR_LIBS_NONSHARED@
++FDLIBS += @ZLIB_LIBS@
++FDLIBS += @LZO_LIBS@
++FDLIBS += @FASTLZ_LIBS@
++FDLIBS += @AFS_LIBS@
++FDLIBS += @ACL_LIBS@
++FDLIBS += @XATTR_LIBS@
+
+ INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb
+
@@ -78,7 +79,7 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
static-bareos-fd: Makefile $(SVROBJS) \
../findlib/libbareosfind.a \
@@ -26,14 +51,19 @@
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-@@ -137,8 +138,8 @@
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
+@@ -133,13 +134,8 @@
+ if test -f "$$f"; then \
+ RESDIR="$$DESTCONFDIR/$$RESTYPE"; \
+ RES=`basename "$$f"`; \
+- if test -f "$$RESDIR/$$RES"; then \
+- destconf="$$RESDIR/$$RES.new"; \
+- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
+- else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
-+ destconf="$$RESDIR/$$RES.sample"; \
-+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- fi; \
+- fi; \
++ destconf="$$RESDIR/$$RES.sample"; \
++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${fd_group}" != "x"; then \
+ chgrp -f ${fd_group} $$destconf || true; \
Modified: head/sysutils/bareos17-server/files/patch-src-stored-Makefile.in
==============================================================================
--- head/sysutils/bareos-server/files/patch-src-stored-Makefile.in Thu May 9 14:23:45 2019 (r501099)
+++ head/sysutils/bareos17-server/files/patch-src-stored-Makefile.in Thu May 9 18:04:39 2019 (r501125)
@@ -1,6 +1,6 @@
---- src/stored/Makefile.in 2016-10-16 10:14:36.000000000 -0500
-+++ src/stored/Makefile.in 2016-11-09 15:54:32.944172000 -0500
-@@ -93,6 +93,7 @@
+--- src/stored/Makefile.in 2018-07-12 07:38:58.000000000 -0500
++++ src/stored/Makefile.in 2019-05-09 09:44:40.049928000 -0500
+@@ -94,6 +94,7 @@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
JANSSON_CPPFLAGS = @JANSSON_INC@
@@ -8,25 +8,50 @@
DEBUG = @DEBUG@
GETTEXT_LIBS = @LIBINTL@
-@@ -170,7 +171,7 @@
+@@ -165,17 +166,17 @@
+ $(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(JANSSON_CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
+
+ bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ @NDMP_DEPS@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \
$(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
- $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
++ $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
-@@ -192,7 +193,7 @@
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+ @NDMP_DEPS@
@echo "Linking $@ ..."
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L. -L../lib -o $@ $(SDOBJS) \
+@@ -188,46 +189,46 @@
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I../lib $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) $<
+
+ btape: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(TAPEOBJS) \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
+ @echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \
-lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -201,7 +202,7 @@
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
-lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
@@ -34,8 +59,12 @@
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -210,7 +211,7 @@
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
-lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \
@@ -43,16 +72,21 @@
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
bscan: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -220,13 +221,13 @@
+- ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareossql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbareoscats$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
-lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \
- $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
++ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
bcopy: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \
- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
+- ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
++ $(LOCALBASE)/lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \
- -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
@@ -60,14 +94,19 @@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
-@@ -259,8 +260,8 @@
- destconf="$$RESDIR/$$RES.new"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- else \
+@@ -256,13 +257,8 @@
+ if test -f "$$f"; then \
+ RESDIR="$$DESTCONFDIR/$$RESTYPE"; \
+ RES=`basename "$$f"`; \
+- if test -f "$$RESDIR/$$RES"; then \
+- destconf="$$RESDIR/$$RES.new"; \
+- echo " $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
+- else \
- destconf="$$RESDIR/$$RES"; \
- echo " $$RESTYPE/$$RES as \"$$destconf\""; \
-+ destconf="$$RESDIR/$$RES.sample"; \
-+ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- fi; \
+- fi; \
++ destconf="$$RESDIR/$$RES.sample"; \
++ echo " $$RESTYPE/$$RES as \"$$destconf\".sample"; \
${INSTALL_CONFIG} "$$f" "$$destconf"; \
if test "x${sd_group}" != "x"; then \
+ chgrp -f ${sd_group} $$destconf || true; \
More information about the svn-ports-all
mailing list