Date: Thu, 17 Feb 2011 12:31:44 GMT From: Ganael Laplanche <martymac@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/154843: net/nss_ldap - Fix configuration file comments + various changes Message-ID: <201102171231.p1HCVinO069764@red.freebsd.org> Resent-Message-ID: <201102171240.p1HCeADF052872@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 154843 >Category: ports >Synopsis: net/nss_ldap - Fix configuration file comments + various changes >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: Thu Feb 17 12:40:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 8.2-RC3 >Organization: http://contribs.martymac.org >Environment: FreeBSD camembert.sis.pasteur.fr 8.2-RC3 FreeBSD 8.2-RC3 #0: Sun Jan 30 06:28:31 UTC 2011 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Dear maintainer of net/nss_ldap, I would like to commit the attached patch, which provides the following : - Fix several default paths relative to PREFIX - Move REINPLACE_CMDs to the post-patch target to avoid patching the same files again when re-running the install target - Provide a .conf file from the .conf.sample one as advised in the porter's handbook - Add a LOCAL mirror Please, tell me if you agree with those changes. Best regards, Ganael Laplanche. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: nss_ldap/Makefile =================================================================== RCS file: /home/pcvs/ports/net/nss_ldap/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- nss_ldap/Makefile 4 Dec 2010 07:32:57 -0000 1.38 +++ nss_ldap/Makefile 16 Feb 2011 15:51:37 -0000 @@ -7,9 +7,10 @@ PORTNAME= nss_ldap PORTVERSION= 1.${NSS_LDAP_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net -MASTER_SITES= http://www.padl.com/download/ +MASTER_SITES= http://www.padl.com/download/ \ + LOCAL/martymac DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION} MAINTAINER= mikeg@bsd-box.net @@ -27,9 +28,6 @@ OPTIONS= LCLASS "Enable login classes via the loginClass attribute" on -PLIST_FILES= etc/nss_ldap.conf.sample \ - lib/nss_ldap.so.1 - CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib" @@ -54,6 +52,13 @@ post-extract: ${CP} ${FILESDIR}/bsdnss.c ${WRKSRC} +post-patch: + @${REINPLACE_CMD} -e 's,/etc/ldap\.,${PREFIX}/etc/nss_ldap.,g' \ + -e 's,/etc/openldap/ldap\.,${PREFIX}/etc/openldap/ldap.,g' \ + ${WRKSRC}/ldap.conf + @${REINPLACE_CMD} 's,/etc/ldap\.,${PREFIX}/etc/nss_ldap.,g' \ + ${WRKSRC}/${MAN5} + # XXX: newer autoconf's rely on the compiler result, not the preprocessor # for checking headers, so the configure.in needs to be fixed upstream # to properly include dependencies @@ -65,11 +70,12 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nss_ldap.so ${PREFIX}/lib/nss_ldap.so.1 ${INSTALL_DATA} ${WRKSRC}/ldap.conf ${PREFIX}/etc/nss_ldap.conf.sample - @${REINPLACE_CMD} 's,/etc/ldap.,${PREFIX}/etc/nss_ldap.,g' \ - ${WRKSRC}/${MAN5} ${INSTALL_MAN} ${WRKSRC}/${MAN5} ${MAN5PREFIX}/man/man5 post-install: +.if !exists(${PREFIX}/etc/nss_ldap.conf) + ${CP} -p ${PREFIX}/etc/nss_ldap.conf.sample ${PREFIX}/etc/nss_ldap.conf +.endif .if !defined(PACKAGE_BUILDING) @${CAT} ${PKGMESSAGE} .endif Index: nss_ldap/distinfo =================================================================== RCS file: /home/pcvs/ports/net/nss_ldap/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- nss_ldap/distinfo 18 Jan 2010 03:43:56 -0000 1.16 +++ nss_ldap/distinfo 16 Feb 2011 15:51:37 -0000 @@ -1,3 +1,2 @@ -MD5 (nss_ldap-265.tar.gz) = c1cb02d1a85538cf16bca6f6a562abe4 SHA256 (nss_ldap-265.tar.gz) = 77b54d905f50d774f28d5559d49126f1bc76720f741b0864a64bb4936ec226a8 SIZE (nss_ldap-265.tar.gz) = 280976 Index: nss_ldap/pkg-plist =================================================================== RCS file: nss_ldap/pkg-plist diff -N nss_ldap/pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ nss_ldap/pkg-plist 16 Feb 2011 15:51:37 -0000 @@ -0,0 +1,4 @@ +lib/nss_ldap.so.1 +@unexec if cmp -s %D/etc/nss_ldap.conf %D/etc/nss_ldap.conf.sample; then rm -f %D/etc/nss_ldap.conf; fi +etc/nss_ldap.conf.sample +@exec if [ ! -f %D/etc/nss_ldap.conf ]; then cp %B/%f %D/etc/nss_ldap.conf; fi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102171231.p1HCVinO069764>