ports/148925: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manua

Ports-bugs

venture37geeklancouk
Use $SUB_FILES instead of invoking sed manually to change pkg-message
replaces spaces with a tab after $OPTIONS

Added file(s):
- files/pkg-message.in

Removed file(s):
- pkg-message

Port maintainer ([email protected]) is cc'd.

Generated with FreeBSD Port Tools 0.99

--- nss_ldap-1.265_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/nss_ldap/Makefile,v
retrieving revision 1.33
diff -u -u -r1.33 Makefile


@@ -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
@@ -38,6 +38,8 @@
 
 MAN5=	nss_ldap.5
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 .if !defined(WITHOUT_KERBEROS)
 CONFIGURE_ARGS+=--enable-configurable-krb5-ccname-env
@@ -56,6 +58,10 @@
 	@${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:
+.if !defined(PACKAGE_BUILDING)
+	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.post.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message


@@ -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


@@ -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.
+=====================================================================
                                            
edwinFreeBSDorg
The following reply was made to PR ports/148925; it has been noted by GNATS.

To: [email protected]
Cc: [email protected]
Subject: Re: ports/148925: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manually

 Maintainer of net/nss_ldap,
 
 Please note that PR ports/148925 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/148925
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 [email protected]
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "[email protected]"