Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Mar 2017 02:51:37 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
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
Message-ID:  <201703140251.v2E2pb4g088866@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <john@saltant.com>
  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 <bsd.port.options.mk>
 
@@ -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 <bsd.port.options.mk>
 
@@ -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 <bsd.port.options.mk>
 
@@ -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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703140251.v2E2pb4g088866>