git: bdf2ebb1674d - main - sysutils/bareos-*: Update to 21.1.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Fri, 18 Nov 2022 05:34:40 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bdf2ebb1674dac7c1780c942c5c0806597717740

commit bdf2ebb1674dac7c1780c942c5c0806597717740
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-11-18 05:33:56 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-11-18 05:33:56 +0000

    sysutils/bareos-*: Update to 21.1.5
    
    ChangeLog at:   https://github.com/bareos/bareos/blob/Release/21.1.5/CHANGELOG.md
---
 sysutils/bareos-server/Makefile                    |  2 +-
 sysutils/bareos-server/distinfo                    |  6 +++---
 .../bareos-server/files/patch-core-CMakeLists.txt  | 24 +++++++++++-----------
 www/bareos-webui/Makefile                          |  2 +-
 www/bareos-webui/distinfo                          |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index b337c01882d6..105ccaab712c 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	21.1.4
+DISTVERSION=	21.1.5
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index b62e16c5e22d..d006826f451f 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667251095
-SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb
-SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699
+TIMESTAMP = 1668638096
+SHA256 (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 2bdae1c7b0667e49b62cea236c96c108a5b663b379170ab273a96f07494b01f0
+SIZE (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 11655244
diff --git a/sysutils/bareos-server/files/patch-core-CMakeLists.txt b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
index 92dde09af5b7..b7e291bf0d60 100644
--- a/sysutils/bareos-server/files/patch-core-CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
@@ -1,28 +1,28 @@
---- core/CMakeLists.txt	2021-12-21 06:00:49.000000000 -0500
-+++ core/CMakeLists.txt	2021-12-21 20:45:08.474921000 -0500
+--- core/CMakeLists.txt	2022-11-09 08:14:10.000000000 -0500
++++ core/CMakeLists.txt	2022-11-18 00:11:43.670601000 -0500
 @@ -283,7 +283,9 @@
    set(HAVE_FREEBSD_OS 1)
    include_directories(/usr/local/include)
    link_directories(/usr/local/lib)
 -  link_libraries(intl)
-+  IF(nls)
++  if(nls)
 +    link_libraries(intl)
-+  ENDIF()
- endif()
- 
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-@@ -347,7 +349,9 @@
++  endif()
+   check_cxx_compiler_flag(
+     -Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable
+   )
+@@ -350,7 +352,9 @@
    add_definitions("-D_FILE_OFFSET_BITS=64")
  endif()
  
 -include(FindIntl)
-+IF(nls)
++if(nls)
 +  include(FindIntl)
-+ENDIF()
++endif()
  
  if(developer)
    add_definitions("-DDEVELOPER=1")
-@@ -365,7 +369,7 @@
+@@ -368,7 +372,7 @@
  include(BareosFindStaticCodeAnalysisTools)
  
  if(NOT client-only
@@ -31,7 +31,7 @@
     AND CMAKE_SIZEOF_VOID_P EQUAL 8
  )
    # droplet does not build on solaris because of sys/cdefs.h: No such file or
-@@ -779,7 +783,6 @@
+@@ -782,7 +786,6 @@
  
  add_subdirectory(scripts)
  add_subdirectory(manpages)
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 3eb0014a61bb..f50e7a7a1d2e 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	21.1.4
+DISTVERSION=	21.1.5
 CATEGORIES?=	www sysutils
 PKGNAMESUFFIX=	-webui
 
diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo
index 5607b68d699a..021e81bc94c2 100644
--- a/www/bareos-webui/distinfo
+++ b/www/bareos-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667253078
-SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb
-SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699
+TIMESTAMP = 1668748844
+SHA256 (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 2bdae1c7b0667e49b62cea236c96c108a5b663b379170ab273a96f07494b01f0
+SIZE (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 11655244