Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Mar 2024 08:30:42 GMT
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4b36bba2e55a - main - security/*: Move man pages to share/man
Message-ID:  <202403210830.42L8UgKa055131@gitrepo.freebsd.org>

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

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

commit 4b36bba2e55a1208c374980564253a72c498fa38
Author:     Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2024-03-21 08:29:43 +0000
Commit:     Christian Weisgerber <naddy@FreeBSD.org>
CommitDate: 2024-03-21 08:29:43 +0000

    security/*: Move man pages to share/man
    
    Approved by:    portmgr (blanket)
---
 security/kc/Makefile                                 |  5 ++++-
 security/pam_mkhomedir/Makefile                      |  5 ++++-
 security/pam_ocra/Makefile                           |  7 +++++--
 security/pam_search_list/Makefile                    |  6 ++++--
 security/rndpassw/Makefile                           |  3 ++-
 security/rndpassw/files/patch-doc_man_CMakeLists.txt | 10 ++++++++++
 security/sst/Makefile                                |  3 ++-
 security/sst/files/Makefile                          |  2 +-
 8 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/security/kc/Makefile b/security/kc/Makefile
index 998f00b3c4dc..0f963080cf83 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=		kc
 PORTVERSION=		2.5.3
+PORTREVISION=		1
 CATEGORIES=		security
 
 MAINTAINER=		leva@ecentrum.hu
@@ -33,8 +34,10 @@ USES+=			pkgconfig ncurses ssl uidfix
 USE_GITHUB=		yes
 GH_ACCOUNT=		levaidaniel
 
-PLIST_FILES=		bin/kc man/man1/kc.1.gz share/doc/kc/Changelog.md
+PLIST_FILES=		bin/kc share/doc/kc/Changelog.md share/man/man1/kc.1.gz
 
+MAKE_ARGS=		BINDIR="${PREFIX}/bin" \
+			MANDIR="${PREFIX}/share/man/man"
 MAKE_ENV+=		BUNDLED_BCRYPT=y
 
 post-patch:
diff --git a/security/pam_mkhomedir/Makefile b/security/pam_mkhomedir/Makefile
index d60831a05ff9..da329ed33782 100644
--- a/security/pam_mkhomedir/Makefile
+++ b/security/pam_mkhomedir/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pam_mkhomedir
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://portal-to-web.de/pam_mkhomedir/
 
@@ -11,7 +12,9 @@ SUB_FILES=	pkg-message
 
 PLIST_FILES=	lib/pam_mkhomedir.so \
 		lib/pam_mkhomedir.so.2 \
-		man/man8/pam_mkhomedir.8.gz
+		share/man/man8/pam_mkhomedir.8.gz
+
+MAKE_ARGS=	MANDIR="${PREFIX}/share/man/man"
 
 .if defined(WITH_PROFILE)
 PLIST_FILES+=	lib/libpam_mkhomedir_p.a
diff --git a/security/pam_ocra/Makefile b/security/pam_ocra/Makefile
index 64b1ecdc8d80..b6a793039eb2 100644
--- a/security/pam_ocra/Makefile
+++ b/security/pam_ocra/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pam_ocra
 DISTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	sg2342@googlemail.com
@@ -16,11 +17,13 @@ GH_ACCOUNT=	sg2342
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
+MAKE_ARGS=	MANDIR="${PREFIX}/share/man/man"
+
 PLIST_FILES=	lib/pam_ocra.so \
 		lib/pam_ocra.so.0 \
 		sbin/ocra_tool \
-		man/man8/pam_ocra.8.gz \
-		man/man8/ocra_tool.8.gz
+		share/man/man8/pam_ocra.8.gz \
+		share/man/man8/ocra_tool.8.gz
 
 .include <bsd.port.options.mk>
 
diff --git a/security/pam_search_list/Makefile b/security/pam_search_list/Makefile
index 1722818c728a..a5257a22895a 100644
--- a/security/pam_search_list/Makefile
+++ b/security/pam_search_list/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pam_search_list
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME:S/_/-/g}
 DISTNAME=	${PORTNAME:S/_/-/g}-${PORTVERSION}
@@ -11,10 +11,12 @@ WWW=		https://sourceforge.net/projects/pam-search-list/
 
 USES=		tar:xz uidfix
 
+MAKE_ARGS=	MANDIR="${PREFIX}/share/man/man"
+
 PLIST_FILES=	lib/libpam_search_list.a \
 		lib/pam_search_list.so \
 		lib/pam_search_list.so.0 \
-		man/man8/pam_search_list.8.gz
+		share/man/man8/pam_search_list.8.gz
 
 OPTIONS_DEFINE=	PROFILE
 
diff --git a/security/rndpassw/Makefile b/security/rndpassw/Makefile
index e2d1e0515473..6564ab1326b0 100644
--- a/security/rndpassw/Makefile
+++ b/security/rndpassw/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rndpassw
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	melanhit@gmail.com
@@ -15,6 +16,6 @@ GH_ACCOUNT=	melanhit
 USES=		cmake
 
 PLIST_FILES=	bin/rndpassw \
-		man/man1/rndpassw.1.gz
+		share/man/man1/rndpassw.1.gz
 
 .include <bsd.port.mk>
diff --git a/security/rndpassw/files/patch-doc_man_CMakeLists.txt b/security/rndpassw/files/patch-doc_man_CMakeLists.txt
new file mode 100644
index 000000000000..c1070797b8a9
--- /dev/null
+++ b/security/rndpassw/files/patch-doc_man_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- doc/man/CMakeLists.txt.orig	2024-03-21 08:25:18 UTC
++++ doc/man/CMakeLists.txt
+@@ -16,6 +16,6 @@ foreach(manpage ${man1_src})
+ 
+ foreach(manpage ${man1_src})
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${manpage}.gz
+-            DESTINATION man/man1)
++            DESTINATION share/man/man1)
+ endforeach()
+ 
diff --git a/security/sst/Makefile b/security/sst/Makefile
index 9e7f37755fb1..a3da73182d53 100644
--- a/security/sst/Makefile
+++ b/security/sst/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sst
 PORTVERSION=	1.26
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://utcc.utoronto.ca/~pkern/stuff/sst/
 
@@ -15,6 +16,6 @@ MAKEFILE=	${FILESDIR}/Makefile
 USES=		uidfix ssl tar:xz
 
 PLIST_FILES=	sbin/sst \
-		man/man1/sst.1.gz
+		share/man/man1/sst.1.gz
 
 .include <bsd.port.mk>
diff --git a/security/sst/files/Makefile b/security/sst/files/Makefile
index 53f82fe5b786..c8fb5b04a31f 100644
--- a/security/sst/files/Makefile
+++ b/security/sst/files/Makefile
@@ -1,7 +1,7 @@
 PROG=sst
 
 BINDIR=${PREFIX}/sbin
-MANDIR=${PREFIX}/man/man
+MANDIR=${PREFIX}/share/man/man
 
 CFLAGS+=	-DCONFDIR='"${OPENSSLDIR}"' -DCERTF='"certs/sst.pem"' \
 		-I${OPENSSLINC} -Wno-comment



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