Date: Sun, 27 Dec 2020 17:34:40 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559383 - in head/sysutils: bareos19-client bareos19-server bareos19-traymonitor Message-ID: <202012271734.0BRHYeTI018951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sun Dec 27 17:34:40 2020 New Revision: 559383 URL: https://svnweb.freebsd.org/changeset/ports/559383 Log: - Copy bareos-* to bareos19-* preparing for update bareos to 20.0.0 Added: head/sysutils/bareos19-client/ - copied from r559375, head/sysutils/bareos-client/ head/sysutils/bareos19-server/ - copied from r559375, head/sysutils/bareos-server/ head/sysutils/bareos19-traymonitor/ - copied from r559375, head/sysutils/bareos-traymonitor/ Modified: head/sysutils/bareos19-client/Makefile head/sysutils/bareos19-server/Makefile head/sysutils/bareos19-server/Makefile.common head/sysutils/bareos19-traymonitor/Makefile Modified: head/sysutils/bareos19-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Sun Dec 27 17:22:02 2020 (r559375) +++ head/sysutils/bareos19-client/Makefile Sun Dec 27 17:34:40 2020 (r559383) @@ -1,17 +1,17 @@ # $FreeBSD$ PORTNAME= bareos -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 19-client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos18-client-* bareos17-client-* bareos16-client-* +CONFLICTS= bareos18-client-* bareos17-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/bareos19-server OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS Modified: head/sysutils/bareos19-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Sun Dec 27 17:22:02 2020 (r559375) +++ head/sysutils/bareos19-server/Makefile Sun Dec 27 17:34:40 2020 (r559383) @@ -6,7 +6,7 @@ DISTVERSION= 19.2.9 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= 19-server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) @@ -14,7 +14,7 @@ COMMENT?= Backup archiving recovery open sourced (serv LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula18*-server bacula17*-server-* bareos16-server-* +CONFLICTS?= bacula18*-server bacula17*-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson @@ -45,7 +45,7 @@ MTX_DESC= Install mtx for control of autochanger devi NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin -.if ${PKGNAMESUFFIX} == "-server" +.if ${PKGNAMESUFFIX} == "19-server" OPTIONS_GROUP= BACKENDS OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO @@ -72,14 +72,14 @@ OPENSSL_CMAKE_OFF= -Dopenssl=OFF SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF -.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file +.if ${PKGNAMESUFFIX} == "19-client" || ${PKGNAMESUFFIX} == "19-server" #Till end of the file PYTHON_USES= python PYTHON_CMAKE_ON= -Dpython=ON PYTHON_CMAKE_OFF= -Dpython=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= libbareos.so:sysutils/bareos-client +LIB_DEPENDS+= libbareos.so:sysutils/bareos19-client USE_RC_SUBR?= bareos-dir bareos-sd .endif @@ -206,7 +206,7 @@ MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: @${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt -.if ${PKGNAMESUFFIX} == "-server" +.if ${PKGNAMESUFFIX} == "19-server" @${REINPLACE_CMD} '24d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif @@ -236,5 +236,5 @@ post-install: .endif .else .include "${MASTERDIR}/Makefile.common" -.endif # -client and -server are defined +.endif # 19-client and 19-server are defined .include <bsd.port.mk> Modified: head/sysutils/bareos19-server/Makefile.common ============================================================================== --- head/sysutils/bareos-server/Makefile.common Sun Dec 27 17:22:02 2020 (r559375) +++ head/sysutils/bareos19-server/Makefile.common Sun Dec 27 17:34:40 2020 (r559383) @@ -9,7 +9,7 @@ post-build: .endif pre-install: -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "19-traymonitor" . for d in client director monitor storage ${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d} ${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; @@ -22,11 +22,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif -.if ${PKGNAMESUFFIX} == "-client-static" - ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static - ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static -.endif -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "19-traymonitor" # Install config files and preserve existing ones .for d in client director monitor storage ${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/ Modified: head/sysutils/bareos19-traymonitor/Makefile ============================================================================== --- head/sysutils/bareos-traymonitor/Makefile Sun Dec 27 17:22:02 2020 (r559375) +++ head/sysutils/bareos19-traymonitor/Makefile Sun Dec 27 17:34:40 2020 (r559383) @@ -1,14 +1,14 @@ # $FreeBSD$ PORTNAME= bareos -PKGNAMESUFFIX= -traymonitor +PKGNAMESUFFIX= 19-traymonitor COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ - libbareos.so:sysutils/bareos-client + libbareos.so:sysutils/bareos19-client -CONFLICTS= bacula*-bat-* bareos16-traymonitor-* +CONFLICTS= bareos18-traymonitor-* bareos17-traymonitor-* bareos-traymonitor-* USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core @@ -17,7 +17,7 @@ WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 -MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server +MASTERDIR= ${.CURDIR}/../../sysutils/bareos19-server CMAKE_ARGS+= -Dtraymonitor=yes \ -Dbuild-dird=no \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012271734.0BRHYeTI018951>