cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There's no actual reason to accept flavors with non-lowercase spelling,

Browse Source 
so kill the misfeature, as agreed by mostly everyone.
This commit is contained in:
espie 2011-10-03 15:46:33 +00:00
parent c057cd387b
commit 398f738da8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/mk/bsd.port.arch.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.port.arch.mk,v 1.4 2011/10/03 08:35:36 espie Exp $
# $OpenBSD: bsd.port.arch.mk,v 1.5 2011/10/03 15:46:33 espie Exp $
#
# ex:ts=4 sw=4 filetype=make:
#
@ -57,7 +57,7 @@ SUBPACKAGE ?= -main
.if defined(FLAVOR)
. for _S in ${MULTI_PACKAGES}
. for _T in ${_S:S/^-/no_/}
. if ${FLAVOR:L:M${_T}}
. if ${FLAVOR:M${_T}}
MULTI_PACKAGES := ${MULTI_PACKAGES:N${_S}}
. endif
. endfor

14
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1113 2011/09/30 05:35:52 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1114 2011/10/03 15:46:33 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -399,7 +399,7 @@ FLAVORS ?=
PSEUDO_FLAVORS ?=
FLAVORS += ${PSEUDO_FLAVORS}
.if !empty(FLAVORS:L:Mregress) && empty(FLAVOR:L:Mregress)
.if !empty(FLAVORS:Mregress) && empty(FLAVOR:Mregress)
NO_REGRESS = Yes
.endif
@ -429,13 +429,13 @@ _README_DIR = ${LOCALBASE}/share/doc/pkg-readmes
PSEUDO_FLAVOR =
# (applies only to PLIST for now)
.if !empty(FLAVORS)
. for _i in ${FLAVORS:L}
. if empty(FLAVOR:L:M${_i})
. for _i in ${FLAVORS}
. if empty(FLAVOR:M${_i})
_PKG_ARGS += -D${_i}=0
. else
_FLAVOR_EXT2 := ${_FLAVOR_EXT2}-${_i}
BUILD_PKGPATH := ${BUILD_PKGPATH},${_i}
. if empty(PSEUDO_FLAVORS:L:M${_i})
. if empty(PSEUDO_FLAVORS:M${_i})
FLAVOR_EXT := ${FLAVOR_EXT}-${_i}
BASE_PKGPATH := ${BASE_PKGPATH},${_i}
. else
@ -460,8 +460,8 @@ ERRORS += "Fatal: flavor should never start with a digit"
.if !empty(FLAVOR)
. if !empty(FLAVORS)
. for _i in ${FLAVOR:L}
. if empty(FLAVORS:L:M${_i})
. for _i in ${FLAVOR}
. if empty(FLAVORS:M${_i})
ERRORS += "Fatal: Unknown flavor: ${_i}"
ERRORS += " (Possible flavors are: ${FLAVORS})."
. endif