git: 9926898a0c05 - main - security/krb5*: Flavorize with default and ldap flavors

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Cy Schubert <cy_at_FreeBSD.org>
Date: Tue, 13 Feb 2024 18:48:32 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9926898a0c052d79aaa08708e3249fc39e633174

commit 9926898a0c052d79aaa08708e3249fc39e633174
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-02-13 00:33:16 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-02-13 18:47:53 +0000

    security/krb5*: Flavorize with default and ldap flavors
    
    This provides a binary package to users who require MIT KRB5 with LDAP
    support. This patch does not change the current, now default, package
    name.
    
    PR:             277015
---
 security/krb5-119/Makefile   | 11 ++++++++++-
 security/krb5-120/Makefile   | 11 ++++++++++-
 security/krb5-121/Makefile   | 11 ++++++++++-
 security/krb5-devel/Makefile |  8 +++++++-
 security/krb5/Makefile       |  2 ++
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile
index af529b667c19..6e2d91a8a348 100644
--- a/security/krb5-119/Makefile
+++ b/security/krb5-119/Makefile
@@ -4,8 +4,11 @@ PORTREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 .if !defined(MASTERDIR)
-PKGNAMESUFFIX=		-119
+PKGNAME_X=		-${FLAVOR:S/default//}-119
+.else
+PKGNAME_X=		-${FLAVOR:S/default//}
 .endif
+PKGNAMESUFFIX=		${PKGNAME_X:S/--/-/:C/-$//}
 
 DEPRECATED=		Desupported by MIT following 1.21
 EXPIRATION_DATE=	2024-06-06
@@ -44,6 +47,8 @@ CPE_VENDOR=		mit
 CPE_VERSION=		5-${PORTVERSION}
 CPE_PRODUCT=		kerberos
 
+FLAVORS=		default ldap
+
 OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
 OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
 OPTIONS_RADIO=		CMD_LINE_EDITING
@@ -69,6 +74,10 @@ LIBEDIT_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_DESC=	Use libedit in FreeBSD base
 
+.if ${FLAVOR:U} == ldap
+OPTIONS_DEFAULT+=	LDAP LMDB
+.endif
+
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
 .endif
diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile
index f76802d9aff1..d9dfaa94f83c 100644
--- a/security/krb5-120/Makefile
+++ b/security/krb5-120/Makefile
@@ -4,8 +4,11 @@ PORTREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 .if !defined(MASTERDIR)
-PKGNAMESUFFIX=		-120
+PKGNAME_X=		-${FLAVOR:S/default//}-120
+.else
+PKGNAME_X=		-${FLAVOR:S/default//}
 .endif
+PKGNAMESUFFIX=		${PKGNAME_X:S/--/-/:C/-$//}
 
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
 PATCH_DIST_STRIP=	-p2
@@ -37,6 +40,8 @@ CPE_VENDOR=		mit
 CPE_VERSION=		5-${PORTVERSION}
 CPE_PRODUCT=		kerberos
 
+FLAVORS=		default ldap
+
 OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
 OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
 OPTIONS_RADIO=		CMD_LINE_EDITING
@@ -62,6 +67,10 @@ LIBEDIT_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_DESC=	Use libedit in FreeBSD base
 
+.if ${FLAVOR:U} == ldap
+OPTIONS_DEFAULT+=	LDAP LMDB
+.endif
+
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
 .endif
diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile
index 159ff47c6055..b231563cd5a2 100644
--- a/security/krb5-121/Makefile
+++ b/security/krb5-121/Makefile
@@ -4,8 +4,11 @@ PORTREVISION=		3
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 .if !defined(MASTERDIR)
-PKGNAMESUFFIX=		-121
+PKGNAME_X=		-${FLAVOR:S/default//}-121
+.else
+PKGNAME_X=		-${FLAVOR:S/default//}
 .endif
+PKGNAMESUFFIX=		${PKGNAME_X:S/--/-/:C/-$//}
 
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
 PATCH_DIST_STRIP=	-p2
@@ -37,6 +40,8 @@ CPE_VENDOR=		mit
 CPE_VERSION=		5-${PORTVERSION}
 CPE_PRODUCT=		kerberos
 
+FLAVORS=		default ldap
+
 OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
 OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
 OPTIONS_RADIO=		CMD_LINE_EDITING
@@ -62,6 +67,10 @@ LIBEDIT_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_DESC=	Use libedit in FreeBSD base
 
+.if ${FLAVOR:U} == ldap
+OPTIONS_DEFAULT+=	LDAP LMDB
+.endif
+
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
 .endif
diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile
index 8448da7d05fb..c5183994deff 100644
--- a/security/krb5-devel/Makefile
+++ b/security/krb5-devel/Makefile
@@ -2,7 +2,7 @@ PORTNAME=		krb5
 PORTVERSION=		1.22.${MIT_COMMIT_DATE}
 CATEGORIES=		security
 .if !defined(MASTERDIR)
-PKGNAMESUFFIX=		-devel
+PKGNAMESUFFIX=		-${FLAVOR}-devel
 .endif
 HASH=			f5ad07bd3
 MIT_COMMIT_DATE=	2024.01.24
@@ -38,6 +38,8 @@ CPE_VENDOR=		mit
 CPE_VERSION=		5-${PORTVERSION}
 CPE_PRODUCT=		kerberos
 
+FLAVORS=		default ldap
+
 OPTIONS_DEFINE=		EXAMPLES NLS DNS_FOR_REALM LDAP LMDB
 OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
 OPTIONS_RADIO=		CMD_LINE_EDITING
@@ -61,6 +63,10 @@ LIBEDIT_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_CONFIGURE_WITH=	libedit
 LIBEDIT_BASE_DESC=	Use libedit in FreeBSD base
 
+.if ${FLAVOR:U} == ldap
+OPTIONS_DEFAULT+=	LDAP LMDB
+.endif
+
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
 .endif
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 1bd3bb3c2ac2..a65ea22d98d1 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -5,4 +5,6 @@ KRB5_VERSION?=		121
 
 MASTERDIR=		${.CURDIR}/../krb5-${KRB5_VERSION}
 
+FLAVORS=		default ldap
+
 .include "${MASTERDIR}/Makefile"