diff options
| author | delphij <delphij@FreeBSD.org> | 2013-10-03 03:51:11 +0800 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-10-03 03:51:11 +0800 |
| commit | dd0734bb6489516a8453f4cffad62431e20c148d (patch) | |
| tree | 862938dd24cb05d7ea23666cf653566206b0003b | |
| parent | e431eb82c0c8ae813c0a28421fe985aae66c4a7f (diff) | |
| download | freebsd-ports-gnome-dd0734bb6489516a8453f4cffad62431e20c148d.tar.gz freebsd-ports-gnome-dd0734bb6489516a8453f4cffad62431e20c148d.tar.zst freebsd-ports-gnome-dd0734bb6489516a8453f4cffad62431e20c148d.zip | |
Don't overwrite existing schema when they already do.
PR: ports/177016
Submitted by: pclin
| -rw-r--r-- | net/openldap24-server/Makefile | 2 | ||||
| -rw-r--r-- | net/openldap24-server/files/patch-servers::slapd::Makefile.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 8fabbe00f08e..e2b7884421e8 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -56,7 +56,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 2 OPENLDAP_SHLIB_MAJOR= 8 OPTIONS_DEFINE= FETCH diff --git a/net/openldap24-server/files/patch-servers::slapd::Makefile.in b/net/openldap24-server/files/patch-servers::slapd::Makefile.in index 9987a5cd27db..6444fb575208 100644 --- a/net/openldap24-server/files/patch-servers::slapd::Makefile.in +++ b/net/openldap24-server/files/patch-servers::slapd::Makefile.in @@ -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 \ |