- Split server and client manual pages (OpenLDAP ITS #7548) [1]

 - Minor fixup to plist

PR:		ports/176924 [1]
Submitted by:	Андрей Романенко <melanhit gmail com> [1]

5 files changed, 241 insertions, 60 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 8cc7f0e2bc6c..1d61d311e0d6 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -55,8 +55,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	8
 
 OPTIONS_DEFINE=	FETCH
@@ -480,11 +480,12 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 
 .if defined(CLIENT_ONLY)
-.include "${FILESDIR}/manpages"
+.include "${FILESDIR}/manpages.client"
 .else
 SUB_LIST+=		RC_DIR=${PREFIX} \
 			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			DATABASEDIR=${DATABASEDIR}
+.include "${FILESDIR}/manpages.server"
 .endif
 
 PLIST_SUB+=		${SUB_LIST}
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages.client
index b6010b1dcef7..5e4c4f5166a7 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages.client
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
 MAN1+=	ldapcompare.1 \
 	ldapdelete.1 \
@@ -200,59 +198,4 @@ MLINKS+= \
 
 MAN5+=	ldap.conf.5 \
 	ldif.5 \
-	slapd-bdb.5 \
-	slapd-config.5 \
-	slapd-dnssrv.5 \
-	slapd-ldap.5 \
-	slapd-ldbm.5 \
-	slapd-ldif.5 \
-	slapd-mdb.5 \
-	slapd-meta.5 \
-	slapd-monitor.5 \
-	slapd-ndb.5 \
-	slapd-null.5 \
-	slapd-passwd.5 \
-	slapd-perl.5 \
-	slapd-relay.5 \
-	slapd-shell.5 \
-	slapd-sock.5 \
-	slapd-sql.5 \
-	slapd.access.5 \
-	slapd.backends.5 \
-	slapd.conf.5 \
-	slapd.overlays.5 \
-	slapd.plugin.5 \
-	slapo-accesslog.5 \
-	slapo-auditlog.5 \
-	slapo-chain.5 \
-	slapo-collect.5 \
-	slapo-constraint.5 \
-	slapo-dds.5 \
-	slapo-dyngroup.5 \
-	slapo-dynlist.5 \
-	slapo-memberof.5 \
-	slapo-pbind.5 \
-	slapo-pcache.5 \
-	slapo-ppolicy.5 \
-	slapo-refint.5 \
-	slapo-retcode.5 \
-	slapo-rwm.5 \
-	slapo-syncprov.5 \
-	slapo-sssvlv.5 \
-	slapo-translucent.5 \
-	slapo-unique.5 \
-	slapo-valsort.5 
-MLINKS+= \
-	slapd-bdb.5 slapd-hdb.5 \
-	slapd-sock.5 slapo-sock.5
 
-MAN8+=	slapacl.8 \
-	slapadd.8 \
-	slapauth.8 \
-	slapcat.8 \
-	slapd.8 \
-	slapdn.8 \
-	slapindex.8 \
-	slappasswd.8 \
-	slapschema.8 \
-	slaptest.8
diff --git a/net/openldap24-server/files/manpages.server b/net/openldap24-server/files/manpages.server
new file mode 100644
index 000000000000..75cd08f94366
--- /dev/null
+++ b/net/openldap24-server/files/manpages.server
@@ -0,0 +1,58 @@
+# $FreeBSD$
+
+MAN5+=	slapd-bdb.5 \
+	slapd-config.5 \
+	slapd-dnssrv.5 \
+	slapd-ldap.5 \
+	slapd-ldbm.5 \
+	slapd-ldif.5 \
+	slapd-mdb.5 \
+	slapd-meta.5 \
+	slapd-monitor.5 \
+	slapd-ndb.5 \
+	slapd-null.5 \
+	slapd-passwd.5 \
+	slapd-perl.5 \
+	slapd-relay.5 \
+	slapd-shell.5 \
+	slapd-sock.5 \
+	slapd-sql.5 \
+	slapd.access.5 \
+	slapd.backends.5 \
+	slapd.conf.5 \
+	slapd.overlays.5 \
+	slapd.plugin.5 \
+	slapo-accesslog.5 \
+	slapo-auditlog.5 \
+	slapo-chain.5 \
+	slapo-collect.5 \
+	slapo-constraint.5 \
+	slapo-dds.5 \
+	slapo-dyngroup.5 \
+	slapo-dynlist.5 \
+	slapo-memberof.5 \
+	slapo-pbind.5 \
+	slapo-pcache.5 \
+	slapo-ppolicy.5 \
+	slapo-refint.5 \
+	slapo-retcode.5 \
+	slapo-rwm.5 \
+	slapo-syncprov.5 \
+	slapo-sssvlv.5 \
+	slapo-translucent.5 \
+	slapo-unique.5 \
+	slapo-valsort.5 
+MLINKS+= \
+	slapd-bdb.5 slapd-hdb.5 \
+	slapd-sock.5 slapo-sock.5
+
+MAN8+=	slapacl.8 \
+	slapadd.8 \
+	slapauth.8 \
+	slapcat.8 \
+	slapd.8 \
+	slapdn.8 \
+	slapindex.8 \
+	slappasswd.8 \
+	slapschema.8 \
+	slaptest.8
diff --git a/net/openldap24-server/files/patch-ITS7548 b/net/openldap24-server/files/patch-ITS7548
new file mode 100644
index 000000000000..bd0d013b11d1
--- /dev/null
+++ b/net/openldap24-server/files/patch-ITS7548
@@ -0,0 +1,178 @@
+--- build/man.mk.orig	2013-03-13 19:51:52.000000000 +0200
++++ build/man.mk	2013-03-13 19:52:53.000000000 +0200
+@@ -20,8 +20,7 @@
+ TMP_SUFFIX=tmp
+ 
+ all-common:
+-	PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
+-	for page in $$PAGES; do \
++	for page in ${PAGES}; do \
+ 		$(SED) -e "s%LDVERSION%$(VERSION)%" \
+ 			-e 's%ETCDIR%$(sysconfdir)%g' \
+ 			-e 's%LOCALSTATEDIR%$(localstatedir)%' \
+@@ -39,8 +38,7 @@
+ 
+ install-common:
+ 	-$(MKDIR) $(DESTDIR)$(MANDIR)
+-	PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
+-	for page in $$PAGES; do \
++	for page in ${PAGES}; do \
+ 		echo "installing $$page in $(DESTDIR)$(MANDIR)"; \
+ 		$(RM) $(DESTDIR)$(MANDIR)/$$page; \
+ 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \
+--- doc/man/man1/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
++++ doc/man/man1/Makefile.in	2013-03-13 20:30:47.000000000 +0200
+@@ -14,3 +14,20 @@
+ ## <http://www.OpenLDAP.org/license.html>.
+ 
+ MANSECT=1
++
++BUILD_SRV = @BUILD_SLAPD@
++
++.if ${BUILD_SRV} == no
++PAGES=	ldapcompare.${MANSECT}		\
++	ldapdelete.${MANSECT}		\
++	ldapexop.${MANSECT}		\
++	ldapmodify.${MANSECT}		\
++	ldapmodrdn.${MANSECT}		\
++	ldappasswd.${MANSECT}		\
++	ldapsearch.${MANSECT}		\
++	ldapurl.${MANSECT}		\
++	ldapwhoami.${MANSECT}
++.else
++PAGES=
++.endif
++
+--- doc/man/man3/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
++++ doc/man/man3/Makefile.in	2013-03-13 20:31:03.000000000 +0200
+@@ -14,3 +14,49 @@
+ ## <http://www.OpenLDAP.org/license.html>.
+ 
+ MANSECT=3
++
++BUILD_SRV = @BUILD_SLAPD@
++
++.if ${BUILD_SRV} == no
++PAGES=	lber-decode.${MANSECT}		\
++	lber-encode.${MANSECT}		\
++	lber-memory.${MANSECT}		\
++	lber-sockbuf.${MANSECT}		\
++	lber-types.${MANSECT}		\
++	ldap.${MANSECT}			\
++	ldap_abandon.${MANSECT}		\
++	ldap_add.${MANSECT}		\
++	ldap_bind.${MANSECT}		\
++	ldap_compare.${MANSECT}		\
++	ldap_controls.${MANSECT}	\
++	ldap_delete.${MANSECT}		\
++	ldap_dup.${MANSECT}		\
++	ldap_error.${MANSECT}		\
++	ldap_extended_operation.${MANSECT}	\
++	ldap_first_attribute.${MANSECT}	\
++	ldap_first_entry.${MANSECT}	\
++	ldap_first_message.${MANSECT}	\
++	ldap_first_reference.${MANSECT}	\
++	ldap_get_dn.${MANSECT}		\
++	ldap_get_option.${MANSECT}	\
++	ldap_get_values.${MANSECT}	\
++	ldap_memory.${MANSECT}		\
++	ldap_modify.${MANSECT}		\
++	ldap_modrdn.${MANSECT}		\
++	ldap_open.${MANSECT}		\
++	ldap_parse_reference.${MANSECT}	\
++	ldap_parse_result.${MANSECT}	\
++	ldap_parse_sort_control.${MANSECT}	\
++	ldap_parse_vlv_control.${MANSECT}	\
++	ldap_rename.${MANSECT}		\
++	ldap_result.${MANSECT}		\
++	ldap_schema.${MANSECT}		\
++	ldap_search.${MANSECT}		\
++	ldap_sort.${MANSECT}		\
++	ldap_sync.${MANSECT}		\
++	ldap_tls.${MANSECT}		\
++	ldap_url.${MANSECT}
++.else
++PAGES=
++.endif
++
+--- doc/man/man5/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
++++ doc/man/man5/Makefile.in	2013-03-13 20:31:37.000000000 +0200
+@@ -14,3 +14,54 @@
+ ## <http://www.OpenLDAP.org/license.html>.
+ 
+ MANSECT=5
++
++BUILD_SRV = @BUILD_SLAPD@
++
++.if ${BUILD_SRV} == no
++PAGES=	ldap.conf.${MANSECT} 		\
++	ldif.${MANSECT}
++.else
++PAGES=	slapd-bdb.${MANSECT}		\
++	slapd-config.${MANSECT}		\
++	slapd-dnssrv.${MANSECT}		\
++	slapd-ldap.${MANSECT}		\
++	slapd-ldbm.${MANSECT}		\
++	slapd-ldif.${MANSECT}		\
++	slapd-mdb.${MANSECT}		\
++	slapd-meta.${MANSECT}		\
++	slapd-monitor.${MANSECT}	\
++	slapd-ndb.${MANSECT}		\
++	slapd-null.${MANSECT}		\
++	slapd-passwd.${MANSECT}		\
++	slapd-perl.${MANSECT}		\
++	slapd-relay.${MANSECT}		\
++	slapd-shell.${MANSECT}		\
++	slapd-sock.${MANSECT}		\
++	slapd-sql.${MANSECT}		\
++	slapd.access.${MANSECT}		\
++	slapd.backends.${MANSECT}	\
++	slapd.conf.${MANSECT}		\
++	slapd.overlays.${MANSECT}	\
++	slapd.plugin.${MANSECT}		\
++	slapo-accesslog.${MANSECT}	\
++	slapo-auditlog.${MANSECT}	\
++	slapo-chain.${MANSECT}		\
++	slapo-collect.${MANSECT}	\
++	slapo-constraint.${MANSECT}	\
++	slapo-dds.${MANSECT}		\
++	slapo-dyngroup.${MANSECT}	\
++	slapo-dynlist.${MANSECT}	\
++	slapo-memberof.${MANSECT}	\
++	slapo-pbind.${MANSECT}		\
++	slapo-pcache.${MANSECT}		\
++	slapo-ppolicy.${MANSECT}	\
++	slapo-refint.${MANSECT}		\
++	slapo-retcode.${MANSECT}	\
++	slapo-rwm.${MANSECT}		\
++	slapo-sssvlv.${MANSECT}		\
++	slapo-syncprov.${MANSECT}	\
++	slapo-translucent.${MANSECT}	\
++	slapo-unique.${MANSECT}		\
++	slapo-valsort.${MANSECT}
++.endif
++
+--- doc/man/man8/Makefile.in.orig	2013-03-03 23:17:30.000000000 +0200
++++ doc/man/man8/Makefile.in	2013-03-13 20:32:07.000000000 +0200
+@@ -14,3 +14,21 @@
+ ## <http://www.OpenLDAP.org/license.html>.
+ 
+ MANSECT=8
++
++BUILD_SRV = @BUILD_SLAPD@
++
++.if ${BUILD_SRV} == no
++PAGES=	
++.else
++PAGES=	slapacl.{MANSECT}		\
++	slapadd.{MANSECT}		\
++	slapauth.{MANSECT}		\
++	slapcat.{MANSECT}		\
++	slapd.{MANSECT}			\
++	slapdn.{MANSECT}		\
++	slapindex.{MANSECT}		\
++	slappasswd.{MANSECT}		\
++	slapschema.{MANSECT}		\
++	slaptest.{MANSECT}
++.endif
++
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 23c942d40628..90e5cdfc73c0 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -37,3 +37,4 @@ lib/libldap_r-2.4.so.%%SHLIB_MAJOR%%
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
+@dirrmtry libexec/openldap