From owner-svn-ports-head@FreeBSD.ORG Fri Jul 25 21:43:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1BE4DFB9; Fri, 25 Jul 2014 21:43:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 088EE20E9; Fri, 25 Jul 2014 21:43:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PLhDH1088689; Fri, 25 Jul 2014 21:43:13 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6PLhDOA088687; Fri, 25 Jul 2014 21:43:13 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201407252143.s6PLhDOA088687@svn.freebsd.org> From: Rene Ladan Date: Fri, 25 Jul 2014 21:43:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362935 - head/net/linux-f10-nss_ldap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 21:43:14 -0000 Author: rene Date: Fri Jul 25 21:43:13 2014 New Revision: 362935 URL: http://svnweb.freebsd.org/changeset/ports/362935 QAT: https://qat.redports.org/buildarchive/r362935/ Log: - Stage support - Pass maintainership to emulation@ - Use options framework instead of WITH_PAM and NOPORTDOCS knobs - Mention PORTDOCS files explicitly - Replace some static text in Makefile by variables Modified: head/net/linux-f10-nss_ldap/Makefile head/net/linux-f10-nss_ldap/pkg-plist Modified: head/net/linux-f10-nss_ldap/Makefile ============================================================================== --- head/net/linux-f10-nss_ldap/Makefile Fri Jul 25 21:40:24 2014 (r362934) +++ head/net/linux-f10-nss_ldap/Makefile Fri Jul 25 21:43:13 2014 (r362935) @@ -10,12 +10,14 @@ MASTER_SITES= ftp://ftp.pbone.net/mirror PKGNAMEPREFIX= linux-f10- DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION}-${RPMVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= emulation@FreeBSD.org COMMENT= RFC 2307 NSS Module (Linux Fedora 10) #LICENSE= GPLv2 #NO_LICENSES_INSTALL=yes # license framework does not rm the "share" directory +OPTIONS_DEFINE= DOCS PAM + NSS_LDAP_VERSION=264 USE_LINUX_RPM= yes @@ -27,48 +29,54 @@ USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION} MANPREFIX= ${PREFIX}/usr/share -MANCOMPRESSED= no -MAN5= nss_ldap.5.gz -.if defined(WITH_PAM) -PLIST_SUB+= PAM="" -MAN5+= pam_ldap.5.gz -.else -PLIST_SUB+= PAM="@comment " -.endif +OPTIONS_SUB= yes -PORTDOCS=* +PORTDOCS= ANNOUNCE.nss_ldap AUTHORS.nss_ldap COPYING.nss_ldap \ + ChangeLog.nss_ldap NEWS.nss_ldap README.TLS README.nss_ldap \ + ldap.conf.nss_ldap ldapns.schema ns-pwd-policy.schema \ + nsswitch.ldap + +.include + +.if ${PORT_OPTIONS:MPAM} +PORTDOCS+= AUTHORS.pam_ldap COPYING.LIB.pam_ldap COPYING.pam_ldap \ + ChangeLog.pam_ldap NEWS.pam_ldap README.pam_ldap \ + ldap.conf.pam_ldap pam.d/chfn pam.d/chsh pam.d/ftp \ + pam.d/gdm pam.d/halt pam.d/imap pam.d/kde pam.d/linuxconf \ + pam.d/linuxconf-pair pam.d/login pam.d/mcserv pam.d/other \ + pam.d/passwd pam.d/pop pam.d/poweroff pam.d/ppp pam.d/reboot \ + pam.d/rexec pam.d/rlogin pam.d/rsh pam.d/samba pam.d/shutdown \ + pam.d/ssh pam.d/su pam.d/vlock pam.d/xdm pam.d/xlock \ + pam.d/xscreensaver pam.d/xserver +.endif -NO_STAGE= yes pre-fetch: -.if !defined(WITH_PAM) - @${ECHO_MSG} "Use WITH_PAM if you require more advanced ldap support in the linuxulator" +.if !${PORT_OPTIONS:MPAM} + @${ECHO_MSG} "Select PAM if you require more advanced ldap support in the linuxulator" .endif post-extract: @if [ -f ${WRKDIR}/etc/ldap.conf ]; then \ ${MV} ${WRKDIR}/etc/ldap.conf ${WRKDIR}/etc/ldap.conf.dist; \ fi -.if !defined(WITH_PAM) +.if !${PORT_OPTIONS:MPAM} @if [ -f ${WRKDIR}/lib/security/pam_ldap.so ]; then \ ${RM} -rf ${WRKDIR}/lib/; \ fi - @if [ -f ${WRKDIR}/usr/share/doc/nss_ldap-264/COPYING.pam_ldap ]; then \ - ${RM} ${WRKDIR}/usr/share/doc/nss_ldap-264/*.pam*; \ - ${RM} -rf ${WRKDIR}/usr/share/doc/nss_ldap-264/pam.d; \ + @if [ -f ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/COPYING.pam_ldap ]; then \ + ${RM} ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/*.pam*; \ + ${RM} -rf ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d; \ fi @if [ -f ${WRKDIR}/usr/share/man/man5/pam_ldap.5.gz ]; then \ ${RM} ${WRKDIR}/usr/share/man/man5/pam_ldap.5.gz; \ fi .else -.if defined(NOPORTDOCS) - @if [ -d ${WRKDIR}/usr/share/doc/nss_ldap-264/pam.d ]; then \ - ${RM} -rf ${WRKDIR}/usr/share/doc/nss_ldap-264/pam.d/; \ +.if !${PORT_OPTIONS:MDOCS} + @if [ -d ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d ]; then \ + ${RM} -rf ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d/; \ fi .endif .endif -post-install: - @${CAT} ${PKGMESSAGE}; - .include Modified: head/net/linux-f10-nss_ldap/pkg-plist ============================================================================== --- head/net/linux-f10-nss_ldap/pkg-plist Fri Jul 25 21:40:24 2014 (r362934) +++ head/net/linux-f10-nss_ldap/pkg-plist Fri Jul 25 21:43:13 2014 (r362935) @@ -1,5 +1,8 @@ -usr/lib/libnss_ldap.so.2 -usr/lib/libnss_ldap.so -usr/lib/libnss_ldap-264.so etc/ldap.conf.dist +usr/lib/libnss_ldap-264.so +usr/lib/libnss_ldap.so +usr/lib/libnss_ldap.so.2 +%%PAM%%usr/share/man/man5/pam_ldap.5.gz %%PAM%%lib/security/pam_ldap.so +usr/share/man/man5/nss_ldap.5.gz +%%PAM%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/pam.d