Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_169464145329100"
MIME-Version: 1.0
Date: Wed, 13 Sep 2023 21:44:13 +0000
From: "David A. Holland" <dholland@netbsd.org>
Subject: CVS commit: pkgsrc/meta-pkgs
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: dholland@netbsd.org
Message-Id: <20230913214413.E07F9FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_169464145329100
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	dholland
Date:		Wed Sep 13 21:44:13 UTC 2023

Modified Files:
	pkgsrc/meta-pkgs/bulk-large: Makefile
	pkgsrc/meta-pkgs/bulk-medium: Makefile

Log Message:
bulk-{medium,large}: move inclusions of bulk-* to the top, expand explanation.

Requested by gdt.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/meta-pkgs/bulk-large/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/meta-pkgs/bulk-medium/Makefile

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


--_----------=_169464145329100
Content-Disposition: inline
Content-Length: 2602
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/meta-pkgs/bulk-large/Makefile
diff -u pkgsrc/meta-pkgs/bulk-large/Makefile:1.61 pkgsrc/meta-pkgs/bulk-large/Makefile:1.62
--- pkgsrc/meta-pkgs/bulk-large/Makefile:1.61	Sun Sep  3 23:43:27 2023
+++ pkgsrc/meta-pkgs/bulk-large/Makefile	Wed Sep 13 21:44:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2023/09/03 23:43:27 taca Exp $
+# $NetBSD: Makefile,v 1.62 2023/09/13 21:44:13 dholland Exp $
 
 DISTNAME=	bulk-large-20230903
 CATEGORIES=	meta-pkgs
@@ -29,6 +29,16 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 #
 
 #
+# 0. By design bulk-large is supposed to be a superset of both
+# bulk-medium and bulk-small. Depend on them rather than duplicating
+# their listings. (Note that while bulk-medium is also supposed to be a
+# superset of bulk-small, depend on both to avoid needing to think
+# about that in detail.)
+#
+DEPENDS+=	bulk-medium-[0-9]*:../../meta-pkgs/bulk-medium
+DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
+
+#
 # 1. Packages used by a lot of other packages
 #
 DEPENDS+=	taglib-[0-9]*:../../audio/taglib
@@ -141,10 +151,6 @@ DEPENDS+=	modular-xorg-[0-9]*:../../meta
 # want in here.
 #
 
-# We are supposed to be a superset of bulk-medium and bulk-small.
-DEPENDS+=	bulk-medium-[0-9]*:../../meta-pkgs/bulk-medium
-DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
-
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	27 38 39
 .include "../../lang/php/phpversion.mk" # for PHP_PKG_PREFIX

Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.90 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.91
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.90	Mon Sep 11 13:00:57 2023
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile	Wed Sep 13 21:44:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2023/09/11 13:00:57 nia Exp $
+# $NetBSD: Makefile,v 1.91 2023/09/13 21:44:13 dholland Exp $
 
 DISTNAME=	bulk-medium-20230911
 CATEGORIES=	meta-pkgs
@@ -43,6 +43,12 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 .include "../../mk/bsd.prefs.mk"
 
 #
+# 0. By design bulk-medium is supposed to be a superset of bulk-small.
+# Depend on it rather than duplicating its listings.
+#
+DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
+
+#
 # 1. Applications
 #
 DEPENDS+=	cdparanoia-[0-9]*:../../audio/cdparanoia
@@ -222,9 +228,6 @@ DEPENDS+=	${LUA_PKGPREFIX}-stdlib-[0-9]*
 # matter too much.
 #
 
-# We are supposed to be a superset of bulk-small.
-DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
-
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	27 38
 .include "../../lang/lua/luaversion.mk" # for LUA_PKGPREFIX


--_----------=_169464145329100--