From owner-svn-ports-head@freebsd.org Tue Mar 14 02:51:39 2017 Return-Path: Delivered-To: svn-ports-head@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 4B3C1D0BE43; Tue, 14 Mar 2017 02:51:39 +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 F3E7418FB; Tue, 14 Mar 2017 02:51:38 +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 v2E2pc3t088870; Tue, 14 Mar 2017 02:51:38 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2E2pb4g088866; Tue, 14 Mar 2017 02:51:37 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201703140251.v2E2pb4g088866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 14 Mar 2017 02:51:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436117 - in head/security: krb5-113 krb5-114 krb5-115 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Mar 2017 02:51:39 -0000 Author: cy Date: Tue Mar 14 02:51:37 2017 New Revision: 436117 URL: https://svnweb.freebsd.org/changeset/ports/436117 Log: Replace explicit PLIST_SUB with OPTIONS_SUB, simplifying Makefiles. PR: 217552 Submitted by: John W. O'brien Differential Revision: D9889 Modified: head/security/krb5-113/Makefile head/security/krb5-114/Makefile head/security/krb5-115/Makefile Modified: head/security/krb5-113/Makefile ============================================================================== --- head/security/krb5-113/Makefile Tue Mar 14 02:48:20 2017 (r436116) +++ head/security/krb5-113/Makefile Tue Mar 14 02:51:37 2017 (r436117) @@ -55,6 +55,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${O LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} USE_RC_SUBR= kpropd +OPTIONS_SUB= yes .include @@ -82,9 +83,6 @@ CONFIGURE_ARGS+= --enable-dns-for-realm .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} Modified: head/security/krb5-114/Makefile ============================================================================== --- head/security/krb5-114/Makefile Tue Mar 14 02:48:20 2017 (r436116) +++ head/security/krb5-114/Makefile Tue Mar 14 02:51:37 2017 (r436117) @@ -53,6 +53,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${O LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} USE_RC_SUBR= kpropd +OPTIONS_SUB= yes .include @@ -80,9 +81,6 @@ CONFIGURE_ARGS+= --enable-dns-for-realm .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE} Modified: head/security/krb5-115/Makefile ============================================================================== --- head/security/krb5-115/Makefile Tue Mar 14 02:48:20 2017 (r436116) +++ head/security/krb5-115/Makefile Tue Mar 14 02:51:37 2017 (r436117) @@ -53,6 +53,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${O LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} USE_RC_SUBR= kpropd +OPTIONS_SUB= yes .include @@ -80,9 +81,6 @@ CONFIGURE_ARGS+= --enable-dns-for-realm .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-ldap -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MREADLINE}