bareos: clean up some pkglint, add a TODO

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Jul 23 09:46:46 2020 +0200
Changeset:	3603f579c0c24c7e1f80f2cf48bd98c98d94ccb8

Modified Files:
	bareos-clientonly/Makefile
	bareos/Makefile
	bareos/Makefile.common
Added Files:
	bareos/TODO
Removed Files:
	bareos/PLIST.NetBSD

Log Message:
bareos: clean up some pkglint, add a TODO

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

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

diffstat:
 bareos-clientonly/Makefile |  2 ++
 bareos/Makefile            |  7 ++++---
 bareos/Makefile.common     | 25 +++++++++++--------------
 bareos/PLIST.NetBSD        |  2 --
 bareos/TODO                | 13 +++++++++++++
 5 files changed, 30 insertions(+), 19 deletions(-)

diffs:
diff --git a/bareos-clientonly/Makefile b/bareos-clientonly/Makefile
index ccf6511f13..1b3a242d52 100644
--- a/bareos-clientonly/Makefile
+++ b/bareos-clientonly/Makefile
@@ -32,3 +32,5 @@ MAKE_DIRS?=
 MAKE_DIRS+=	${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/bareos/Makefile b/bareos/Makefile
index a78c9e7001..51374f9692 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -14,14 +14,13 @@ USE_TOOLS+=		perl:run
 .include "options.mk"
 .include "Makefile.common"
 
-# XXX keep pkglint happy - already defined in Makefile.common
-BUILD_DEFS+=		VARBASE
+REPLACE_PERL+=		core/src/cats/make_catalog_backup.pl.in
 
 # spool directory
 MAKE_DIRS_PERMS+=	${VARBASE}/${PKG_SYSCONFSUBDIR} \
 			${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
 
-post-install: # should go away once we find out how  to set the run link path in CMakefiles
+post-install: # should go away once we find out how to set the run link path in CMakefiles
 	${LN} -fs ${PKG_SYSCONFSUBDIR}/backends/libbareossd-gentape.so ${DESTDIR:Q}/${BAREOS_LIBDIR:Q}/libbareossd-gentape.so
 
 CONFIG_TEMPLATES!=	${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.common 2>/dev/null | sed -e 's/ /\\ /g'
@@ -37,3 +36,5 @@ MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage
 MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index a7375ecd8a..42c21f0bb2 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -10,7 +10,6 @@ DISTNAME=	bareos-${VERSION}
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG:C/\//-/}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bareos/}
-EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	paul%paulbsd.com@localhost
 HOMEPAGE=	http://www.bareos.org/
@@ -22,21 +21,21 @@ ONLY_FOR_PLATFORM=	NetBSD-*-*
 USE_LANGUAGES+=	c c++
 USE_TOOLS+=	awk
 USE_CMAKE=	yes
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= core/_build
+CMAKE_ARG_PATH=	..
+CONFIGURE_DIRS=	core/_build
 # needs to be able to do compare-and-swap on time_t (cmpxchg8b)
 .if ${MACHINE_ARCH} == "i386"
-CXXFLAGS+=                -march=i586
+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
+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
@@ -109,5 +108,3 @@ CMAKE_ARGS+=	-Dfd-group=${BAREOS_GROUP}
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/bareos/PLIST.NetBSD b/bareos/PLIST.NetBSD
deleted file mode 100644
index 6a8f0d06c8..0000000000
--- a/bareos/PLIST.NetBSD
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD$
-lib/bareos/scripts/chio-changer
diff --git a/bareos/TODO b/bareos/TODO
new file mode 100644
index 0000000000..e0ceedcaaa
--- /dev/null
+++ b/bareos/TODO
@@ -0,0 +1,13 @@
+Fix:
+
+=> Checking for work-directory references in bareos-19.2.8
+ERROR: /usr/pkg/lib/bareos/scripts/bareos-config-lib.sh:        AWK="/scratch/wip/bareos/work/.tools/bin/awk"
+ERROR: /usr/pkg/lib/bareos/scripts/bareos-ctl-dir:      export AWK="/scratch/wip/bareos/work/.tools/bin/awk"
+ERROR: /usr/pkg/lib/bareos/scripts/bareos-ctl-fd:       AWK=/scratch/wip/bareos/work/.tools/bin/awk
+ERROR: /usr/pkg/lib/bareos/scripts/bareos-ctl-sd:       AWK=/scratch/wip/bareos/work/.tools/bin/awk
+ERROR: *** The above files still have references to the build directory.
+ERROR:     This is possibly an error that should be fixed by unwrapping
+ERROR:     the files or adding missing tools to the package makefile!
+*** Error code 1
+
+