Attachment 248417 Details for Bug 277015 – Flavors respecting existing package name

[patch] Flavors respecting existing package name

0001-security-krb5-Flavorize-with-default-and-ldap-flavor.patch (text/plain), 4.92 KB, created by Cy Schubert on 2024-02-13 04:57:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2024-02-13 04:57:53 UTC

Size: 4.92 KB

patch

obsolete

>From 002498fbba7767184941a95ddfea868bc873f191 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Mon, 12 Feb 2024 16:33:16 -0800
>Subject: [PATCH] security/krb5*: Flavorize with default and ldap flavors
>
>---
> security/krb5-119/Makefile   | 13 +++++++++++--
> security/krb5-120/Makefile   | 13 +++++++++++--
> security/krb5-121/Makefile   | 13 +++++++++++--
> security/krb5-devel/Makefile |  9 ++++++++-
> 4 files changed, 41 insertions(+), 7 deletions(-)
>
>diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile
>index af529b667c19..351c595eaf7c 100644
>--- a/security/krb5-119/Makefile
>+++ b/security/krb5-119/Makefile
>@@ -1,11 +1,14 @@
> PORTNAME=		krb5
> PORTVERSION=		1.19.4
>-PORTREVISION=		2
>+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=		-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..d9f5b5b06b67 100644
>--- a/security/krb5-120/Makefile
>+++ b/security/krb5-120/Makefile
>@@ -1,11 +1,14 @@
> PORTNAME=		krb5
> PORTVERSION=		1.20.2
>-PORTREVISION=		3
>+PORTREVISION=		4
> 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..e46deefa825e 100644
>--- a/security/krb5-121/Makefile
>+++ b/security/krb5-121/Makefile
>@@ -1,11 +1,14 @@
> PORTNAME=		krb5
> PORTVERSION=		1.21.2
>-PORTREVISION=		3
>+PORTREVISION=		4
> 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..9e52f8ecdd5d 100644
>--- a/security/krb5-devel/Makefile
>+++ b/security/krb5-devel/Makefile
>@@ -1,8 +1,9 @@
> PORTNAME=		krb5
> PORTVERSION=		1.22.${MIT_COMMIT_DATE}
>+PORTREVISION=		1
> CATEGORIES=		security
> .if !defined(MASTERDIR)
>-PKGNAMESUFFIX=		-devel
>+PKGNAMESUFFIX=		-${FLAVOR}-devel
> .endif
> HASH=			f5ad07bd3
> MIT_COMMIT_DATE=	2024.01.24
>@@ -38,6 +39,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 +64,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
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 277015: 248412 | 248414 | 248415 | 248416 | 248417