CVS commit: pkgsrc/sysutils/cdbkup

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 22 12:08:50 UTC 2026

Modified Files:
        pkgsrc/sysutils/cdbkup: Makefile PLIST distinfo
        pkgsrc/sysutils/cdbkup/patches: patch-aa
Added Files:
        pkgsrc/sysutils/cdbkup/patches: patch-Makefile.in

Log Message:
cdbkup: fix destdir installation as non-root.

Remove @exec/@unexec from PLIST.

Fix pkglint while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/cdbkup/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/cdbkup/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/cdbkup/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/cdbkup/patches/patch-Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/cdbkup/patches/patch-aa

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

Modified files:

Index: pkgsrc/sysutils/cdbkup/Makefile
diff -u pkgsrc/sysutils/cdbkup/Makefile:1.33 pkgsrc/sysutils/cdbkup/Makefile:1.34
--- pkgsrc/sysutils/cdbkup/Makefile:1.33        Tue Jun 28 11:35:54 2022
+++ pkgsrc/sysutils/cdbkup/Makefile     Tue Sep 22 12:08:50 2026
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2022/06/28 11:35:54 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2026/09/22 12:08:50 wiz Exp $
 
 DISTNAME=              cdbkup-1.0
-PKGREVISION=           17
+PKGREVISION=           18
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=cdbkup/}
 
 MAINTAINER=            mishka%NetBSD.org@localhost
 HOMEPAGE=              https://sourceforge.net/projects/cdbkup/
 COMMENT=               CD-R(W) backup/restore system
+LICENSE=               gnu-gpl-v2
 
 DEPENDS+=              {cdrtools,cdrtools-ossdvd}>=1.10:../../sysutils/cdrtools
 
@@ -18,6 +19,10 @@ CONFIGURE_ENV+=              DATE=${TOOLS_DATE:Q}
 CONFIGURE_ENV+=                GNUTAR=${TOOLS_GTAR:Q}
 CONFIGURE_ENV+=                ac_cv_path_BZIP=${TOOLS_PATH.bzip2:Q}
 CONFIGURE_ENV+=                ac_cv_path_GZIP=${TOOLS_PATH.gzip:Q}
+CONFIGURE_ENV.NetBSD+= MOUNT=/sbin/mount UMOUNT=/sbin/umount
+
+CONFIGURE_ARGS+=       --with-snardir=${CDBKUP_SNARDIR:Q} \
+                       --with-dumpgrp=${CDBKUP_DUMPGRP:Q}
 
 # Actually a bash script, would need REPLACE_BASH for running
 CHECK_PORTABILITY_SKIP+=       test/test-suite.in
@@ -25,19 +30,13 @@ CHECK_PORTABILITY_SKIP+=    test/test-suite
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-CDBKUP_SNARDIR?=       /var/${PKGBASE}
+CDBKUP_SNARDIR?=       ${PREFIX}/var/${PKGBASE}
 CDBKUP_DUMPGRP?=       sys
 .else
-CDBKUP_SNARDIR?=       /var/db/${PKGBASE}
+CDBKUP_SNARDIR?=       ${PREFIX}/var/db/${PKGBASE}
 CDBKUP_DUMPGRP?=       operator
 .endif
 
-CONFIGURE_ENV.NetBSD+= MOUNT=/sbin/mount UMOUNT=/sbin/umount
-
-CONFIGURE_ARGS+=       --with-snardir=${CDBKUP_SNARDIR:Q} \
-                       --with-dumpgrp=${CDBKUP_DUMPGRP:Q}
-PLIST_SUBST+=          CDBKUP_SNARDIR=${CDBKUP_SNARDIR:Q} \
-                       CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP:Q} \
-                       INSTALL=${INSTALL:Q} RMDIR=${RMDIR:Q} TRUE=${TRUE:Q}
+OWN_DIRS_PERMS+=       ${CDBKUP_SNARDIR} ${REAL_ROOT_USER} ${CDBKUP_DUMPGRP} 750
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/cdbkup/PLIST
diff -u pkgsrc/sysutils/cdbkup/PLIST:1.2 pkgsrc/sysutils/cdbkup/PLIST:1.3
--- pkgsrc/sysutils/cdbkup/PLIST:1.2    Sun Jun 14 18:16:02 2009
+++ pkgsrc/sysutils/cdbkup/PLIST        Tue Sep 22 12:08:50 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/09/22 12:08:50 wiz Exp $
 man/man1/cdappend.1
 man/man1/cdbkup.1
 man/man1/cdcat.1
@@ -12,5 +12,3 @@ sbin/cdsplit
 share/doc/cdbkup/COMPLIANCE
 share/doc/cdbkup/README
 share/doc/cdbkup/TODO
-@exec ${INSTALL} -d -m 750 -o root -g ${CDBKUP_DUMPGRP} ${CDBKUP_SNARDIR}
-@unexec ${RMDIR} ${CDBKUP_SNARDIR} 2>/dev/null || ${TRUE}

Index: pkgsrc/sysutils/cdbkup/distinfo
diff -u pkgsrc/sysutils/cdbkup/distinfo:1.5 pkgsrc/sysutils/cdbkup/distinfo:1.6
--- pkgsrc/sysutils/cdbkup/distinfo:1.5 Tue Oct 26 11:19:24 2021
+++ pkgsrc/sysutils/cdbkup/distinfo     Tue Sep 22 12:08:50 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:19:24 nia Exp $
+$NetBSD: distinfo,v 1.6 2026/09/22 12:08:50 wiz Exp $
 
 BLAKE2s (cdbkup-1.0.tar.gz) = 7b35d905616c30ff34c0701363f7247ea8ae348c87561b83a90e17f97b4de91c
 SHA512 (cdbkup-1.0.tar.gz) = f95a7540704c16a01e65397fb63b5b97011685c62d3c9a9b2e303470fed5a31f909cb700035466e89ccd181401fd3c19d427fa32c40ece1ba77c1dba9322969d
 Size (cdbkup-1.0.tar.gz) = 38252 bytes
-SHA1 (patch-aa) = 96084141e52169a1759891d12f77ec6111c4ee78
+SHA1 (patch-Makefile.in) = 72da76dd567e5319f89616df0eb01f89108b2dfd
+SHA1 (patch-aa) = de71a81b7f0bb8ea5a7c5f243665c5907bd0ad2d

Index: pkgsrc/sysutils/cdbkup/patches/patch-aa
diff -u pkgsrc/sysutils/cdbkup/patches/patch-aa:1.1.1.1 pkgsrc/sysutils/cdbkup/patches/patch-aa:1.2
--- pkgsrc/sysutils/cdbkup/patches/patch-aa:1.1.1.1     Thu Jul 11 11:37:52 2002
+++ pkgsrc/sysutils/cdbkup/patches/patch-aa     Tue Sep 22 12:08:50 2026
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/11 11:37:52 tron Exp $
+$NetBSD: patch-aa,v 1.2 2026/09/22 12:08:50 wiz Exp $
+
+Use correct file system name.
+
 --- src/cdcat.in       Wed Feb 13 01:20:57 2002
 +++ src/cdcat.in       Tue Feb 19 22:09:50 2002
 @@ -98,7 +98,7 @@

Added files:

Index: pkgsrc/sysutils/cdbkup/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/sysutils/cdbkup/patches/patch-Makefile.in:1.1
--- /dev/null   Tue Sep 22 12:08:50 2026
+++ pkgsrc/sysutils/cdbkup/patches/patch-Makefile.in    Tue Sep 22 12:08:50 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.in,v 1.1 2026/09/22 12:08:50 wiz Exp $
+
+Let pkgsrc create the directory.
+
+--- Makefile.in.orig   2026-09-22 12:05:07.949791870 +0000
++++ Makefile.in
+@@ -20,7 +20,6 @@ install:
+               make $@ );\
+       done
+       @echo "-> Creating dirs & installing misc documentation."
+-      $(INSTALL) -d -o $(DUMPER) -g $(DUMPGRP) -m 700 $(SNARDIR)
+       $(INSTALL) -d -m 755 $(DOCDIR)
+       $(INSTALL) -m 644 README $(DOCDIR)
+       $(INSTALL) -m 644 TODO $(DOCDIR)