CVS commit: pkgsrc

["Frank Kardel" <kardel%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kardel
Date:           Tue Jul 28 06:42:44 UTC 2020

Modified Files:
        pkgsrc/doc: CHANGES-2020
        pkgsrc/mk/defaults: options.description
        pkgsrc/sysutils: Makefile
        pkgsrc/sysutils/bacula: Makefile
        pkgsrc/sysutils/bacula-clientonly: Makefile

Log Message:
Complete import of bareos - a fork of bacula 5.2 around 2010 providing
LTO hardware encrytion, bandwidth limitation, data replication across
sites and more.


To generate a diff of this commit:
cvs rdiff -u -r1.4162 -r1.4163 pkgsrc/doc/CHANGES-2020
cvs rdiff -u -r1.630 -r1.631 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.892 -r1.893 pkgsrc/sysutils/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/sysutils/bacula/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/bacula-clientonly/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2020
diff -u pkgsrc/doc/CHANGES-2020:1.4162 pkgsrc/doc/CHANGES-2020:1.4163
--- pkgsrc/doc/CHANGES-2020:1.4162      Mon Jul 27 22:21:55 2020
+++ pkgsrc/doc/CHANGES-2020     Tue Jul 28 06:42:44 2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.4162 2020/07/27 22:21:55 leot Exp $
+$NetBSD: CHANGES-2020,v 1.4163 2020/07/28 06:42:44 kardel Exp $
 
 Changes to the packages collection and infrastructure in 2020:
 
@@ -6604,3 +6604,5 @@ Changes to the packages collection and i
        Updated graphics/graphviz to 2.44.1 [adam 2020-07-27]
        Updated devel/subversion to 1.14.0 [adam 2020-07-27]
        Updated net/youtube-dl to 20200728 [leot 2020-07-27]
+       Added sysutils/bareos version 19.2.8 [kardel 2020-07-28]
+       Added sysutils/bareos-clientonly version 19.2.8 [kardel 2020-07-28]

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.630 pkgsrc/mk/defaults/options.description:1.631
--- pkgsrc/mk/defaults/options.description:1.630        Wed Jul  1 14:48:04 2020
+++ pkgsrc/mk/defaults/options.description      Tue Jul 28 06:42:44 2020
@@ -715,6 +715,7 @@ sbcl                        Use Steel-Bank Common Lisp.
 scapy-crypto           Add in crypto support.
 scapy-pyx              Add in py-X support.
 scim                   Enable Smart Common Input Method support.
+scsi-crypto            support LTO4+ hardware cryto key management
 sdl                    Use SDL as the audio/display library.
 sdl2                   Use SDL2 as the audio/display library.
 seamonkey              Use seamonkey as gecko rendering engine.

Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.892 pkgsrc/sysutils/Makefile:1.893
--- pkgsrc/sysutils/Makefile:1.892      Thu Jul 23 12:38:44 2020
+++ pkgsrc/sysutils/Makefile    Tue Jul 28 06:42:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.892 2020/07/23 12:38:44 nia Exp $
+# $NetBSD: Makefile,v 1.893 2020/07/28 06:42:44 kardel Exp $
 #
 
 COMMENT=       System utilities
@@ -49,6 +49,8 @@ SUBDIR+=      bacula-tray-monitor-qt5
 SUBDIR+=       baloo
 SUBDIR+=       baloo-widgets
 SUBDIR+=       baloo5
+SUBDIR+=       bareos
+SUBDIR+=       bareos-clientonly
 SUBDIR+=       bbsload
 SUBDIR+=       bchunk
 SUBDIR+=       bcmfw

Index: pkgsrc/sysutils/bacula/Makefile
diff -u pkgsrc/sysutils/bacula/Makefile:1.84 pkgsrc/sysutils/bacula/Makefile:1.85
--- pkgsrc/sysutils/bacula/Makefile:1.84        Tue Jun  2 08:24:43 2020
+++ pkgsrc/sysutils/bacula/Makefile     Tue Jul 28 06:42:44 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2020/06/02 08:24:43 adam Exp $
+# $NetBSD: Makefile,v 1.85 2020/07/28 06:42:44 kardel Exp $
 
-CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]*
+CONFLICTS+=            bacula-client-[0-9]* bacula-clientonly-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
 #PKGREVISION= 3
 PKGREVISION= 2

Index: pkgsrc/sysutils/bacula-clientonly/Makefile
diff -u pkgsrc/sysutils/bacula-clientonly/Makefile:1.29 pkgsrc/sysutils/bacula-clientonly/Makefile:1.30
--- pkgsrc/sysutils/bacula-clientonly/Makefile:1.29     Fri Mar  6 19:48:48 2020
+++ pkgsrc/sysutils/bacula-clientonly/Makefile  Tue Jul 28 06:42:44 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2020/03/06 19:48:48 jnemeth Exp $
+# $NetBSD: Makefile,v 1.30 2020/07/28 06:42:44 kardel Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-clientonly-/}
 #PKGREVISION=          1
 COMMENT=               The Network Backup Solution (client only)
 
-CONFLICTS=             bacula-[0-9]* bacula-client-[0-9]*
+CONFLICTS=             bacula-[0-9]* bacula-client-[0-9]* bareos-[0-9]* bareos-clientonly-[0-9]*
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/bacula/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/bacula/patches