ports/143144: [PATCH] net/nss_ldap: use $SUB_FILES to dynamically update pkg-message

[Michael Graziano]

The following reply was made to PR ports/143144; it has been noted by GNATS.

From: Michael Graziano <mikeg at bsd-box.net>
To: bug-followup at FreeBSD.org, venture37 at geeklan.co.uk
Cc:  
Subject: Re: ports/143144: [PATCH] net/nss_ldap: use $SUB_FILES to dynamically update pkg-message
Date: Sun, 24 Jan 2010 17:22:22 -0500

 --Apple-Mail-15-449217775
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=us-ascii
 
 Looks good & makes the port stylistically correct.  One fix in the =
 attached (@{CAT} should be ${CAT}) so make install doesn't break.
 
 Noting the obvious: files go away, so patch needs "-E"
 
 -MG
 
 
 --Apple-Mail-15-449217775
 Content-Disposition: attachment;
 	filename=nss_ldap-subfiles.patch
 Content-Type: application/octet-stream;
 	name="nss_ldap-subfiles.patch"
 Content-Transfer-Encoding: 7bit
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/net/nss_ldap/Makefile,v
 retrieving revision 1.33
 diff -u -r1.33 Makefile
 --- Makefile	18 Jan 2010 03:43:56 -0000	1.33
 +++ Makefile	24 Jan 2010 06:29:42 -0000
 @@ -23,7 +23,7 @@
  USE_LDCONFIG=	yes
  USE_OPENLDAP=	yes
  
 -OPTIONS=        LCLASS "Enable login classes via the loginClass attribute" on
 +OPTIONS=	LCLASS "Enable login classes via the loginClass attribute" on
  
  PLIST_FILES=	etc/nss_ldap.conf.sample \
  		lib/nss_ldap.so.1
 @@ -36,7 +36,8 @@
  		--enable-rfc2307bis \
  		--enable-paged-results
  
 -MAN5=	nss_ldap.5
 +MAN5=		nss_ldap.5
 +SUB_FILES=	pkg-message
  
  .include <bsd.port.pre.mk>
  .if !defined(WITHOUT_KERBEROS)
 @@ -56,6 +57,8 @@
  	@${REINPLACE_CMD} 's,/etc/ldap.,${PREFIX}/etc/nss_ldap.,g' \
  		${WRKSRC}/${MAN5}
  	${INSTALL_MAN} ${WRKSRC}/${MAN5} ${MAN5PREFIX}/man/man5
 -	${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}
 +
 +post-install:
 +	${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 Index: pkg-message
 ===================================================================
 RCS file: pkg-message
 diff -N pkg-message
 --- pkg-message	8 Jan 2004 14:28:35 -0000	1.1
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,15 +0,0 @@
 -=====================================================================
 -The nss_ldap module expects to find its configuration files at the
 -following paths:
 -
 -LDAP configuration:     %%PREFIX%%/etc/nss_ldap.conf
 -LDAP secret (optional): %%PREFIX%%/etc/nss_ldap.secret
 -
 -
 -WARNING: For users of previous versions of this port:
 -WARNING:
 -WARNING: Previous versions of this port expected configuration files
 -WARNING: to be located at /etc/ldap.conf and /etc/ldap.secret.  You
 -WARNING: may need to move these configuration files to their new
 -WARNING: location specified above.
 -=====================================================================
 Index: files/pkg-message.in
 ===================================================================
 RCS file: files/pkg-message.in
 diff -N files/pkg-message.in
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/pkg-message.in	24 Jan 2010 06:29:42 -0000
 @@ -0,0 +1,15 @@
 +=====================================================================
 +The nss_ldap module expects to find its configuration files at the
 +following paths:
 +
 +LDAP configuration:     %%PREFIX%%/etc/nss_ldap.conf
 +LDAP secret (optional): %%PREFIX%%/etc/nss_ldap.secret
 +
 +
 +WARNING: For users of previous versions of this port:
 +WARNING:
 +WARNING: Previous versions of this port expected configuration files
 +WARNING: to be located at /etc/ldap.conf and /etc/ldap.secret.  You
 +WARNING: may need to move these configuration files to their new
 +WARNING: location specified above.
 +=====================================================================
 
 --Apple-Mail-15-449217775--