svn commit: r451262 - in head: . security/krb5-appl

[Cy Schubert]

Author: cy
Date: Thu Oct  5 01:56:06 2017
New Revision: 451262
URL: https://svnweb.freebsd.org/changeset/ports/451262

Log:
  Make the command rename options default. This avoids a conflict with
  net/bsdrcmds by default allowing end-users to install both ports.
  
  Users may deselect the options to use the original command names
  however they must also uninstall net/bsdrcmds to avoid the conflict.

Modified:
  head/UPDATING
  head/security/krb5-appl/Makefile   (contents, props changed)

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Oct  5 01:55:52 2017	(r451261)
+++ head/UPDATING	Thu Oct  5 01:56:06 2017	(r451262)
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20171004:
+  AFFECTS: users of security/krb5-appl
+  AUTHOR: cy at FreeBSD.org
+
+  Configuration options to rename kerberos ftp, telnet, rlogin, rsh, and
+  rcp are now default to avoid conflicting with net/bsdrcmds packages
+  (in poudriere). Deselect the options to use the original command names
+  and also uninstall net/bsdrcmds to avoid the conflict.
+
 20171002:
   AFFECTS: users of x11-wm/cwm
   AUTHOR: tobik at FreeBSD.org

Modified: head/security/krb5-appl/Makefile
==============================================================================
--- head/security/krb5-appl/Makefile	Thu Oct  5 01:55:52 2017	(r451261)
+++ head/security/krb5-appl/Makefile	Thu Oct  5 01:56:06 2017	(r451262)
@@ -3,7 +3,7 @@
 
 PORTNAME=		krb5-appl
 PORTVERSION=		1.0.3
-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//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -31,7 +31,8 @@ MAKE_ARGS=		INSTALL="${INSTALL}"
 PATCH_DIST_STRIP=	-p1
 
 OPTIONS_DEFINE=	KRB5_RENAME_FTP KRB5_RENAME_TELNET KRB5_RENAME_RLOGIN KRB5_RENAME_RSH KRB5_RENAME_RCP
-OPTIONS_DEFAULT=	KRB5_PORT
+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 \
 			KRB5_114_PORT KRB5_115_PORT