Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Jan 2024 15:51:21 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a57a8ef5cf0f - main - net/ldapscripts: Sanitize MANPREFIX
Message-ID:  <202401221551.40MFpLPJ045751@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

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

commit a57a8ef5cf0f7ca018a50e9fb4395a337f9c7ab7
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-22 15:45:36 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-22 15:50:47 +0000

    net/ldapscripts: Sanitize MANPREFIX
    
    Approved by:    portmgr (blanket)
---
 net/ldapscripts/Makefile  |  8 ++++----
 net/ldapscripts/pkg-plist | 44 ++++++++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index ba9346c276bd..49d395f0ffb0 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ldapscripts
 PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		http://contribs.martymac.org/ldapscripts/
@@ -17,8 +17,7 @@ OPTIONS_DEFINE=	SASL DOCS
 
 USES=		iconv ldap tar:tgz
 LIBDIR=	${PREFIX}/lib/${PORTNAME}
-MAKE_ENV+=	MANDIR=${MANPREFIX}/man \
-		ETCDIR=${ETCDIR}
+MAKE_ENV+=	ETCDIR=${ETCDIR}
 
 SUB_FILES=	pkg-message
 
@@ -28,7 +27,8 @@ PORTDOCS=	README CHANGELOG VERSION TODO
 # and set paths to OpenLDAP binaries
 post-patch:
 	${REINPLACE_CMD} "s|^all:.*|all:|g" ${WRKSRC}/Makefile
-	${REINPLACE_CMD} "s|^PREFIX = .*|PREFIX = ${PREFIX}|g" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} "s|^PREFIX = .*|PREFIX = ${PREFIX}|g ; \
+		s|MANDIR =.*|MANDIR ?= ${PREFIX}/share/man|g" ${WRKSRC}/Makefile
 	${REINPLACE_CMD} \
 	-e "s|^LDAPSEARCHBIN=.*|LDAPSEARCHBIN=\"${LOCALBASE}/bin/ldapsearch\"|g" \
 	-e "s|^LDAPADDBIN=.*|LDAPADDBIN=\"${LOCALBASE}/bin/ldapadd\"|g" \
diff --git a/net/ldapscripts/pkg-plist b/net/ldapscripts/pkg-plist
index 460ec3a0efda..1d60e53410f9 100644
--- a/net/ldapscripts/pkg-plist
+++ b/net/ldapscripts/pkg-plist
@@ -25,25 +25,25 @@ sbin/ldapid
 sbin/ldapmodifygroup
 sbin/ldapmodifymachine
 sbin/ldapmodifyuser
-man/man1/ldapaddgroup.1.gz
-man/man1/ldapaddmachine.1.gz
-man/man1/ldapadduser.1.gz
-man/man1/ldapaddusertogroup.1.gz
-man/man1/ldapdeletegroup.1.gz
-man/man1/ldapdeletemachine.1.gz
-man/man1/ldapdeleteuser.1.gz
-man/man1/ldapdeleteuserfromgroup.1.gz
-man/man1/ldapfinger.1.gz
-man/man1/ldapgid.1.gz
-man/man1/ldapid.1.gz
-man/man1/ldapinit.1.gz
-man/man1/ldapmodifygroup.1.gz
-man/man1/ldapmodifymachine.1.gz
-man/man1/ldapmodifyuser.1.gz
-man/man1/ldaprenamegroup.1.gz
-man/man1/ldaprenamemachine.1.gz
-man/man1/ldaprenameuser.1.gz
-man/man1/ldapsetpasswd.1.gz
-man/man1/ldapsetprimarygroup.1.gz
-man/man1/lsldap.1.gz
-man/man5/ldapscripts.5.gz
+share/man/man1/ldapaddgroup.1.gz
+share/man/man1/ldapaddmachine.1.gz
+share/man/man1/ldapadduser.1.gz
+share/man/man1/ldapaddusertogroup.1.gz
+share/man/man1/ldapdeletegroup.1.gz
+share/man/man1/ldapdeletemachine.1.gz
+share/man/man1/ldapdeleteuser.1.gz
+share/man/man1/ldapdeleteuserfromgroup.1.gz
+share/man/man1/ldapfinger.1.gz
+share/man/man1/ldapgid.1.gz
+share/man/man1/ldapid.1.gz
+share/man/man1/ldapinit.1.gz
+share/man/man1/ldapmodifygroup.1.gz
+share/man/man1/ldapmodifymachine.1.gz
+share/man/man1/ldapmodifyuser.1.gz
+share/man/man1/ldaprenamegroup.1.gz
+share/man/man1/ldaprenamemachine.1.gz
+share/man/man1/ldaprenameuser.1.gz
+share/man/man1/ldapsetpasswd.1.gz
+share/man/man1/ldapsetprimarygroup.1.gz
+share/man/man1/lsldap.1.gz
+share/man/man5/ldapscripts.5.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401221551.40MFpLPJ045751>