CVS commit: pkgsrc

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jul  8 21:45:34 UTC 2025

Modified Files:
        pkgsrc/lang/execline: Makefile
        pkgsrc/misc/s6-portable-utils: Makefile
        pkgsrc/net/s6-networking: Makefile
        pkgsrc/net/shibari: Makefile
        pkgsrc/sysutils/s6: Makefile
        pkgsrc/www/tipidee: Makefile

Log Message:
Fix distfile fetching broken in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/execline/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/misc/s6-portable-utils/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/s6-networking/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/shibari/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/s6/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/tipidee/Makefile

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

Modified files:

Index: pkgsrc/lang/execline/Makefile
diff -u pkgsrc/lang/execline/Makefile:1.27 pkgsrc/lang/execline/Makefile:1.28
--- pkgsrc/lang/execline/Makefile:1.27  Tue Jul  8 21:14:28 2025
+++ pkgsrc/lang/execline/Makefile       Tue Jul  8 21:45:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2025/07/08 21:14:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2025/07/08 21:45:34 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               execline-2.9.7.0
@@ -8,7 +8,7 @@ CATEGORIES=             lang shells
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
 GITHUB_PROJECT=                execline
 GITHUB_TAG=            d7eb7a92cd7511f3a3f8bcd6f9652bd53de75cc5
-DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
+DISTFILES=             ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} ${MANPAGES_DIST}
 MANPAGES_DIST=         execline-man-pages-${MANPAGES_VERSION}.tar.gz
 SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
 

Index: pkgsrc/misc/s6-portable-utils/Makefile
diff -u pkgsrc/misc/s6-portable-utils/Makefile:1.20 pkgsrc/misc/s6-portable-utils/Makefile:1.21
--- pkgsrc/misc/s6-portable-utils/Makefile:1.20 Tue Jul  8 21:18:15 2025
+++ pkgsrc/misc/s6-portable-utils/Makefile      Tue Jul  8 21:45:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2025/07/08 21:18:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2025/07/08 21:45:34 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               s6-portable-utils-2.3.1.0
@@ -8,7 +8,7 @@ CATEGORIES=             misc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
 GITHUB_PROJECT=                s6-portable-utils
 GITHUB_TAG=            e2e283b00702579dee22b5ac769c4933d8cc1865
-DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
+DISTFILES=             ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} ${MANPAGES_DIST}
 MANPAGES_DIST=         s6-portable-utils-man-pages-${MANPAGES_VERSION}.tar.gz
 SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
 

Index: pkgsrc/net/s6-networking/Makefile
diff -u pkgsrc/net/s6-networking/Makefile:1.24 pkgsrc/net/s6-networking/Makefile:1.25
--- pkgsrc/net/s6-networking/Makefile:1.24      Tue Jul  8 21:17:06 2025
+++ pkgsrc/net/s6-networking/Makefile   Tue Jul  8 21:45:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2025/07/08 21:17:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2025/07/08 21:45:34 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               s6-networking-2.7.1.0
@@ -8,7 +8,7 @@ CATEGORIES=             net security
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
 GITHUB_PROJECT=                s6-networking
 GITHUB_TAG=            442b0d45ec12a0a383405f923d11f015adf0a25e
-DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
+DISTFILES=             ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} ${MANPAGES_DIST}
 MANPAGES_DIST=         s6-networking-man-pages-${MANPAGES_VERSION}.tar.gz
 SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
 

Index: pkgsrc/net/shibari/Makefile
diff -u pkgsrc/net/shibari/Makefile:1.5 pkgsrc/net/shibari/Makefile:1.6
--- pkgsrc/net/shibari/Makefile:1.5     Tue Jul  8 21:17:45 2025
+++ pkgsrc/net/shibari/Makefile Tue Jul  8 21:45:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2025/07/08 21:17:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2025/07/08 21:45:34 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               shibari-0.0.2.0
@@ -8,7 +8,7 @@ CATEGORIES=             net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
 GITHUB_PROJECT=                shibari
 GITHUB_TAG=            25625e55e308ca7f714f06357d137066fa42fbb1
-DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
+DISTFILES=             ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} ${MANPAGES_DIST}
 MANPAGES_DIST=         shibari-man-pages-${MANPAGES_VERSION}.tar.gz
 SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
 

Index: pkgsrc/sysutils/s6/Makefile
diff -u pkgsrc/sysutils/s6/Makefile:1.29 pkgsrc/sysutils/s6/Makefile:1.30
--- pkgsrc/sysutils/s6/Makefile:1.29    Tue Jul  8 21:15:15 2025
+++ pkgsrc/sysutils/s6/Makefile Tue Jul  8 21:45:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2025/07/08 21:15:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2025/07/08 21:45:34 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               s6-2.13.2.0
@@ -8,7 +8,7 @@ CATEGORIES=             sysutils
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
 GITHUB_PROJECT=                s6
 GITHUB_TAG=            9310225247a826cffb950680dd07929fa6d970a8
-DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
+DISTFILES=             ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} ${MANPAGES_DIST}
 MANPAGES_DIST=         s6-man-pages-${MANPAGES_VERSION}.tar.gz
 SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
 

Index: pkgsrc/www/tipidee/Makefile
diff -u pkgsrc/www/tipidee/Makefile:1.11 pkgsrc/www/tipidee/Makefile:1.12
--- pkgsrc/www/tipidee/Makefile:1.11    Tue Jul  8 21:19:18 2025
+++ pkgsrc/www/tipidee/Makefile Tue Jul  8 21:45:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2025/07/08 21:19:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2025/07/08 21:45:34 schmonz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               tipidee-0.0.6.0
@@ -9,7 +9,7 @@ MASTER_SITES=           ${MASTER_SITE_GITHUB:=ska
 GITHUB_PROJECT=                tipidee
 GITHUB_TAG=            9acee22dd82472bf408204a066476334c3568e87
 MANPAGES_DIST=         tipidee-man-pages-${MANPAGES_VERSION}.tar.gz
-DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
+DISTFILES=             ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} ${MANPAGES_DIST}
 SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
 
 MAINTAINER=            schmonz%NetBSD.org@localhost