From owner-svn-ports-all@freebsd.org Tue Dec 15 05:02:23 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39269A44CE0; Tue, 15 Dec 2015 05:02:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA53812AE; Tue, 15 Dec 2015 05:02:22 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBF52M3U094950; Tue, 15 Dec 2015 05:02:22 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBF52LrW094944; Tue, 15 Dec 2015 05:02:21 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201512150502.tBF52LrW094944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 15 Dec 2015 05:02:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403760 - in head/security: . krb5 krb5-112 krb5-113 krb5-114 krb5-appl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2015 05:02:23 -0000 Author: cy Date: Tue Dec 15 05:02:21 2015 New Revision: 403760 URL: https://svnweb.freebsd.org/changeset/ports/403760 Log: This is the second part of two commits, the first being r403749. Adopt the same port structure as used by the cfengine family of ports: security/krb5 is renamed to security/krb5-114. A brand new security/krb5 now becomes a master port for the family of security/krb5-* ports. The default installs krb5-1.14. There is no functional change to the port build nor does the name of the latest krb5 port and package change. Users can continue to install security/krb5 to track the latest major version of security/krb5. Users wishing to install a specific version branch of krb5 can continue to install any of the security/krb5-* ports or by setting KRB5_VERSION in make.conf make.conf or including the branch on the make command line during build: make KRB5_VERSIN=NNN make -V VERSIONS lists available versions. security/krb5-appl has been updated to support this change (also fixing a typo in the krb5-appl/Makefile). Inspired by: sysutils/cfengine Added: head/security/krb5/ head/security/krb5/Makefile (contents, props changed) Modified: head/security/Makefile head/security/krb5-112/Makefile head/security/krb5-113/Makefile head/security/krb5-114/Makefile head/security/krb5-appl/Makefile Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Dec 15 04:57:48 2015 (r403759) +++ head/security/Makefile Tue Dec 15 05:02:21 2015 (r403760) @@ -269,6 +269,7 @@ SUBDIR += krb5 SUBDIR += krb5-112 SUBDIR += krb5-113 + SUBDIR += krb5-114 SUBDIR += krb5-appl SUBDIR += kripp SUBDIR += kstart Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Tue Dec 15 04:57:48 2015 (r403759) +++ head/security/krb5-112/Makefile Tue Dec 15 05:02:21 2015 (r403760) @@ -6,7 +6,9 @@ PORTVERSION= 1.12.4 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= -112 +.endif DISTNAME= ${PORTNAME}-${PORTVERSION}-signed EXTRACT_SUFX= .tar Modified: head/security/krb5-113/Makefile ============================================================================== --- head/security/krb5-113/Makefile Tue Dec 15 04:57:48 2015 (r403759) +++ head/security/krb5-113/Makefile Tue Dec 15 05:02:21 2015 (r403760) @@ -5,7 +5,9 @@ PORTNAME= krb5 PORTVERSION= 1.13.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= -113 +.endif PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 Modified: head/security/krb5-114/Makefile ============================================================================== --- head/security/krb5-114/Makefile Tue Dec 15 04:57:48 2015 (r403759) +++ head/security/krb5-114/Makefile Tue Dec 15 05:02:21 2015 (r403760) @@ -5,6 +5,10 @@ PORTNAME= krb5 PORTVERSION= 1.14 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= -114 +.endif + PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 Modified: head/security/krb5-appl/Makefile ============================================================================== --- head/security/krb5-appl/Makefile Tue Dec 15 04:57:48 2015 (r403759) +++ head/security/krb5-appl/Makefile Tue Dec 15 05:02:21 2015 (r403760) @@ -33,7 +33,8 @@ 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_SINGLE= KRB5_VERSION -OPTIONS_SINGLE_KRB5_VERSION= KRB5_PORT KRB5_112_PORT KRB5_113_PORT +OPTIONS_SINGLE_KRB5_VERSION= KRB5_PORT KRB5_112_PORT KRB5_113_PORT \ + KRB5_114_PORT KRB5_RENAME_FTP_DESC= Rename ftp to kftp KRB5_RENAME_TELNET_DESC= Rename telnet to ktelnet KRB5_RENAME_RLOGIN_DESC= Rename rlogin to krlogin @@ -41,7 +42,8 @@ KRB5_RENAME_RSH_DESC= Rename rsh to krs KRB5_RENAME_RCP_DESC= Rename rcp to krcp KRB5_PORT_DESC= Depend on security/krb5 KRB5_112_PORT_DESC= Depend on security/krb5-112 -KRB5_112_PORT_DESC= Depend on security/krb5-113 +KRB5_113_PORT_DESC= Depend on security/krb5-113 +KRB5_114_PORT_DESC= Depend on security/krb5-114 .include @@ -54,6 +56,9 @@ RUN_DEPENDS= kinit:${PORTSDIR}/security .elif ${PORT_OPTIONS:MKRB5_113_PORT} LIB_DEPENDS= libkrb5support.so:${PORTSDIR}/security/krb5-113 RUN_DEPENDS= kinit:${PORTSDIR}/security/krb5-113 +.elif ${PORT_OPTIONS:MKRB5_114_PORT} +LIB_DEPENDS= libkrb5support.so:${PORTSDIR}/security/krb5-114 +RUN_DEPENDS= kinit:${PORTSDIR}/security/krb5-113 .else BROKEN= krb5 dependency not selected .endif Added: head/security/krb5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5/Makefile Tue Dec 15 05:02:21 2015 (r403760) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +VERSIONS= 112 113 114 +KRB5_VERSION?= 114 + +MASTERDIR= ${.CURDIR}/../krb5-${KRB5_VERSION} + +.include "${MASTERDIR}/Makefile"