Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Mar 2024 09:16:22 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: d9029f1552fd - main - www/*: Move man pages to share/man
Message-ID:  <202403210916.42L9GM1p030256@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=d9029f1552fd2e59ed4492eff65f8bddc31e92fe

commit d9029f1552fd2e59ed4492eff65f8bddc31e92fe
Author:     Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2024-03-21 09:15:37 +0000
Commit:     Christian Weisgerber <naddy@FreeBSD.org>
CommitDate: 2024-03-21 09:15:37 +0000

    www/*: Move man pages to share/man
    
    Approved by:    portmgr (blanket)
---
 www/bozohttpd/Makefile                | 3 ++-
 www/bozohttpd/files/patch-Makefile    | 6 +++---
 www/http_get/Makefile                 | 3 ++-
 www/http_get/files/Makefile.bsd       | 2 +-
 www/http_load/Makefile                | 3 ++-
 www/http_load/files/Makefile.bsd      | 2 +-
 www/http_post/Makefile                | 3 ++-
 www/http_post/files/Makefile.bsd      | 2 +-
 www/mohawk/Makefile                   | 9 ++++++---
 www/mohawk/files/patch-man5__Makefile | 8 --------
 www/mohawk/files/patch-man8__Makefile | 8 --------
 www/slowcgi/Makefile                  | 5 +++--
 12 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index d35567a0bf6b..94c23a39ea75 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bozohttpd
 PORTVERSION=	20210227
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.eterna.com.au/bozohttpd/ \
 		NETBSD
@@ -17,7 +18,7 @@ USE_RC_SUBR=	bozohttpd
 MAKE_ARGS=	LDADD="${LIBS}"
 
 PLIST_FILES=	bin/bozohttpd \
-		man/man8/bozohttpd.8.gz
+		share/man/man8/bozohttpd.8.gz
 
 OPTIONS_DEFINE=		BLACKLIST CGI DAEMON DEBUG DIRINDEX\
 			DYNAMIC HTPASSWD LUA SSL USER
diff --git a/www/bozohttpd/files/patch-Makefile b/www/bozohttpd/files/patch-Makefile
index 17e5553801a6..0a96851e5973 100644
--- a/www/bozohttpd/files/patch-Makefile
+++ b/www/bozohttpd/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2020-10-15 04:35:06 UTC
+--- Makefile.orig	2021-02-28 05:20:51 UTC
 +++ Makefile
 @@ -14,7 +14,7 @@
  #	NO_SSL_SUPPORT		/* don't support ssl (https) */
@@ -28,12 +28,12 @@
  WARNS?=	4
  
 +BINDIR=$(PREFIX)/bin
-+MANDIR=$(PREFIX)/man/man
++MANDIR=$(PREFIX)/share/man/man
 +
  .if defined(.OS.MAKE)
  OPSYS=	${.OS.MAKE}
  .else
-@@ -48,9 +45,6 @@ OPSYS:=	${:!uname -s!:S/-//g:S/\///g}
+@@ -48,9 +45,6 @@ LDADD+=		-lnbutil
  CPPFLAGS+=	-DHAVE_NBUTIL_H
  LDADD+=		-lnbutil
  .endif
diff --git a/www/http_get/Makefile b/www/http_get/Makefile
index 28725cbd7c29..fab690fbb592 100644
--- a/www/http_get/Makefile
+++ b/www/http_get/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	http_get
 PORTVERSION=	1.0.20140814
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/http_get/
 DISTNAME=	${PORTNAME}_14Aug2014
@@ -13,7 +14,7 @@ USES=		uidfix
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 PLIST_FILES=	bin/http_get \
-		man/man1/http_get.1.gz
+		share/man/man1/http_get.1.gz
 
 .ifndef NO_OPENSSL
 USES+=	ssl
diff --git a/www/http_get/files/Makefile.bsd b/www/http_get/files/Makefile.bsd
index 4e29196e91b6..6494d7b538b9 100644
--- a/www/http_get/files/Makefile.bsd
+++ b/www/http_get/files/Makefile.bsd
@@ -7,6 +7,6 @@ LDFLAGS	+=	-L${OPENSSLBASE}/lib -lssl -lcrypto
 .endif
 
 BINDIR	 =	${PREFIX}/bin
-MANDIR	 =	${PREFIX}/man/man
+MANDIR	 =	${PREFIX}/share/man/man
 
 .include <bsd.prog.mk>
diff --git a/www/http_load/Makefile b/www/http_load/Makefile
index cbf5eb698e02..404729c2b244 100644
--- a/www/http_load/Makefile
+++ b/www/http_load/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	http_load
 PORTVERSION=	20160309
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/http_load/
 DISTNAME=	${PORTNAME}-09Mar2016
@@ -14,7 +15,7 @@ USES=		uidfix
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 PLIST_FILES=	bin/http_load \
-		man/man1/http_load.1.gz
+		share/man/man1/http_load.1.gz
 
 .ifndef NO_OPENSSL
 USES+=	ssl
diff --git a/www/http_load/files/Makefile.bsd b/www/http_load/files/Makefile.bsd
index 625e0af62586..3cdea5b0ea15 100644
--- a/www/http_load/files/Makefile.bsd
+++ b/www/http_load/files/Makefile.bsd
@@ -7,6 +7,6 @@ LDADD	+=	-L${OPENSSLBASE}/lib -lssl -lcrypto
 .endif
 
 BINDIR	 =	${PREFIX}/bin
-MANDIR	 =	${PREFIX}/man/man
+MANDIR	 =	${PREFIX}/share/man/man
 
 .include <bsd.prog.mk>
diff --git a/www/http_post/Makefile b/www/http_post/Makefile
index 7e8f43413ed3..92987974b1de 100644
--- a/www/http_post/Makefile
+++ b/www/http_post/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	http_post
 PORTVERSION=	1.0.20140814
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/http_post/
 DISTNAME=	${PORTNAME}_14Aug2014
@@ -13,7 +14,7 @@ USES=		uidfix
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 PLIST_FILES=	bin/http_post \
-		man/man1/http_post.1.gz
+		share/man/man1/http_post.1.gz
 
 .ifndef NO_OPENSSL
 USES+=	ssl
diff --git a/www/http_post/files/Makefile.bsd b/www/http_post/files/Makefile.bsd
index 7d72745bef47..c1fb7ae4fa7b 100644
--- a/www/http_post/files/Makefile.bsd
+++ b/www/http_post/files/Makefile.bsd
@@ -7,6 +7,6 @@ LDFLAGS	+=	-L${OPENSSLBASE}/lib -lssl -lcrypto
 .endif
 
 BINDIR	 =	${PREFIX}/bin
-MANDIR	 =	${PREFIX}/man/man
+MANDIR	 =	${PREFIX}/share/man/man
 
 .include <bsd.prog.mk>
diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile
index a587890949a6..bdf082a6616b 100644
--- a/www/mohawk/Makefile
+++ b/www/mohawk/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mohawk
 DISTVERSION=	2.0.21
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://fossil.bsdsx.fr/mohawk/tarball/?r=${DISTVERSION}&name=/
 
@@ -16,11 +17,13 @@ USE_RC_SUBR=	mohawk
 
 CFLAGS+=	-I${LOCALBASE}/include/event2/compat
 
+MAKE_ARGS=	MANDIR="${PREFIX}/share/man/man"
+
 PLIST_FILES=	bin/mhtpasswd \
-		man/man5/mohawk.conf.5.gz \
-		man/man8/mhtpasswd.8.gz \
-		man/man8/mohawk.8.gz \
 		sbin/mohawk \
+		share/man/man5/mohawk.conf.5.gz \
+		share/man/man8/mhtpasswd.8.gz \
+		share/man/man8/mohawk.8.gz \
 		etc/mohawk.conf.sample
 
 PORTEXAMPLES=	*
diff --git a/www/mohawk/files/patch-man5__Makefile b/www/mohawk/files/patch-man5__Makefile
deleted file mode 100644
index 3dac07424ee4..000000000000
--- a/www/mohawk/files/patch-man5__Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- man5/Makefile.orig	2021-09-25 06:45:21 UTC
-+++ man5/Makefile
-@@ -1,4 +1,5 @@
- MAN= mohawk.conf.5
-+SHAREDIR=	${PREFIX}
- NO_OBJ=
- 
- .include <bsd.prog.mk>
diff --git a/www/mohawk/files/patch-man8__Makefile b/www/mohawk/files/patch-man8__Makefile
deleted file mode 100644
index 1170f1108b86..000000000000
--- a/www/mohawk/files/patch-man8__Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- man8/Makefile.orig	2021-09-25 06:45:21 UTC
-+++ man8/Makefile
-@@ -1,4 +1,5 @@
- MAN= mhtpasswd.8 mohawk.8
-+SHAREDIR=	${PREFIX}
- NO_OBJ=
- 
- .include <bsd.prog.mk>
diff --git a/www/slowcgi/Makefile b/www/slowcgi/Makefile
index 5b5cd9e4d7fc..512d11386f3f 100644
--- a/www/slowcgi/Makefile
+++ b/www/slowcgi/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	slowcgi
 PORTVERSION=	7.1.20220916
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	koue@chaosophia.net
@@ -18,7 +19,7 @@ GH_PROJECT=	slowcgi
 
 USE_RC_SUBR=	slowcgi
 
-MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
+MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/share/man/man
 
 CFLAGS+=	-Wall -I${PREFIX}/include
 
@@ -30,6 +31,6 @@ USERS=		www
 GROUPS=		www
 
 PLIST_FILES=	sbin/slowcgi \
-		man/man8/slowcgi.8.gz
+		share/man/man8/slowcgi.8.gz
 
 .include <bsd.port.mk>



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