From owner-svn-ports-all@FreeBSD.ORG Wed Oct 2 20:18:10 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 87E4BD17; Wed, 2 Oct 2013 20:18:10 +0000 (UTC) (envelope-from crees@physics.org) Received: from mk-outboundfilter-1.mail.uk.tiscali.com (mk-outboundfilter-1.mail.uk.tiscali.com [212.74.114.37]) by mx1.freebsd.org (Postfix) with ESMTP id 5523925CB; Wed, 2 Oct 2013 20:18:08 +0000 (UTC) X-Trace: 20746391/mk-outboundfilter-1.mail.uk.tiscali.com/PIPEX/$ON_NET_AUTH_ACCEPTED/Talk_Talk_Customer/2.102.106.185/None/crees@physics.org X-SBRS: None X-RemoteIP: 2.102.106.185 X-IP-MAIL-FROM: crees@physics.org X-SMTP-AUTH: bayofrum@uwclub.net X-MUA: Mozilla/5.0 (Windows NT 6.0; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 X-IP-BHB: Once X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArsGAAp/TFICZmq5/2dsb2JhbABZgwc4DgODar4ECoEOF3SCJQEBBSMVHiIBEAsUBAICBRYLAgIJAwIBAgEnHgYBDAEHAQEFiAEIqzSSLYEpjXUzBy6CPIE5A5kwhHIUi0qDJTs X-IPAS-Result: ArsGAAp/TFICZmq5/2dsb2JhbABZgwc4DgODar4ECoEOF3SCJQEBBSMVHiIBEAsUBAICBRYLAgIJAwIBAgEnHgYBDAEHAQEFiAEIqzSSLYEpjXUzBy6CPIE5A5kwhHIUi0qDJTs X-IronPort-AV: E=Sophos;i="4.90,1021,1371078000"; d="scan'208";a="20746391" X-IP-Direction: OUT Received: from host-2-102-106-185.as13285.net (HELO pegasus.bayofrum.net) ([2.102.106.185]) by smtp.pipex.tiscali.co.uk with ESMTP; 02 Oct 2013 21:18:03 +0100 Received: from [192.168.1.148] (athene.bayofrum.net [192.168.1.148]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 616D130030; Wed, 2 Oct 2013 21:16:42 +0100 (BST) Message-ID: <524C7F4D.5070103@physics.org> Date: Wed, 02 Oct 2013 21:17:17 +0100 From: Chris Rees User-Agent: Mozilla/5.0 (Windows NT 6.0; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Xin LI , pclin@FreeBSD.org Subject: Re: svn commit: r329102 - in head/net/openldap24-server: . files References: <201310021951.r92JpBHW077263@svn.freebsd.org> In-Reply-To: <201310021951.r92JpBHW077263@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-bayofrum-MailScanner-Information: Please contact the ISP for more information X-bayofrum-MailScanner-ID: 616D130030.A2182 X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-From: crees@physics.org X-Spam-Status: No Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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, 02 Oct 2013 20:18:10 -0000 On 02/10/2013 20:51, Xin LI wrote: > XXX Ports RC script present > Author: delphij > Date: Wed Oct 2 19:51:11 2013 > New Revision: 329102 > URL: http://svnweb.freebsd.org/changeset/ports/329102 > > Log: > Don't overwrite existing schema when they already do. > > PR: ports/177016 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=177016 > Submitted by: pclin > > Modified: > head/net/openldap24-server/Makefile > head/net/openldap24-server/files/patch-servers::slapd::Makefile.in > > Modified: head/net/openldap24-server/Makefile > ============================================================================== > --- head/net/openldap24-server/Makefile Wed Oct 2 19:49:38 2013 (r329101) > +++ head/net/openldap24-server/Makefile Wed Oct 2 19:51:11 2013 (r329102) > @@ -56,7 +56,7 @@ BROKEN= incompatible OpenLDAP version: > .endif > > PORTREVISION_CLIENT= 0 > -PORTREVISION_SERVER= 1 > +PORTREVISION_SERVER= 2 > OPENLDAP_SHLIB_MAJOR= 8 > > OPTIONS_DEFINE= FETCH > > Modified: head/net/openldap24-server/files/patch-servers::slapd::Makefile.in > ============================================================================== > --- head/net/openldap24-server/files/patch-servers::slapd::Makefile.in Wed Oct 2 19:49:38 2013 (r329101) > +++ head/net/openldap24-server/files/patch-servers::slapd::Makefile.in Wed Oct 2 19:51:11 2013 (r329102) > @@ -1,6 +1,6 @@ > --- servers/slapd/Makefile.in.orig 2008-02-11 15:26:43.000000000 -0800 > +++ servers/slapd/Makefile.in 2008-07-19 20:10:16.023473779 -0700 > -@@ -374,7 +374,6 @@ > +@@ -371,7 +371,6 @@ > > install-slapd: FORCE > -$(MKDIR) $(DESTDIR)$(libexecdir) > @@ -8,7 +8,7 @@ > $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ > slapd$(EXEEXT) $(DESTDIR)$(libexecdir) > @for i in $(SUBDIRS); do \ > -@@ -405,16 +404,18 @@ > +@@ -406,16 +405,18 @@ > touch all-cffiles > > install-schema: FORCE > @@ -28,12 +28,12 @@ > + files=`cd $(srcdir)/schema ; echo *.schema` ; \ > + for i in $$files ; do \ > + echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \ > -+ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ > ++ [ -f $$SD/$$i ] || $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ > + $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.default ; \ > done > Perhaps these should be installed as .sample ldif files instead? This patch has no effect on installing from package; they will be overwritten anyway. Chris -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.