Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2020 21:39:41 +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: r525235 - in head/sysutils: . bareos18-client bareos18-client/bareos-client bareos18-server bareos18-traymonitor
Message-ID:  <202002042139.014Ldf7P031621@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: acm
Date: Tue Feb  4 21:39:41 2020
New Revision: 525235
URL: https://svnweb.freebsd.org/changeset/ports/525235

Log:
  - Copy bareos-* ports to bareos18-*. bareos-* will be update to 19.2.5

Added:
  head/sysutils/bareos18-client/
     - copied from r525234, head/sysutils/bareos-client/
  head/sysutils/bareos18-client/bareos-client/
     - copied from r525234, head/sysutils/bareos-client/
  head/sysutils/bareos18-server/
     - copied from r525234, head/sysutils/bareos-server/
  head/sysutils/bareos18-traymonitor/
     - copied from r525234, head/sysutils/bareos-traymonitor/
Modified:
  head/sysutils/Makefile
  head/sysutils/bareos18-client/Makefile
  head/sysutils/bareos18-server/Makefile
  head/sysutils/bareos18-traymonitor/Makefile

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Tue Feb  4 20:47:28 2020	(r525234)
+++ head/sysutils/Makefile	Tue Feb  4 21:39:41 2020	(r525235)
@@ -94,6 +94,9 @@
     SUBDIR += bareos17-client
     SUBDIR += bareos17-client-static
     SUBDIR += bareos17-server
+    SUBDIR += bareos18-client
+    SUBDIR += bareos18-server
+    SUBDIR += bareos18-traymonitor
     SUBDIR += barrier
     SUBDIR += bastille
     SUBDIR += batmon

Modified: head/sysutils/bareos18-client/Makefile
==============================================================================
--- head/sysutils/bareos-client/Makefile	Tue Feb  4 20:47:28 2020	(r525234)
+++ head/sysutils/bareos18-client/Makefile	Tue Feb  4 21:39:41 2020	(r525235)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
-PORTNAME=	bareos
+PORTNAME=	bareos18
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
-CONFLICTS=	bareos16-client-* bareos17-client-*
+CONFLICTS=	bareos17-client-* 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/bareos18-server
 
 OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
 LMDB_DESC=	Enable build of LMDB support

Modified: head/sysutils/bareos18-server/Makefile
==============================================================================
--- head/sysutils/bareos-server/Makefile	Tue Feb  4 20:47:28 2020	(r525234)
+++ head/sysutils/bareos18-server/Makefile	Tue Feb  4 21:39:41 2020	(r525235)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	bareos
+PORTNAME=	bareos18
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	18.2.7
 PORTREVISION?=	0
@@ -14,7 +14,7 @@ COMMENT?=	Backup archiving recovery open sourced (serv
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
-CONFLICTS?=	bacula17*-server-* bareos16-server-*
+CONFLICTS?=	bacula17*-server-* bareos16-server-* bareos-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
@@ -22,6 +22,8 @@ LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 USES+=		cmake:insource compiler:c++11-lang pkgconfig readline:port \
 		shebangfix
 USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME:S/18//}
+GH_PROJECT=	${PORTNAME:S/18//}
 
 USERS=		bareos
 GROUPS=		${USERS}
@@ -35,6 +37,8 @@ SHEBANG_FILES=	${WRKSRC}/core/src/cats/make_catalog_ba
 CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+ETCDIR=		${PREFIX}/etc/${PORTNAME:S/18//}
+
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SINGLE=		CRYPTO
 OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
@@ -72,7 +76,7 @@ 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/bareos18-client
 USE_RC_SUBR?=	bareos-dir bareos-sd
 .endif
 

Modified: head/sysutils/bareos18-traymonitor/Makefile
==============================================================================
--- head/sysutils/bareos-traymonitor/Makefile	Tue Feb  4 20:47:28 2020	(r525234)
+++ head/sysutils/bareos18-traymonitor/Makefile	Tue Feb  4 21:39:41 2020	(r525235)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-PORTNAME=	bareos
+PORTNAME=	bareos18
 PKGNAMESUFFIX=	-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/bareos18-client
 
-CONFLICTS=	bacula*-bat-* bareos16-traymonitor-*
+CONFLICTS=	bacula*-bat-* bareos-traymonitor-*
 
 USES=		pkgconfig gettext-runtime desktop-file-utils 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/bareos18-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?202002042139.014Ldf7P031621>