From af4931c16a2768204b1776f92b9068ad5e1f5ecd Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 3 Dec 2017 19:22:12 +0000
Subject: [PATCH] security/{racoon2,krb5-appl}: drop option for expired
 krb5-113

Bump PORTREVISION
---
 security/krb5-appl/Makefile |  9 +++------
 security/racoon2/Makefile   | 15 +++------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index 151cebb05b44..b089eb93317a 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		krb5-appl
 PORTVERSION=		1.0.3
-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//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	KRB5_RENAME_FTP KRB5_RENAME_TELNET KRB5_RENAME_RLOGIN KRB5_RENAM
 OPTIONS_DEFAULT=	KRB5_PORT KRB5_RENAME_FTP KRB5_RENAME_TELNET \
 			KRB5_RENAME_RLOGIN KRB5_RENAME_RSH KRB5_RENAME_RCP
 OPTIONS_SINGLE=		KRB5_VERSION
-OPTIONS_SINGLE_KRB5_VERSION=	KRB5_PORT KRB5_113_PORT \
+OPTIONS_SINGLE_KRB5_VERSION=	KRB5_PORT \
 			KRB5_114_PORT KRB5_115_PORT
 KRB5_RENAME_FTP_DESC=		Rename ftp to kftp
 KRB5_RENAME_TELNET_DESC=	Rename telnet to ktelnet
@@ -42,7 +42,6 @@ KRB5_RENAME_RLOGIN_DESC=	Rename rlogin to krlogin
 KRB5_RENAME_RSH_DESC=		Rename rsh to krsh
 KRB5_RENAME_RCP_DESC=		Rename rcp to krcp
 KRB5_PORT_DESC=			Depend on security/krb5
-KRB5_113_PORT_DESC=		Depend on security/krb5-113
 KRB5_114_PORT_DESC=		Depend on security/krb5-114
 KRB5_115_PORT_DESC=		Depend on security/krb5-115
 
@@ -50,10 +49,8 @@ KRB5_115_PORT_DESC=		Depend on security/krb5-115
 
 KRB5_PORT_LIB_DEPENDS=		libkrb5support.so:security/krb5
 KRB5_PORT_RUN_DEPENDS=		kinit:security/krb5
-KRB5_113_PORT_LIB_DEPENDS=		libkrb5support.so:security/krb5-113
-KRB5_113_PORT_RUN_DEPENDS=		kinit:security/krb5-113
 KRB5_114_PORT_LIB_DEPENDS=		libkrb5support.so:security/krb5-114
-KRB5_114_PORT_RUN_DEPENDS=		kinit:security/krb5-113
+KRB5_114_PORT_RUN_DEPENDS=		kinit:security/krb5-114
 
 KRB5_DOC_BUILD_DEPENDS+=	texi2dvi:print/texinfo \
 			dvips:print/dvipsk-tetex
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 4127d6bd1b79..bd1fc95e982d 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	racoon2
 PORTVERSION=	20100526a
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 
@@ -22,10 +22,9 @@ CONFIGURE_ENV=	YACC=/usr/bin/yacc perl_bindir=${LOCALBASE}/bin/perl5
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_RADIO=	KERBEROS
-OPTIONS_RADIO_KERBEROS=	KRB5 KRB5_113 KRB5_114 \
+OPTIONS_RADIO_KERBEROS=	KRB5 KRB5_114 \
 		HEIMDAL_PORTS HEIMDAL_BASE
 KRB5_DESC=	Build with Kerberos (security/krb5)
-KRB5_113_DESC=	Build with Kerberos (security/krb5-113)
 KRB5_114_DESC=	Build with Kerberos (security/krb5-114)
 HEIM_AL_PORTS_DESC=	Build with Heimdal in ports (security/heimdal)
 HEIMDAL_BASE_DESC=	Build with Heimdal in base
@@ -38,20 +37,12 @@ KRB5_LIB_DEPENDS=	libkrb5support.so:security/krb5
 KRB5_RUN_DEPENDS=	kinit:security/krb5
 KRB5_VARS=		KINK=yes
 
-KRB5_113_USES=		gssapi:mit
-KRB5_113_CONFIGURE_ON=	--enable-kinkd
-KRB5_113_MAKE_ENV=	WITH_KINK=yes
-KRB5_113_PLIST_SUB=	KINK=""
-KRB5_113_LIB_DEPENDS=	libkrb5support.so:security/krb5-113
-KRB5_113_RUN_DEPENDS=	kinit:security/krb5-113
-KRB5_113_VARS=		KINK=yes
-
 KRB5_114_USES=		gssapi:mit
 KRB5_114_CONFIGURE_ON=	--enable-kinkd
 KRB5_114_MAKE_ENV=	WITH_KINK=yes
 KRB5_114_PLIST_SUB=	KINK=""
 KRB5_114_LIB_DEPENDS=	libkrb5support.so:security/krb5-114
-KRB5_114_RUN_DEPENDS=	kinit:security/krb5-113
+KRB5_114_RUN_DEPENDS=	kinit:security/krb5-114
 KRB5_114_VARS=		KINK=yes
 
 HEIMDAL_PORT_USES=	gssapi:heimdal