svn commit: r329102 - in head/net/openldap24-server: . files

[Xin LI]

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
  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
  
  install-conf: FORCE
-@@ -432,8 +433,6 @@
+@@ -441,8 +442,6 @@
  	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
  	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
  	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \