Date: Sun, 25 Jul 2010 13:21:49 +0100 (BST) From: Sevan Janiyan <venture37@geeklan.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mikeg@bsd-box.net Subject: ports/148925: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manually Message-ID: <201007251221.o6PCLnAs092149@tinderbox.home.thingamajig-systems.co.uk> Resent-Message-ID: <201007251230.o6PCU4nM017634@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148925
>Category: ports
>Synopsis: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manually
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 25 12:30:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release: FreeBSD 8.0-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD tinderbox.home.thingamajig-systems.co.uk 8.0-RELEASE-p4 FreeBSD 8.0-RELEASE-p4 #4: Sat Jul 24 16:24:34 BST 2010
>Description:
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 (mikeg@bsd-box.net) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- 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
--- Makefile 18 Jan 2010 03:43:56 -0000 1.33
+++ Makefile 25 Jul 2010 12:14:50 -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
@@ -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
--- 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 25 Jul 2010 12:14:50 -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.
+=====================================================================
--- nss_ldap-1.265_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007251221.o6PCLnAs092149>