From owner-svn-ports-all@FreeBSD.ORG Wed Jun 25 05:18:09 2014 Return-Path: Delivered-To: svn-ports-all@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 26C72E25; Wed, 25 Jun 2014 05:18:09 +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 148A829DA; Wed, 25 Jun 2014 05:18:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5P5I8Nu081086; Wed, 25 Jun 2014 05:18:08 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5P5I8Hv081075; Wed, 25 Jun 2014 05:18:08 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201406250518.s5P5I8Hv081075@svn.freebsd.org> From: Olli Hauer Date: Wed, 25 Jun 2014 05:18:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359184 - in head/net/nss-pam-ldapd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2014 05:18:09 -0000 Author: ohauer Date: Wed Jun 25 05:18:07 2014 New Revision: 359184 URL: http://svnweb.freebsd.org/changeset/ports/359184 QAT: https://qat.redports.org/buildarchive/r359184/ Log: - fix pkg-plist - use @sample macro in pkg-plist - bump PORTREVSION PR: 190830 Submitted by: ohauer Approved by: zi (maintainer) Added: head/net/nss-pam-ldapd/files/patch-Makefile.in (contents, props changed) Modified: head/net/nss-pam-ldapd/Makefile head/net/nss-pam-ldapd/files/pkg-message.in head/net/nss-pam-ldapd/pkg-plist Modified: head/net/nss-pam-ldapd/Makefile ============================================================================== --- head/net/nss-pam-ldapd/Makefile Wed Jun 25 05:04:07 2014 (r359183) +++ head/net/nss-pam-ldapd/Makefile Wed Jun 25 05:18:07 2014 (r359184) @@ -3,6 +3,7 @@ PORTNAME= nss-pam-ldapd PORTVERSION= 0.8.14 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \ http://mirrors.rit.edu/zi/ @@ -111,10 +112,7 @@ post-configure: show-pkgmessage:: @${ECHO_CMD}; ${CAT} ${PKGMESSAGE} | ${FMT} 75 79; ${ECHO_CMD} -# We take care of the sample file, upstream install target installs the actual -# file if it does not exist yet. post-install: show-pkgmessage - @${INSTALL_DATA} ${WRKSRC}/nslcd.conf ${STAGEDIR}${PREFIX}/etc/nslcd.conf.sample .if ${PORT_OPTIONS:MNSS} @${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${STAGEDIR}${PREFIX}/lib/nss_ldap.so .endif Added: head/net/nss-pam-ldapd/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/nss-pam-ldapd/files/patch-Makefile.in Wed Jun 25 05:18:07 2014 (r359184) @@ -0,0 +1,11 @@ +--- ./Makefile.in.orig 2014-06-09 14:12:14.000000000 +0200 ++++ ./Makefile.in 2014-06-09 14:12:30.000000000 +0200 +@@ -849,7 +849,7 @@ + echo "$(DESTDIR)$(NSLCD_CONF_PATH) already exists, install will not overwrite"; \ + else \ + $(mkinstalldirs) `dirname $(DESTDIR)$(NSLCD_CONF_PATH)`; \ +- $(INSTALL) -m 600 $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH); \ ++ $(INSTALL) -m 600 $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH).sample; \ + fi + uninstall-nslcd_conf: + -rm -f $(DESTDIR)$(NSLCD_CONF_PATH) Modified: head/net/nss-pam-ldapd/files/pkg-message.in ============================================================================== --- head/net/nss-pam-ldapd/files/pkg-message.in Wed Jun 25 05:04:07 2014 (r359183) +++ head/net/nss-pam-ldapd/files/pkg-message.in Wed Jun 25 05:18:07 2014 (r359184) @@ -15,7 +15,7 @@ To start nslcd add nslcd_enable="YES" to If you also want to supervise the nslcd daemon add nslcd_supervisor="YES" to rc.conf as well. -NOTE: supervision requires FreeBSD 9.1 or greater. +NOTE: supervision requires FreeBSD 8.4, 9.1 or greater. See the comments in %%PREFIX%%/etc/rc.d/nslcd for additional tunables. ===================================================================== Modified: head/net/nss-pam-ldapd/pkg-plist ============================================================================== --- head/net/nss-pam-ldapd/pkg-plist Wed Jun 25 05:04:07 2014 (r359183) +++ head/net/nss-pam-ldapd/pkg-plist Wed Jun 25 05:18:07 2014 (r359184) @@ -1,11 +1,9 @@ -@unexec if cmp -s %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; then rm -f %D/etc/%%CONFIG%%; fi -etc/%%CONFIG%%.sample +@sample etc/%%CONFIG%%.sample %%NSS%%lib/nss_ldap.so %%NSS%%lib/nss_ldap.so.%%NSS_LDAP_SHMAJOR%% -%%NSLCD%%sbin/nslcd -%%NSLCD%%man/man8/nslcd.8.gz -%%NSLCD%%man/man5/nslcd.conf.5.gz %%PAM%%lib/pam_ldap.so %%PAM%%lib/pam_ldap.so.%%PAM_LDAP_SHMAJOR%% +%%NSLCD%%man/man5/nslcd.conf.5.gz +%%NSLCD%%man/man8/nslcd.8.gz %%PAM%%man/man8/pam_ldap.8.gz -@exec if [ ! -f %D/etc/%%CONFIG%% ]; then cp -p %D/etc/%%CONFIG%%.sample %D/etc/%%CONFIG%%; fi +%%NSLCD%%sbin/nslcd