From owner-svn-ports-head@FreeBSD.ORG  Sat Jun 15 10:42:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CBF7ACCF;
 Sat, 15 Jun 2013 10:42:49 +0000 (UTC) (envelope-from az@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BEAEB112D;
 Sat, 15 Jun 2013 10:42:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5FAgnjl033349;
 Sat, 15 Jun 2013 10:42:49 GMT (envelope-from az@svn.freebsd.org)
Received: (from az@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5FAgnd1033348;
 Sat, 15 Jun 2013 10:42:49 GMT (envelope-from az@svn.freebsd.org)
Message-Id: <201306151042.r5FAgnd1033348@svn.freebsd.org>
From: Andrej Zverev <az@FreeBSD.org>
Date: Sat, 15 Jun 2013 10:42:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320982 - head/net/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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Jun 2013 10:42:49 -0000

Author: az
Date: Sat Jun 15 10:42:49 2013
New Revision: 320982
URL: http://svnweb.freebsd.org/changeset/ports/320982

Log:
  - Prevent situation which leads to overriding configuration file on reinstall.
  
  PR:		ports/179047
  Submitted by:	Anton Yuzhaninov <ayuzhaninov@openstat.ru>
  Approved by:	maintainer (timeout)

Modified:
  head/net/nss_ldap/Makefile   (contents, props changed)

Modified: head/net/nss_ldap/Makefile
==============================================================================
--- head/net/nss_ldap/Makefile	Sat Jun 15 09:41:38 2013	(r320981)
+++ head/net/nss_ldap/Makefile	Sat Jun 15 10:42:49 2013	(r320982)
@@ -75,9 +75,9 @@ do-install:
 	${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 [ ! -f ${PREFIX}/etc/nss_ldap.conf ]; then \
+		${CP} -pv ${PREFIX}/etc/nss_ldap.conf.sample ${PREFIX}/etc/nss_ldap.conf ; \
+	fi
 .if !defined(PACKAGE_BUILDING)
 	@${CAT} ${PKGMESSAGE}
 .endif