From sevan@newbie.thingamajig-systems.co.uk  Sun Jul 25 12:21:58 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 193871065677
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Jul 2010 12:21:58 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id E11A08FC21
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Jul 2010 12:21:56 +0000 (UTC)
Received: from tinderbox.home.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o6PCLnUS092150
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO);
	Sun, 25 Jul 2010 13:21:49 +0100 (BST)
	(envelope-from sevan@tinderbox.home.thingamajig-systems.co.uk)
Received: (from sevan@localhost)
	by tinderbox.home.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o6PCLnAs092149;
	Sun, 25 Jul 2010 13:21:49 +0100 (BST)
	(envelope-from sevan)
Message-Id: <201007251221.o6PCLnAs092149@tinderbox.home.thingamajig-systems.co.uk>
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: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manually
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mikeg@bsd-box.net

>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:    bapt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 25 12:30:04 UTC 2010
>Closed-Date:    Fri Sep 03 16:43:22 UTC 2010
>Last-Modified:  Fri Sep  3 16:50:01 UTC 2010
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Jul 25 12:30:28 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148925 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: mikeg@bsd-box.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148925: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manually
Date: Sun, 25 Jul 2010 12:30:25 UT

 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
 edwin@FreeBSD.org

From: Michael Graziano <mikeg@bsd-box.net>
To: bug-followup@FreeBSD.org, venture37@geeklan.co.uk
Cc:  
Subject: Re: ports/148925: [PATCH] net/nss_ldap: Use $SUB_FILES instead of invoking sed manually
Date: Sun, 22 Aug 2010 21:48:38 -0400

 Finally got around to feeding this to my dev box -- Looks good & also =
 fixes a couple of formatting sins in the original Makefile :-)
 
 No rush getting it committed & no need to bump the package version, but =
 definitely worth putting through for future ease of maintenance.
 
 -MG=
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Mon Aug 23 02:40:10 UTC 2010 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148925 
Responsible-Changed-From-To: freebsd-ports-bugs->bapt 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Fri Sep 3 16:37:45 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148925 
State-Changed-From-To: open->closed 
State-Changed-By: bapt 
State-Changed-When: Fri Sep 3 16:43:20 UTC 2010 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148925 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148925: commit references a PR
Date: Fri,  3 Sep 2010 16:43:17 +0000 (UTC)

 bapt        2010-09-03 16:43:08 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/nss_ldap         Makefile 
   Added files:
     net/nss_ldap/files   pkg-message.in 
   Removed files:
     net/nss_ldap         pkg-message 
   Log:
   - Use SUB_FILES instead of invoking sed manually to change pkg-message
   - Replaces spaces with a tab after OPTIONS
   - While here add LICENSE
   
   PR:             ports/148925
   Submitted by:   Sevan Janiyan <venture37 _at_ geeklan.co.uk>
   Approved by:    Michael Graziano <mikeg _at_ bsd-box.net> (maintainer)
   
   Revision  Changes    Path
   1.34      +10 -2     ports/net/nss_ldap/Makefile
   1.1       +15 -0     ports/net/nss_ldap/files/pkg-message.in (new)
   1.2       +0 -15     ports/net/nss_ldap/pkg-message (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
