clean up for pkglint remove unnecessary distinfo file reduce number of absolute paths

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: clean up for pkglint remove unnecessary distinfo file reduce number of absolute paths
From: Frank Kardel <kardel%netbsd.org@localhost>
Date: Wed, 22 Jul 2020 12:15:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Frank Kardel <kardel%netbsd.org@localhost>
Pushed By:	kardel
Date:		Wed Jul 22 14:15:42 2020 +0200
Changeset:	7ba52e6b1397b8e4e1f495bb2522b4224cfa92c4

Modified Files:
	bareos-clientonly/Makefile
	bareos/Makefile
	bareos/Makefile.common
	bareos/distinfo
	bareos/options.mk
	bareos/patches/patch-core_CMakeLists.txt
	bareos/patches/patch-core_platforms_netbsd_chio-changer
	bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
	bareos/patches/patch-core_src_filed_accurate__lmdb.cc
Removed Files:
	bareos-clientonly/distinfo

Log Message:
clean up for pkglint
remove unnecessary distinfo file
reduce number of absolute paths

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ba52e6b1397b8e4e1f495bb2522b4224cfa92c4

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

diffstat:
 bareos-clientonly/Makefile                         |  1 +
 bareos-clientonly/distinfo                         | 42 ----------------------
 bareos/Makefile                                    | 10 ------
 bareos/Makefile.common                             | 10 +++++-
 bareos/distinfo                                    |  8 ++---
 bareos/options.mk                                  |  5 +--
 bareos/patches/patch-core_CMakeLists.txt           |  6 ++--
 .../patch-core_platforms_netbsd_chio-changer       | 12 +++----
 ...patch-core_src_cats_make__catalog__backup.pl.in |  8 +----
 .../patches/patch-core_src_filed_accurate__lmdb.cc |  3 ++
 10 files changed, 28 insertions(+), 77 deletions(-)

diffs:
diff --git a/bareos-clientonly/Makefile b/bareos-clientonly/Makefile
index a147731c1f..238e79d3de 100644
--- a/bareos-clientonly/Makefile
+++ b/bareos-clientonly/Makefile
@@ -8,6 +8,7 @@ CONFLICTS=		bareos-[0-9]* bacula-[0-9]* bacula-clientonly-[0-9]*
 
 PATCHDIR=		${.CURDIR}/../bareos/patches
 FILESDIR=		${.CURDIR}/../bareos/files
+DISTINFO_FILE=		${.CURDIR}/../bareos/distinfo
 
 PLIST_SRC=		PLIST.client
 
diff --git a/bareos-clientonly/distinfo b/bareos-clientonly/distinfo
deleted file mode 100644
index 93951a0d9c..0000000000
--- a/bareos-clientonly/distinfo
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-SHA1 (bareos-19.2.8.zip) = a050236fa07f40368e47fe58d45ec953d1311d08
-RMD160 (bareos-19.2.8.zip) = 76f9580dd4b4633ca6cef174836002bfbb8fb404
-SHA512 (bareos-19.2.8.zip) = 2568e048b7844ae5bc6f39511f22b858fe5dd204762ea9687c2ee0ba7652eb9e2c633295dc2da9504cded59cd9008aced49b43d560baf0fb6881ab661c517044
-Size (bareos-19.2.8.zip) = 16672809 bytes
-SHA1 (patch-core_CMakeLists.txt) = a08c50bd2449120cb2c4161aa39a842eab0c230c
-SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = 8f2a88768acdbe9adf94939ae1dabd3edf40144b
-SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = eb33f59f616a5d265a6371dcc028a3031b5dbab5
-SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = a0ff2802d0583fca2685250bd4a5e0c8259837b2
-SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = aafa1dd9652ae8cc57414a405f03247242100ba9
-SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = dd6a54bac7e4b51e3f564f83cc7f78a8826a0d8e
-SHA1 (patch-core_platforms_netbsd_chio-changer) = 123f2fd2ec0cddcf4339cf7b0bc28a9f00ba9a06
-SHA1 (patch-core_scripts_CMakeLists.txt) = 421198b1bc6cf0570051c018bf1a22024904412a
-SHA1 (patch-core_src_CMakeLists.txt) = 3db708e8ece43b1087773470a19ea3362aec3d79
-SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = 0753f31201df7406bf95ef95d420f66f27f8f0e8
-SHA1 (patch-core_src_cats_postgresql__queries.inc) = d255a93a039d671d9dad7b7b096dfff97095aa6e
-SHA1 (patch-core_src_dird_admin.cc) = 0e361de94ff0763c8ac17f32ccb0115c998a7ec2
-SHA1 (patch-core_src_dird_archive.cc) = fa383d6edb8aec942b6c44a35acf50d5ebe5c888
-SHA1 (patch-core_src_dird_authenticate__console.cc) = c5339303583edda8fc9d0c7e741aa6e6b8fc4306
-SHA1 (patch-core_src_dird_backup.cc) = a416a9342d695aaaf438af87113e34a1c4016ebd
-SHA1 (patch-core_src_dird_consolidate.cc) = 934a87e8e799585c4a5bf53c30b0e670b01f3372
-SHA1 (patch-core_src_dird_dird__conf.cc) = b2d619d164acfa8949e8d10d45972dbce7f3b258
-SHA1 (patch-core_src_dird_migrate.cc) = 694f86a15f532f9c13c387f1617be79342ba6e84
-SHA1 (patch-core_src_dird_restore.cc) = ab2243457a788b963ab2dfc6b03046539ee5d06a
-SHA1 (patch-core_src_dird_verify.cc) = b4f346a62358bffc09d5247d1636e352a2318eb0
-SHA1 (patch-core_src_filed_accurate__lmdb.cc) = e373e5997a2fd659f63e3d4cb7b5ce4c43aa5792
-SHA1 (patch-core_src_findlib_acl.cc) = 79d47ae5f79e4e2629a0330787cc45b8347a42e2
-SHA1 (patch-core_src_findlib_find__one.cc) = 50eb6d289b7b2a7b33ee5828db31d03169833d9c
-SHA1 (patch-core_src_lib_mem__pool.cc) = 16b5adc4a5b2b4fd542b4d330e03283b8994a4a7
-SHA1 (patch-core_src_lib_scsi__lli.cc) = 09aa887d71009baa2ce2203c46c88a89097d6546
-SHA1 (patch-core_src_lib_version.c) = edfd88aed983ea3ce1ead6846707b5625ad5fc51
-SHA1 (patch-core_src_lmdb_mdb.c) = 70c76d7ecf610edb47afbb91f3c4d500d85583fe
-SHA1 (patch-core_src_plugins_stored_scsicrypto-sd.cc) = d59125fd445536e220140acf16e43605a4a98e9c
-SHA1 (patch-core_src_plugins_stored_scsitapealert-sd.cc) = 92ef75fbddb587957ec972480a87fe0f5b110111
-SHA1 (patch-core_src_stored_acquire.cc) = c239b2a4a3769b3f99315fae5cc5ee564454a1ad
-SHA1 (patch-core_src_stored_bscan.cc) = 5dfcf88e8049c7717f947349fa127495007b65c6
-SHA1 (patch-core_src_stored_btape.cc) = b3e368e049cec3e9a0c86d9ce29489b53592ff33
-SHA1 (patch-core_src_stored_device.cc) = 34b8069d53d67f90dc43ff44893a990aef40e5c5
-SHA1 (patch-core_src_stored_dir__cmd.cc) = 5c4cc412817a8d8d9eb51b563dbd37bc3f7a7aea
-SHA1 (patch-core_src_stored_label.cc) = 669164289bcb7a2d27e8c63db32d6bf84a3be97e
-SHA1 (patch-core_src_stored_mount.cc) = 7d8b822449068b1f6cd3f411535bbbab4fefba0a
diff --git a/bareos/Makefile b/bareos/Makefile
index 56ecdd530c..a78c9e7001 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -11,16 +11,6 @@ RCD_SCRIPTS=		bareos bareos-dir bareos-sd bareos-fd
 # For make_catalog_backup.pl.in.
 USE_TOOLS+=		perl:run
 
-REPLACE_PERL?=
-REPLACE_PERL+=		core/src/cats/make_catalog_backup.pl.in
-
-SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		pre-configure
-SUBST_MESSAGE.fix-paths=	Fixing paths.
-SUBST_FILES.fix-paths?=
-SUBST_FILES.fix-paths+=	
-SUBST_VARS.fix-paths=		PREFIX
-
 .include "options.mk"
 .include "Makefile.common"
 
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index c727fda574..7922b2bc07 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -22,7 +22,6 @@ ONLY_FOR_PLATFORM=	NetBSD-*-*
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	awk
 USE_CMAKE=	yes
-USE_LANGUAGES=  c c++
 CMAKE_ARG_PATH= ..
 CONFIGURE_DIRS= core/_build
 # needs to be able to do compare-and-swap on time_t (cmpxchg8b)
@@ -30,6 +29,15 @@ CONFIGURE_DIRS= core/_build
 CXXFLAGS+=                -march=i586
 .endif
 
+SUBST_CLASSES+=         paths
+SUBST_STAGE.paths=      pre-configure
+SUBST_MESSAGE.paths=    Fixing absolute paths.
+SUBST_FILES.paths=      core/src/cats/make_catalog_backup.pl.in
+SUBST_FILES.paths+=     core/CMakeLists.txt
+SUBST_SED.paths=        -e 's,"/usr/local,"${PREFIX},g'
+SUBST_SED.paths+=       -e 's,"/var/log,"${VARBASE}/log,g'
+SUBST_VARS.paths=       LOCALBASE PREFIX PKGVERSION
+
 pre-configure:
 	${MKDIR} ${WRKSRC}/core/_build
 
diff --git a/bareos/distinfo b/bareos/distinfo
index 93951a0d9c..a999c48e98 100644
--- a/bareos/distinfo
+++ b/bareos/distinfo
@@ -4,16 +4,16 @@ SHA1 (bareos-19.2.8.zip) = a050236fa07f40368e47fe58d45ec953d1311d08
 RMD160 (bareos-19.2.8.zip) = 76f9580dd4b4633ca6cef174836002bfbb8fb404
 SHA512 (bareos-19.2.8.zip) = 2568e048b7844ae5bc6f39511f22b858fe5dd204762ea9687c2ee0ba7652eb9e2c633295dc2da9504cded59cd9008aced49b43d560baf0fb6881ab661c517044
 Size (bareos-19.2.8.zip) = 16672809 bytes
-SHA1 (patch-core_CMakeLists.txt) = a08c50bd2449120cb2c4161aa39a842eab0c230c
+SHA1 (patch-core_CMakeLists.txt) = 17524dd14c665f00a8911589b52f930ec55e1e0e
 SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = 8f2a88768acdbe9adf94939ae1dabd3edf40144b
 SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = eb33f59f616a5d265a6371dcc028a3031b5dbab5
 SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = a0ff2802d0583fca2685250bd4a5e0c8259837b2
 SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = aafa1dd9652ae8cc57414a405f03247242100ba9
 SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = dd6a54bac7e4b51e3f564f83cc7f78a8826a0d8e
-SHA1 (patch-core_platforms_netbsd_chio-changer) = 123f2fd2ec0cddcf4339cf7b0bc28a9f00ba9a06
+SHA1 (patch-core_platforms_netbsd_chio-changer) = 4bc4d7382db8e41bd1a10852e429e8f4e16e9fe4
 SHA1 (patch-core_scripts_CMakeLists.txt) = 421198b1bc6cf0570051c018bf1a22024904412a
 SHA1 (patch-core_src_CMakeLists.txt) = 3db708e8ece43b1087773470a19ea3362aec3d79
-SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = 0753f31201df7406bf95ef95d420f66f27f8f0e8
+SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = 85f235ce37349ea14c7bf06db3c2fc2534374655
 SHA1 (patch-core_src_cats_postgresql__queries.inc) = d255a93a039d671d9dad7b7b096dfff97095aa6e
 SHA1 (patch-core_src_dird_admin.cc) = 0e361de94ff0763c8ac17f32ccb0115c998a7ec2
 SHA1 (patch-core_src_dird_archive.cc) = fa383d6edb8aec942b6c44a35acf50d5ebe5c888
@@ -24,7 +24,7 @@ SHA1 (patch-core_src_dird_dird__conf.cc) = b2d619d164acfa8949e8d10d45972dbce7f3b
 SHA1 (patch-core_src_dird_migrate.cc) = 694f86a15f532f9c13c387f1617be79342ba6e84
 SHA1 (patch-core_src_dird_restore.cc) = ab2243457a788b963ab2dfc6b03046539ee5d06a
 SHA1 (patch-core_src_dird_verify.cc) = b4f346a62358bffc09d5247d1636e352a2318eb0
-SHA1 (patch-core_src_filed_accurate__lmdb.cc) = e373e5997a2fd659f63e3d4cb7b5ce4c43aa5792
+SHA1 (patch-core_src_filed_accurate__lmdb.cc) = a3436251902b16a2ed4617a750a36a8a70284fee
 SHA1 (patch-core_src_findlib_acl.cc) = 79d47ae5f79e4e2629a0330787cc45b8347a42e2
 SHA1 (patch-core_src_findlib_find__one.cc) = 50eb6d289b7b2a7b33ee5828db31d03169833d9c
 SHA1 (patch-core_src_lib_mem__pool.cc) = 16b5adc4a5b2b4fd542b4d330e03283b8994a4a7
diff --git a/bareos/options.mk b/bareos/options.mk
index 0dad583a51..0d7a73191d 100644
--- a/bareos/options.mk
+++ b/bareos/options.mk
@@ -4,21 +4,18 @@ PKG_OPTIONS_VAR=		PKG_OPTIONS.bareos
 PKG_SUPPORTED_OPTIONS=		scsi-crypto
 PKG_OPTIONS_REQUIRED_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	catalog-sqlite3 catalog-pgsql catalog-mysql
-PKG_SUGGESTED_OPTIONS=		catalog-pgsql #scsi-crypto
+PKG_SUGGESTED_OPTIONS=		catalog-pgsql
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcatalog-sqlite3)
 .  include "../../databases/sqlite3/buildlink3.mk"
-DBIMPL=sqllite3
 CMAKE_ARGS+=		-Dsqlite3=yes
 .elif !empty(PKG_OPTIONS:Mcatalog-pgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
-DBIMPL=postgresql
 CMAKE_ARGS+=		-Dpostgresql=yes
 .elif !empty(PKG_OPTIONS:Mcatalog-mysql)
 .  include "../../mk/mysql.buildlink3.mk"
-DBIMPL=mysql
 CMAKE_ARGS+=		-Dmysql=yes
 .endif
 
diff --git a/bareos/patches/patch-core_CMakeLists.txt b/bareos/patches/patch-core_CMakeLists.txt
index 0cb4b253ce..92e740341b 100644
--- a/bareos/patches/patch-core_CMakeLists.txt
+++ b/bareos/patches/patch-core_CMakeLists.txt
@@ -2,7 +2,7 @@ $NetBSD$
 
 	Setup NetBSD parameters
 	Due to current lack of XDR quad marshalling NDMP
-	need to be disabled.
+	needs to be disabled.
 
 --- core/CMakeLists.txt.orig	2020-04-16 08:31:41.000000000 +0000
 +++ core/CMakeLists.txt
@@ -14,8 +14,8 @@ $NetBSD$
 +   set(HAVE_NETBSD_OS 1)
 +   set(ndmp 0)
 +   set(PSCMD "ps -ax -o pid,command")
-+   include_directories(/usr/pkg/include)
-+   link_directories(/usr/pkg/lib)
++   include_directories(@PREFIX@/include)
++   link_directories(@PREFIX@/lib)
 +   link_libraries(intl)
 +endif()
 +
diff --git a/bareos/patches/patch-core_platforms_netbsd_chio-changer b/bareos/patches/patch-core_platforms_netbsd_chio-changer
index a9bd10c700..b850176239 100644
--- a/bareos/patches/patch-core_platforms_netbsd_chio-changer
+++ b/bareos/patches/patch-core_platforms_netbsd_chio-changer
@@ -2,19 +2,19 @@ $NetBSD$
 
 	NetBSD changer script using NetBSD chio command
 
---- core/platforms/netbsd/chio-changer.orig	2019-02-08 15:17:46.308846761 +0000
+--- core/platforms/netbsd/chio-changer.orig	2020-07-22 11:05:39.078612642 +0000
 +++ core/platforms/netbsd/chio-changer
 @@ -0,0 +1,134 @@
 +#!/bin/sh
 +#
-+# Bacula interface to chio autoloader
++# Bareos interface to chio autoloader
 +#
 +#  If you set in your Device resource
 +#
 +#  Changer Command = "path-to-this-script/chio-changer %c %o %S %a %d"
 +#    you will have the following input to this script:
 +#
-+#  So Bacula will always call with all the following arguments, even though
++#  So Bareos will always call with all the following arguments, even though
 +#    in come cases, not all are used.
 +#
 +#  chio-changer "changer-device" "command" "slot" "archive-device" "drive-index"
@@ -22,10 +22,10 @@ $NetBSD$
 +#
 +#  N.B. If you change the script, take care to return either 
 +#   the chio exit code or a 0. If the script exits with a non-zero
-+#   exit code, Bacula will assume the request failed.
++#   exit code, Bareos will assume the request failed.
 +
-+CHIO=/bin/chio
-+AWK=/usr/bin/awk
++CHIO=chio
++AWK=awk
 +
 +# check parameter count on commandline
 +check_parm_count() {
diff --git a/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in b/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
index 4e67dd8616..292ccc54fd 100644
--- a/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
+++ b/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
@@ -4,17 +4,11 @@ $NetBSD$
 
 --- core/src/cats/make_catalog_backup.pl.in.orig	2019-01-31 11:39:26.000000000 +0000
 +++ core/src/cats/make_catalog_backup.pl.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/pkg/bin/perl
- use strict;
- 
- =head1 SCRIPT
 @@ -36,6 +36,7 @@ use strict;
  my $cat = shift or die "Usage: $0 catalogname";
  my $dir_conf='@sbindir@/bareos-dbcheck -B -c @confdir@';
  my $wd = "@working_dir@";
-+$ENV{PATH} = "/usr/pkg/bin:/usr/pkg/sbin:" . $ENV{PATH};
++$ENV{PATH} = "@PREFIX@/bin:@PREFIX@/sbin:" . $ENV{PATH};
  
  sub dump_sqlite3
  {
diff --git a/bareos/patches/patch-core_src_filed_accurate__lmdb.cc b/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
index a82eda22c0..fce7bcb532 100644
--- a/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
+++ b/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
@@ -1,5 +1,8 @@
 $NetBSD$
 
+	avoid uninitialized member crash.
+	lmdb not verified to be working correctly though.
+
 --- core/src/filed/accurate_lmdb.cc.orig	2020-07-17 12:18:09.949358135 +0000
 +++ core/src/filed/accurate_lmdb.cc
 @@ -45,6 +45,7 @@ static int debuglevel = 100;
Prev by Date: mackerel-agent-plugin: update to v0.61.0
Next by Date: samtools: Clean up Makefile
Previous by Thread: mackerel-agent-plugin: update to v0.61.0
Next by Thread: samtools: Clean up Makefile
Indexes:
Home | Main Index | Thread Index | Old Index