*/*: convert Makefile patches to MAKE_ARGS after "Move man pages to s…

…hare/man" Replaced patches for Makefiles with "MAKE_ARGS+=MANDIR=${PREFIX}/share/man" Reported by: danfe, mat Approved by: portmgr (blanket)
freebsd · Mar 10, 2024 · 79f8f9c · 79f8f9c
1 parent 4747a5b
commit 79f8f9c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 52 deletions.
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
@@ -14,6 +14,8 @@ LICENSE=	BSD3CLAUSE
 
 USES=		cpe
 
+MAKE_ARGS+=	MANDIR=${PREFIX}/share/man/man
+
 CPE_VENDOR=	mpd_project
 
 OPTIONS_DEFINE=	DOCS NG_IPACCT RADIUS

diff --git a/net/mpd5/files/patch-doc_Makefile b/net/mpd5/files/patch-doc_Makefile
diff --git a/ports-mgmt/dialog4ports/Makefile b/ports-mgmt/dialog4ports/Makefile
@@ -16,6 +16,8 @@ LICENSE=	BSD2CLAUSE
 
 USES=		uidfix
 
+MAKE_ARGS+=	MAN1DIR=${PREFIX}/share/man/man1
+
 # CCACHE has options, so may need d4p, make d4p not ccache friendly
 # to avoid circular dependency
 NO_CCACHE=	yes

diff --git a/ports-mgmt/dialog4ports/files/patch-Makefile b/ports-mgmt/dialog4ports/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	2016-07-08 14:49:08 UTC
 +++ Makefile
-@@ -5,10 +5,15 @@ RM?=		rm
+@@ -5,7 +5,12 @@ RM?=		rm
  MAN=		${PROG}.1.gz
  PROG=		dialog4ports
  CFLAGS+=	-Wall -pedantic
@@ -13,8 +13,4 @@
 +LDADD+=		-lm
  PREFIX?=	/usr/local
  BINDIR=		${PREFIX}/bin
--MAN1DIR=	${PREFIX}/man/man1
-+MAN1DIR=	${PREFIX}/share/man/man1
- BSD_INSTALL_PROGRAM?=	install -m 0555
- BSD_INSTALL_DATA?=	install -m 0444
-
+ MAN1DIR=	${PREFIX}/man/man1
diff --git a/security/unix-selfauth-helper/Makefile b/security/unix-selfauth-helper/Makefile
@@ -12,6 +12,8 @@ LICENSE=	BSD2CLAUSE
 
 USES=		tar:xz
 
+MAKE_ARGS+=	MANDIR=${PREFIX}/share/man/man
+
 PLIST_FILES=	etc/pam.d/unix-selfauth \
 		libexec/unix-selfauth-helper \
 		share/man/man8/unix-selfauth-helper.8.gz

diff --git a/security/unix-selfauth-helper/files/patch-Makefile b/security/unix-selfauth-helper/files/patch-Makefile
diff --git a/sysutils/lmmon/Makefile b/sysutils/lmmon/Makefile
@@ -11,7 +11,7 @@ LICENSE=	BSD2CLAUSE
 
 USES=		ncurses uidfix
 GNU_CONFIGURE=	yes
-MAKE_ARGS+=	LDFLAGS="${LDFLAGS} -lncurses"
+MAKE_ARGS+=	LDFLAGS="${LDFLAGS} -lncurses" MANDIR=${PREFIX}/share/man/man
 
 ONLY_FOR_ARCHS=	i386 amd64
 

diff --git a/sysutils/lmmon/files/patch-Makefile.in b/sysutils/lmmon/files/patch-Makefile.in
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
@@ -21,7 +21,7 @@ ALTQ_DESC=	ALTQ support for queue statistics
 
 .include <bsd.port.options.mk>
 
-MAKE_ARGS=	LOCALBASE="${PREFIX}"
+MAKE_ARGS=	LOCALBASE="${PREFIX}" MANDIR=${PREFIX}/share/man/man
 
 CFLAGS+=	-DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1
 

diff --git a/sysutils/pftop/files/patch-Makefile b/sysutils/pftop/files/patch-Makefile