From af1d4a12a4500398fc32b586ead5df45a1835606 Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Sun, 2 Mar 2025 16:22:25 +0100 Subject: [PATCH] shells/bash-static: Revert accidentally staged review --- shells/bash-static/Makefile | 1 - shells/bash/Makefile | 4 ---- 2 files changed, 5 deletions(-) diff --git a/shells/bash-static/Makefile b/shells/bash-static/Makefile index 9d1431acd481..e3a84b074e66 100644 --- a/shells/bash-static/Makefile +++ b/shells/bash-static/Makefile @@ -1,7 +1,6 @@ MASTERDIR= ${.CURDIR}/../../shells/bash OPTIONS_SLAVE= STATIC -OPTIONS_EXCLUDE=PORTS_READLINE NLS PKGNAMESUFFIX= -static diff --git a/shells/bash/Makefile b/shells/bash/Makefile index d13604421216..47b5059ded6c 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,7 +1,6 @@ PORTNAME= bash PATCHLEVEL= 37 PORTVERSION= 5.2.${PATCHLEVEL:S/^0//g} -PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= GNU DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -55,9 +54,6 @@ PORTS_READLINE_BUILD_DEPENDS= readline>=8.2:devel/readline PORTS_READLINE_USES= readline PORTS_READLINE_CONFIGURE_WITH= installed-readline -STATIC_PREVENTS= PORTS_READLINE NLS -STATIC_PREVENTS_MSG= "STATIC and PORTS_READLINE/NLS options are mutually exclusive" - .if empty(PKGNAMESUFFIX) CONFLICTS+= bash-static bash52-static .else