CVS commit: pkgsrc/audio/cddbd

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Jan  6 00:06:25 UTC 2024

Modified Files:
        pkgsrc/audio/cddbd: Makefile distinfo
        pkgsrc/audio/cddbd/patches: patch-aa
Removed Files:
        pkgsrc/audio/cddbd: MESSAGE

Log Message:
audio/cddbd: remove references to temporary DESTDIR

Detected by building with CHECK_WRKREF=destdir.

While here, remove MESSAGE as the motd is not essential to this package.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/cddbd/MESSAGE
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/cddbd/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/cddbd/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/cddbd/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/audio/cddbd/Makefile
diff -u pkgsrc/audio/cddbd/Makefile:1.17 pkgsrc/audio/cddbd/Makefile:1.18
--- pkgsrc/audio/cddbd/Makefile:1.17    Tue Sep 11 23:59:28 2012
+++ pkgsrc/audio/cddbd/Makefile Sat Jan  6 00:06:25 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2012/09/11 23:59:28 asau Exp $
+# $NetBSD: Makefile,v 1.18 2024/01/06 00:06:25 rillig Exp $
 #
 
 DISTNAME=      cddbd-1.3.1
 PKGNAME=       cddbd-1.3.1p1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio net
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/cddbd-1.3.1/}
 

Index: pkgsrc/audio/cddbd/distinfo
diff -u pkgsrc/audio/cddbd/distinfo:1.11 pkgsrc/audio/cddbd/distinfo:1.12
--- pkgsrc/audio/cddbd/distinfo:1.11    Tue Oct 26 09:58:50 2021
+++ pkgsrc/audio/cddbd/distinfo Sat Jan  6 00:06:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 09:58:50 nia Exp $
+$NetBSD: distinfo,v 1.12 2024/01/06 00:06:25 rillig Exp $
 
 BLAKE2s (cddbd-1.3.1.tar.gz) = fe85274c17cfde9a5a3c28f8f3f9adda43da78278dba76a9a244bd4724ca99f4
 SHA512 (cddbd-1.3.1.tar.gz) = 73c649d123cc3616c4df7af3ecd47b7a2d431b25d98bca6afd0a7703fdfbc2e9273bcd9d0eba81f8ab486b9f81241af8688e266456657fb56a453da8af21d051
@@ -6,7 +6,7 @@ Size (cddbd-1.3.1.tar.gz) = 93959 bytes
 BLAKE2s (cddbd-1.3.1.patch1.gz) = ac63d508879323ccf9e4a83a4cb0b88c8c334de11d1a8435dc14ab13097ead21
 SHA512 (cddbd-1.3.1.patch1.gz) = c65c7bc8e803ee6355c2c6c14647f10fd5446beb5b3c6e491a73d1ac1fa6470622a9280fe415a5cdb1b47d6168fbe0037c2f1a41ad8d1eeba5c85717bfa8ef21
 Size (cddbd-1.3.1.patch1.gz) = 416 bytes
-SHA1 (patch-aa) = 2402782d37dbe92c1ff8a1a7106b5ca04146292e
+SHA1 (patch-aa) = 731b5112bebbcfa8621396b2192e7220c4b42790
 SHA1 (patch-ab) = defcebf777b5eae603074dc56afe597c456cc211
 SHA1 (patch-ac) = b15d149593298a6859d67ba81ec13a2e653a12cf
 SHA1 (patch-ad) = d9237c9e3e7f5544921d6597440d9785629cb7af

Index: pkgsrc/audio/cddbd/patches/patch-aa
diff -u pkgsrc/audio/cddbd/patches/patch-aa:1.6 pkgsrc/audio/cddbd/patches/patch-aa:1.7
--- pkgsrc/audio/cddbd/patches/patch-aa:1.6     Sun Aug 28 22:30:17 2011
+++ pkgsrc/audio/cddbd/patches/patch-aa Sat Jan  6 00:06:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2011/08/28 22:30:17 dholland Exp $
+$NetBSD: patch-aa,v 1.7 2024/01/06 00:06:25 rillig Exp $
 
 - avoid interactive install
 - configure for pkgsrc
@@ -114,6 +114,36 @@ $NetBSD: patch-aa,v 1.6 2011/08/28 22:30
  WORKDIR=${BASEDIR}
  CDDBDIR=`dirname ${BASEDIR}`
  
+@@ -415,13 +396,13 @@ else
+       logging=none
+ fi
+ 
+-$ECHO "logfile:      ${WORKDIR}/log" >> access
+-$ECHO "motdfile:     ${MOTD}" >> access
+-$ECHO "sitefile:     ${SITE}" >> access
+-$ECHO "lockdir:      ${WORKDIR}/locks" >> access
+-$ECHO "hashdir:      ${WORKDIR}/hash" >> access
+-$ECHO "histfile:     ${WORKDIR}/history" >> access
+-$ECHO "cddbdir:      ${CDDBDIR}" >> access
++$ECHO "logfile:      ${WORKDIR#${DESTDIR}}/log" >> access
++$ECHO "motdfile:     ${MOTD#${DESTDIR}}" >> access
++$ECHO "sitefile:     ${SITE#${DESTDIR}}" >> access
++$ECHO "lockdir:      ${WORKDIR#${DESTDIR}}/locks" >> access
++$ECHO "hashdir:      ${WORKDIR#${DESTDIR}}/hash" >> access
++$ECHO "histfile:     ${WORKDIR#${DESTDIR}}/history" >> access
++$ECHO "cddbdir:      ${CDDBDIR#${DESTDIR}}" >> access
+ 
+ YNDEF=n
+ if getyn "Do you want configure your site as a master database hub"
+@@ -455,7 +436,7 @@ then
+       $ECHO "admin_email:  ${EMAILADDR}" >> access
+       $ECHO "bounce_email: ${EMAILADDR}" >> access
+ else
+-      $ECHO "postdir:      ${CDDBDIR}" >> access
++      $ECHO "postdir:      ${CDDBDIR#${DESTDIR}}" >> access
+       $ECHO "dup_policy:   always" >> access
+ fi
+ 
 @@ -588,7 +569,7 @@ fi
  
  $ECHO "permissions:  default connect nopost noupdate noget" >> access