git: f9300f8e7649 - main - net/openldap25-server: Move man pages left in ${PREFIX}/man to ${PREFIX}share/man

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Thu, 14 Mar 2024 09:11:13 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9300f8e76492e8cbb69190e8ea368103c3ae752

commit f9300f8e76492e8cbb69190e8ea368103c3ae752
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-03-14 08:33:15 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-03-14 09:08:38 +0000

    net/openldap25-server: Move man pages left in ${PREFIX}/man to ${PREFIX}share/man
    
    In commit 274e1f69724f I overlooked some man pages are still installed
    in ${PREFIX}/man. So move them to ${PREFIX}/share/man.
    
    Approved by:    portmgr (blanket)
    Fixes:          274e1f69724f
---
 net/openldap25-server/Makefile  |  5 ++---
 net/openldap25-server/pkg-plist | 18 +++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index 093141c5a5b2..b01b10ba22ce 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -46,7 +46,7 @@ GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 PORTREVISION_CLIENT=	1
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	2
 OPENLDAP_SHLIB_MAJOR=	0
 OPENLDAP_SHLIB_MINOR=	1.12
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -274,8 +274,7 @@ EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-SED_MODULES=		-e 's,mandir = \$$(exec_prefix)/share/man,mandir = $$(exec_prefix)/man,' \
-			-e 's/\(moduleload[ 	]*back_[a-z]*\)\.la/\1/' \
+SED_MODULES=		-e 's/\(moduleload[ 	]*back_[a-z]*\)\.la/\1/' \
 			-e 's/\# *\(modulepath\)/\1/'
 
 CONFIGURE_ARGS+=	--enable-modules \
diff --git a/net/openldap25-server/pkg-plist b/net/openldap25-server/pkg-plist
index 39f0c8277458..8cad7131ea45 100644
--- a/net/openldap25-server/pkg-plist
+++ b/net/openldap25-server/pkg-plist
@@ -43,7 +43,7 @@
 %%ALLOP%%libexec/openldap/allop.so
 %%ALLOP%%libexec/openldap/allop.so.0
 %%ALLOP%%libexec/openldap/allop.so.0.0.0
-%%ALLOP%%man/man5/slapo-allop.5.gz
+%%ALLOP%%share/man/man5/slapo-allop.5.gz
 %%ARGON2%%libexec/openldap/argon2-%%OPENLDAP_MAJOR%%.so.0
 %%ARGON2%%libexec/openldap/argon2-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%ARGON2%%libexec/openldap/argon2.la
@@ -68,7 +68,7 @@
 %%CLOAK%%libexec/openldap/cloak.so
 %%CLOAK%%libexec/openldap/cloak.so.0
 %%CLOAK%%libexec/openldap/cloak.so.0.0.0
-%%CLOAK%%man/man5/slapo-cloak.5.gz
+%%CLOAK%%share/man/man5/slapo-cloak.5.gz
 %%COLLECT%%libexec/openldap/collect-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%COLLECT%%libexec/openldap/collect-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%COLLECT%%libexec/openldap/collect.la
@@ -105,7 +105,7 @@
 %%EMPTYDS%%libexec/openldap/emptyds.so
 %%EMPTYDS%%libexec/openldap/emptyds.so.0
 %%EMPTYDS%%libexec/openldap/emptyds.so.0.0.0
-%%EMPTYDS%%man/man5/slapo-emptyds.5.gz
+%%EMPTYDS%%share/man/man5/slapo-emptyds.5.gz
 %%HOMEDIR%%libexec/openldap/homedir-%%OPENLDAP_MAJOR%%.so.0
 %%HOMEDIR%%libexec/openldap/homedir-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%HOMEDIR%%libexec/openldap/homedir.la
@@ -114,12 +114,12 @@
 %%LASTBIND%%libexec/openldap/lastbind.so
 %%LASTBIND%%libexec/openldap/lastbind.so.0
 %%LASTBIND%%libexec/openldap/lastbind.so.0.0.0
-%%LASTBIND%%man/man5/slapo-lastbind.5.gz
+%%LASTBIND%%share/man/man5/slapo-lastbind.5.gz
 %%LASTMOD%%libexec/openldap/lastmod.la
 %%LASTMOD%%libexec/openldap/lastmod.so
 %%LASTMOD%%libexec/openldap/lastmod.so.0
 %%LASTMOD%%libexec/openldap/lastmod.so.0.0.0
-%%LASTMOD%%man/man5/slapo-lastmod.5.gz
+%%LASTMOD%%share/man/man5/slapo-lastmod.5.gz
 %%LLOADD%%libexec/%%PORTNAME%%/lloadd-%%OPENLDAP_MAJOR%%.so.0
 %%LLOADD%%libexec/%%PORTNAME%%/lloadd-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%LLOADD%%libexec/%%PORTNAME%%/lloadd.la
@@ -132,7 +132,7 @@
 %%NOPS%%libexec/openldap/nops.so
 %%NOPS%%libexec/openldap/nops.so.0
 %%NOPS%%libexec/openldap/nops.so.0.0.0
-%%NOPS%%man/man5/slapo-nops.5.gz
+%%NOPS%%share/man/man5/slapo-nops.5.gz
 %%OTP%%libexec/openldap/otp-%%OPENLDAP_MAJOR%%.so.0
 %%OTP%%libexec/openldap/otp-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
 %%OTP%%libexec/openldap/otp.la
@@ -145,7 +145,7 @@
 %%PBKDF2%%libexec/openldap/pw-pbkdf2.so
 %%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0
 %%PBKDF2%%libexec/openldap/pw-pbkdf2.so.0.0.0
-%%PBKDF2%%man/man5/slapd-pw-pbkdf2.5.gz
+%%PBKDF2%%share/man/man5/slapd-pw-pbkdf2.5.gz
 %%PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%PERL%%libexec/openldap/back_perl.la
@@ -182,7 +182,7 @@
 %%SHA2%%libexec/openldap/pw-sha2.so
 %%SHA2%%libexec/openldap/pw-sha2.so.0
 %%SHA2%%libexec/openldap/pw-sha2.so.0.0.0
-%%SHA2%%man/man5/slapd-pw-sha2.5.gz
+%%SHA2%%share/man/man5/slapd-pw-sha2.5.gz
 %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%SLAPI%%lib/libslapi.a
@@ -192,7 +192,7 @@
 %%SMBPWD%%libexec/openldap/smbk5pwd.so
 %%SMBPWD%%libexec/openldap/smbk5pwd.so.0
 %%SMBPWD%%libexec/openldap/smbk5pwd.so.0.0.0
-%%SMBPWD%%man/man5/slapo-smbk5pwd.5.gz
+%%SMBPWD%%share/man/man5/slapo-smbk5pwd.5.gz
 %%SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%SOCK%%libexec/openldap/back_sock.la