Mechanically replaced man/* with ${PKGMANDIR}/* in the definition of

INSTALLATION_DIRS, as well as all occurrences of ${PREFIX}/man with
${PREFIX}/${PKGMANDIR}.

Fixes PR 35265, although I did not use the patch provided therein.

8 files changed, 25 insertions, 25 deletions

diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile
index 09e47a00775..c1b21573871 100644
--- a/editors/ce-x11/Makefile
+++ b/editors/ce-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:55 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:52 rillig Exp $
 #
 
 .include "../../editors/ce/Makefile.common"
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 BUILD_TARGET=		xce
 INSTALL_TARGET=		install-x11 man-install-x11
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/editors/ce/Makefile b/editors/ce/Makefile
index 7749dd14102..6638e580c68 100644
--- a/editors/ce/Makefile
+++ b/editors/ce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/11 10:07:49 ghen Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:52 rillig Exp $
 #
 
 .include "Makefile.common"
@@ -15,7 +15,7 @@ REPLACE_FILES.bash=	teach-ce.in
 BUILD_TARGET=		ce
 INSTALL_TARGET=		install man-install
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index 7620da6c70f..da25e771ed8 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:31 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=	ee-1.4.6.src
@@ -13,10 +13,10 @@ COMMENT=	Easy to use text editor
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ee ${PREFIX}/bin/easyedit
-	${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/man/man1/easyedit.1
+	${INSTALL_MAN} ${WRKSRC}/ee.1 ${PREFIX}/${PKGMANDIR}/man1/easyedit.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/heme/Makefile b/editors/heme/Makefile
index 296d304f1c0..8dc39b88de0 100644
--- a/editors/heme/Makefile
+++ b/editors/heme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:56 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=		heme-0.4
@@ -16,12 +16,12 @@ BUILD_TARGET=		heme
 USE_NCURSES=		# mvwchgat
 USE_TOOLS+=		gmake
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../devel/ncurses/buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/heme ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/heme.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/heme.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 8713e6539bf..06f081c7ba8 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:31 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=	hnb-1.9.17
@@ -17,11 +17,11 @@ USE_TOOLS+=		gmake
 BUILD_DIRS=		${WRKSRC}/src
 BUILD_TARGET=		hnb
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 35ff75c9ce4..ee10a89a6ab 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=	manedit-0.5.6
@@ -20,7 +20,7 @@ MAKE_ENV+=	CPP=${CXX:Q}
 # The FreeBSD makefile may be used as "generic UNIX".
 MAKE_FILE=	Makefile.FreeBSD
 
-INSTALLATION_DIRS=	bin man/man1 man/man7
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man7
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/manedit ${PREFIX}/bin
@@ -29,11 +29,11 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/manedit			\
 		${PREFIX}/share/manedit/templates			\
 		${PREFIX}/share/manedit/icons
-	${INSTALL_MAN} ${WRKSRC}/manedit.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/manedit.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/help/manpage_writing_procedures	\
-		${PREFIX}/man/man7/manpage_writing_procedures.7
+		${PREFIX}/${PKGMANDIR}/man7/manpage_writing_procedures.7
 	${INSTALL_MAN} ${WRKSRC}/help/manpage_xml_referance		\
-		${PREFIX}/man/man7/manpage_xml_reference.7
+		${PREFIX}/${PKGMANDIR}/man7/manpage_xml_reference.7
 	cd ${WRKSRC}/templates && ${INSTALL_DATA} api.mpt config.mpt	\
 		intro.mpt program.mpt ${PREFIX}/share/manedit/templates
 	cd ${WRKSRC} && ${INSTALL_DATA} manedit.xpm			\
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 4e15d384f2a..624c5836f06 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:52 rillig Exp $
 
 DISTNAME=	ne-1.31
 CATEGORIES=	editors
@@ -15,11 +15,11 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 BUILD_TARGET=	NetBSD ne
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nenewp ${PREFIX}/bin/ne
-	${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 ${PREFIX}/man/man1/ne.1
+	${INSTALL_MAN} ${_DISTDIR}/ne.manpage.1 ${PREFIX}/${PKGMANDIR}/man1/ne.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ne
 	${INSTALL_DATA} ${_DISTDIR}/NE.spec.ascii ${_DISTDIR}/NE.changes.spec \
 		${WRKSRC}/LICENCE ${PREFIX}/share/doc/ne
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 2ddad2af5a1..ab859c45f7b 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/11/06 11:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2007/01/07 09:13:52 rillig Exp $
 
 DISTNAME=	nedit-${VERS}-src
 PKGNAME=	nedit-${VERS}
@@ -20,13 +20,13 @@ VERS=		5.5
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 BUILD_TARGET=		netbsd
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/source/nedit ${DESTDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/source/nc ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${DESTDIR}${PREFIX}/man/man1/nedit.1
-	${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${DESTDIR}${PREFIX}/man/man1/nedit-nc.1
+	${INSTALL_MAN} ${WRKSRC}/doc/nedit.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nedit.1
+	${INSTALL_MAN} ${WRKSRC}/doc/nc.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nedit-nc.1
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/nedit
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/nedit
 	${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${DESTDIR}${PREFIX}/share/doc/nedit