From: Marc Espie <marc.espie.openbsd@gmail.com>
Subject: patch: fix status of MULTI_PACKAGES variables
To: ports@openbsd.org
Date: Mon, 22 Jun 2026 16:28:50 +0200

First, HOMEPAGE is supposed to be indexed.
This will fix sqlports for the few ports that have multiple HOMEPAGE
for their subpackages.

Index: bsd.port.mk
===================================================================
RCS file: /build/data/openbsd/cvs/ports/infrastructure/mk/bsd.port.mk,v
diff -u -p -r1.1651 bsd.port.mk
--- bsd.port.mk	18 May 2026 23:38:23 -0000	1.1651
+++ bsd.port.mk	22 Jun 2026 14:25:17 -0000
@@ -1332,8 +1332,9 @@ _ALL_VARIABLES += ${_ALL_DISTFILES_VARIA
 _ALL_VARIABLES += NO_TEST TEST_IS_INTERACTIVE TEST_DEPENDS
 .endif
 .if ${DPB:L:Mall} || ${DPB:L:Mroach}
-_ALL_VARIABLES += DISTNAME HOMEPAGE PORTROACH PORTROACH_COMMENT MAINTAINER
+_ALL_VARIABLES += DISTNAME PORTROACH PORTROACH_COMMENT MAINTAINER
 _ALL_VARIABLES += ROACH_URL ROACH_SITES
+_ALL_VARIABLES_INDEXED += HOMEPAGE
 .endif
 .if ${DPB:L:Mall}
 _ALL_VARIABLES += BROKEN COMES_WITH \


Second, mention HOMEPAGE and SUBST_CMD in the full list of indexed
variables, and sort them alphabetically, as the current order is
fairly random

Index: bsd.port.mk.5
===================================================================
RCS file: /build/data/openbsd/cvs/src/share/man/man5/bsd.port.mk.5,v
diff -u -p -r1.655 bsd.port.mk.5
--- bsd.port.mk.5	18 May 2026 13:21:17 -0000	1.655
+++ bsd.port.mk.5	21 Jun 2026 11:57:20 -0000
@@ -4121,31 +4121,33 @@ In the preceding example, the packing-li
 must be in PLIST-lib.
 .Pp
 The following variables are subpackage dependent:
+.Ev CATEGORIES ,
 .Ev COMMENT ,
-.Ev PKG_ARCH ,
-.Ev PERMIT_PACKAGE ,
-.Ev PKGFILE ,
-.Ev PKGNAME ,
-.Ev PKGSTEM ,
-.Ev FULLPKGNAME ,
-.Ev REVISION ,
+.Ev DESCR ,
 .Ev EPOCH ,
+.Ev FULLPKGNAME ,
 .Ev FULLPKGPATH ,
-.Ev RUN_DEPENDS ,
-.Ev WANTLIB ,
-.Ev LIB_DEPENDS ,
+.Ev HOMEPAGE ,
 .Ev IGNORE ,
-.Ev ONLY_FOR_ARCHS ,
+.Ev LIB_DEPENDS ,
+.Ev MESSAGE ,
 .Ev NOT_FOR_ARCHS ,
+.Ev ONLY_FOR_ARCHS ,
+.Ev PERMIT_PACKAGE ,
+.Ev PKGFILE ,
+.Ev PKGNAME ,
+.Ev PKGSPEC ,
+.Ev PKGSTEM ,
+.Ev PKG_ARCH ,
 .Ev PKG_ARGS ,
-.Ev PREFIX ,
-.Ev CATEGORIES ,
-.Ev MESSAGE ,
-.Ev UNMESSAGE ,
-.Ev DESCR ,
 .Ev PLIST ,
+.Ev PREFIX ,
+.Ev REVISION ,
+.Ev RUN_DEPENDS ,
 .Ev STATIC_PLIST ,
-.Ev PKGSPEC .
+.Ev SUBST_CMD ,
+.Ev UNMESSAGE ,
+.Ev WANTLIB .
 .Pp
 The usual non-MULTI_PACKAGES variables are simply used as default values
 for all subpackages.