sysutils/bareos21-*: update to 21.1.9

- Replace BACULA_DIR/BAREOS_DIR into pkg-deinstall.client.in [1]

ChangeLog at:	https://github.com/bareos/bareos/blob/Release/21.1.9/CHANGELOG.md
PR:		276634
Reported by:	Trond.Endrestol@ximalas.info [1]

5 files changed, 56 insertions, 49 deletions

diff --git a/sysutils/bareos21-server/Makefile b/sysutils/bareos21-server/Makefile
index eef5239aa8cd..cbfdcf1e22ee 100644
--- a/sysutils/bareos21-server/Makefile
+++ b/sysutils/bareos21-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	21.1.8
+DISTVERSION=	21.1.9
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
@@ -196,7 +196,7 @@ MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
-	@${REINPLACE_CMD}  '120,123d' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD}  '129,132d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "21-server"
 	@${REINPLACE_CMD}  '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
 .endif
@@ -218,7 +218,7 @@ post-extract:
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
-	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
+	${CP} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
diff --git a/sysutils/bareos21-server/distinfo b/sysutils/bareos21-server/distinfo
index 5a823b29f797..0b8d45b36960 100644
--- a/sysutils/bareos21-server/distinfo
+++ b/sysutils/bareos21-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704432911
-SHA256 (bareos-bareos-Release-21.1.8_GH0.tar.gz) = 5cdf196151e758ff2787d47d97153e69cf75895d81f559b61c06679166a60b4d
-SIZE (bareos-bareos-Release-21.1.8_GH0.tar.gz) = 11663322
+TIMESTAMP = 1714628145
+SHA256 (bareos-bareos-Release-21.1.9_GH0.tar.gz) = cea611402f3d42903e8ad56808e43f3bc2163e0dbbbca4cba3f4abab8842320c
+SIZE (bareos-bareos-Release-21.1.9_GH0.tar.gz) = 11670286
diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
index 63a6f9eec824..63a2ea93f5a4 100644
--- a/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
+++ b/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
@@ -1,33 +1,41 @@
---- core/cmake/BareosInstallConfigFiles.cmake	2020-12-16 02:46:16.000000000 -0500
-+++ core/cmake/BareosInstallConfigFiles.cmake	2020-12-23 22:41:21.832081000 -0500
-@@ -55,20 +55,12 @@
-     get_filename_component(resname ${resdir} NAME)
-     foreach(configfile ${configfiles})
-       get_filename_component(fname ${configfile} NAME)
--      if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
--        message(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
--        message(STATUS "rename ${configfile} to ${configfile}.new")
--        file(RENAME "${configfile}" "${configfile}.new")
--
--        message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
--        file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
--        file(RENAME "${configfile}.new" "${configfile}")
--      else()
--        message(
--          STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)"
--        )
--        file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
--      endif()
-+      message(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
-+      file(RENAME "${configfile}" "${configfile}.sample")
-+      file(
+--- core/cmake/BareosInstallConfigFiles.cmake	2024-02-28 05:24:21.000000000 -0500
++++ core/cmake/BareosInstallConfigFiles.cmake	2024-05-02 00:46:57.386839000 -0500
+@@ -27,27 +27,13 @@
+   endif()
+ 
+   get_filename_component(fname ${configfile} NAME)
+-  if(EXISTS ${DESTCONFDIR}${additionalconfigdir}/${fname})
+-    message(
+-      STATUS "${DESTCONFDIR}${additionalconfigdir}/${fname} already exists"
+-    )
+-    message(
+-      STATUS
+-        "Installing config: ${DESTCONFDIR}${additionalconfigdir}/${fname}.new"
+-    )
+-    file(RENAME "${configfile}" "${configfile}.new")
+-    file(COPY "${configfile}.new"
+-         DESTINATION "${DESTCONFDIR}${additionalconfigdir}"
+-    )
+-    file(RENAME "${configfile}.new" "${configfile}")
+-  else()
+-    message(
+-      STATUS "Installing config: ${DESTCONFDIR}${additionalconfigdir}/${fname}"
+-    )
+-    file(COPY "${configfile}"
+-         DESTINATION "${DESTCONFDIR}${additionalconfigdir}"
+-    )
+-  endif()
++
++  message(STATUS "${DESTCONFDIR}${additionalconfigdir}/${fname} as ${DESTCONFDIR}${additionalconfigdir}/${fname}.sample (new installation)")
++  file(RENAME "${configfile}" "${configfile}.sample")
++  file(
 +       COPY "${configfile}.sample"
-+       DESTINATION "${DESTCONFDIR}/${resname}"
-+      )
-     endforeach()
-   endforeach()
++       DESTINATION "${DESTCONFDIR}${additionalconfigdir}"
++  )
+ endfunction()
  
-@@ -104,23 +96,12 @@
+ macro(BareosInstallConfigFiles CONFDIR CONFIGBASEDIRECTORY PLUGINS BACKENDS
+@@ -125,23 +111,12 @@
        get_filename_component(dir ${configfile} DIRECTORY)
        get_filename_component(fname ${configfile} NAME)
  
@@ -48,7 +56,7 @@
 -             DESTINATION "${DESTCONFDIR}/${dir}"
 -        )
 -      endif()
-+      message(STATUS "${configfile} as ${configfile}")
++      message(STATUS "${configfile} as ${configfile}.sample")
 +      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
 +      file(
 +       COPY "${BackendConfigSrcDir}/${configfile}.sample"
@@ -57,7 +65,7 @@
      endforeach()
  
      file(
-@@ -130,7 +111,8 @@
+@@ -151,7 +126,8 @@
      )
      foreach(configfile ${configfiles})
        get_filename_component(dir ${configfile} DIRECTORY)
@@ -67,7 +75,7 @@
  
        if(EXISTS ${DESTCONFDIR}/${configfile})
          message(STATUS "overwriting ${configfile}")
-@@ -138,9 +120,11 @@
+@@ -159,9 +135,10 @@
          message(STATUS "${configfile} as ${configfile}")
        endif()
  
@@ -75,14 +83,13 @@
 -           DESTINATION "${DESTCONFDIR}/${dir}"
 -      )
 +      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample")
-+       file(
++      file(
 +       COPY "${BackendConfigSrcDir}/${fsname}.conf.sample"
-+       DESTINATION "${DESTCONFDIR}/${dir}"
-+       )
++       DESTINATION "${DESTCONFDIR}/${dir}")
      endforeach()
  
    endforeach()
-@@ -167,20 +151,13 @@
+@@ -188,20 +165,13 @@
          string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
          if(NOT "${IS_INFILE}" STREQUAL ".in")
            get_filename_component(fname ${configfile} NAME)
diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
index 935c5a5b3177..13a68449b4d3 100644
--- a/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
+++ b/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
@@ -1,15 +1,15 @@
---- core/cmake/BareosSetVariableDefaults.cmake	2020-01-31 16:21:15.864122000 -0500
-+++ core/cmake/BareosSetVariableDefaults.cmake	2020-01-31 16:23:58.960984000 -0500
-@@ -641,7 +641,11 @@
- set(PACKAGE_URL "\"\"")
+--- core/cmake/BareosSetVariableDefaults.cmake	2024-02-28 05:24:21.000000000 -0500
++++ core/cmake/BareosSetVariableDefaults.cmake	2024-05-02 00:57:55.264449000 -0500
+@@ -568,8 +568,10 @@
+ set(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${BAREOS_NUMERIC_VERSION}\"")
  set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
  
--set(ENABLE_NLS 1)
+-if(NOT DEFINED ENABLE_NLS)
+-  set(ENABLE_NLS 1)
 +if(nls)
 +  SET(ENABLE_NLS 1)
 +else()
 +  SET(ENABLE_NLS 0)
-+endif()
+ endif()
  
  if(HAVE_WIN32)
- 
diff --git a/sysutils/bareos21-server/files/pkg-deinstall.client.in b/sysutils/bareos21-server/files/pkg-deinstall.client.in
index 3be8c2e4874c..a6b96a17667d 100644
--- a/sysutils/bareos21-server/files/pkg-deinstall.client.in
+++ b/sysutils/bareos21-server/files/pkg-deinstall.client.in
@@ -7,7 +7,7 @@ USER=%%BAREOS_USER%%
 GROUP=%%BAREOS_GROUP%%
 UID=%%BAREOS_UID%%
 GID=%%BAREOS_UID%%
-BACULA_DIR=%%BAREOS_DIR%%
+BAREOS_DIR=%%BAREOS_DIR%%
 
 TMPFILE=/tmp/services-$RANDOM-$$