biiiig patch for wip packages

Aleksey Cheusov <[email protected]>
Newsgroups gmane.os.netbsd.devel.pkgsrc.wip.review
Message-ID <[email protected]>
I've recently commited the following changes and hope that nobody is
against it.  This replaces 'man/' with '${PKGMANDIR}/' in
${INSTALL_MAN} command.


-- 
Best regards, Aleksey Cheusov.
wip.patch (text/x-patch, 53.9 KB)
? metamail
? wip.patch
? dictem/work.i386
Index: acpid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/acpid/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- acpid/Makefile	14 Mar 2006 01:27:57 -0000	1.7
+++ acpid/Makefile	20 Apr 2006 13:23:17 -0000
@@ -18,7 +18,7 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/acpid ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/acpi_listen ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/acpid.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/acpid.8 ${PREFIX}/${PKGMANDIR}/man8/
 	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/acpid
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/acpid/
 	${CP} -rf ${WRKSRC}/samples/* ${PREFIX}/share/examples/acpid/
Index: apachebench2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/apachebench2/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- apachebench2/Makefile	14 Mar 2006 01:27:58 -0000	1.9
+++ apachebench2/Makefile	20 Apr 2006 13:23:17 -0000
@@ -25,7 +25,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/support/ab ${PREFIX}/sbin/apachebench2
-	${INSTALL_MAN} ${WRKSRC}/docs/man/ab.8 ${PREFIX}/man/man8/apachebench2.8
+	${INSTALL_MAN} ${WRKSRC}/docs/man/ab.8 ${PREFIX}/${PKGMANDIR}/man8/apachebench2.8
 
 .include "../../www/apache2/Makefile.common"
 .include "../../security/openssl/buildlink3.mk"
Index: atftp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/atftp/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- atftp/Makefile	2 Nov 2005 17:59:59 -0000	1.3
+++ atftp/Makefile	20 Apr 2006 13:23:17 -0000
@@ -15,9 +15,9 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/atftp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/atftp.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/atftp.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/atftpd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/atftpd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/atftpd.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: bmap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/bmap/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- bmap/Makefile	2 Nov 2005 18:00:01 -0000	1.2
+++ bmap/Makefile	20 Apr 2006 13:23:17 -0000
@@ -14,7 +14,7 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bmap ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/slacker ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/man2/libbmap.2 ${PREFIX}/man/man2/
+	${INSTALL_MAN} ${WRKSRC}/man/man2/libbmap.2 ${PREFIX}/${PKGMANDIR}/man2/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bmap
 	${INSTALL_DATA} ${WRKSRC}/bmap.sgml ${PREFIX}/share/doc/bmap/
 	${INSTALL_DATA} ${WRKSRC}/bmap-invoke.sgml ${PREFIX}/share/doc/bmap/
Index: c-news/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/c-news/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- c-news/Makefile	14 Mar 2006 01:27:58 -0000	1.11
+++ c-news/Makefile	20 Apr 2006 13:23:17 -0000
@@ -121,13 +121,13 @@
 	${CHOWN} news:news ${CNEWSBIN:Q}/input/newsspool
 	${CHMOD} 6555 ${CNEWSBIN:Q}/input/newsspool
 .for i in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/man/man1/${i:R:Q}.1
+	${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/${PKGMANDIR}/man1/${i:R:Q}.1
 .endfor
 .for i in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/man/man5/${i:R:Q}.5
+	${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/${PKGMANDIR}/man5/${i:R:Q}.5
 .endfor
 .for i in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/man/man8/${i:R:Q}.8
+	${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/${PKGMANDIR}/man8/${i:R:Q}.8
 .endfor
 	# install docs:
 	${INSTALL_MAN_DIR} ${PREFIX:Q}/share/doc/cnews
Index: cawf/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cawf/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- cawf/Makefile	28 Nov 2005 00:27:23 -0000	1.3
+++ cawf/Makefile	20 Apr 2006 13:23:17 -0000
@@ -32,8 +32,8 @@
 	${INSTALL_DATA}	${WRKSRC}/ms.mac ${CAWFLIB}
 	${INSTALL_PROGRAM} ${WRKSRC}/cawf ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bsfilt ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/cawf.1 ${PREFIX}/man/man1/cawf.1
-	${INSTALL_MAN} ${WRKSRC}/bsfilt.1 ${PREFIX}/man/man1/bsfilt.1
+	${INSTALL_MAN} ${WRKSRC}/cawf.1 ${PREFIX}/${PKGMANDIR}/man1/cawf.1
+	${INSTALL_MAN} ${WRKSRC}/bsfilt.1 ${PREFIX}/${PKGMANDIR}/man1/bsfilt.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cawf
 	${INSTALL_DATA} ${WRKSRC}/00readme ${PREFIX}/share/doc/cawf/README
 	${INSTALL_DATA} ${WRKSRC}/00diffs ${PREFIX}/share/doc/cawf/roff-differences.txt
Index: compare/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/compare/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- compare/Makefile	24 May 2005 10:29:26 -0000	1.5
+++ compare/Makefile	20 Apr 2006 13:23:17 -0000
@@ -13,8 +13,8 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/compare/OBJ/*/compare ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/compare/compare.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/man/man4/makefiles.4 ${PREFIX}/man/man4/
-	${INSTALL_MAN} ${WRKSRC}/man/man4/makerules.4 ${PREFIX}/man/man4/
+	${INSTALL_MAN} ${WRKSRC}/compare/compare.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/man/man4/makefiles.4 ${PREFIX}/${PKGMANDIR}/man4/
+	${INSTALL_MAN} ${WRKSRC}/man/man4/makerules.4 ${PREFIX}/${PKGMANDIR}/man4/
 
 .include "../../mk/bsd.pkg.mk"
Index: copytape/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/copytape/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- copytape/Makefile	3 Nov 2005 14:13:13 -0000	1.6
+++ copytape/Makefile	20 Apr 2006 13:23:17 -0000
@@ -23,7 +23,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/copytape ${PREFIX}/bin/copytape
-	${INSTALL_MAN} ${WRKSRC}/copytape.1 ${PREFIX}/man/man1/copytape.1
-	${INSTALL_MAN} ${WRKSRC}/copytape.5 ${PREFIX}/man/man5/copytape.5
+	${INSTALL_MAN} ${WRKSRC}/copytape.1 ${PREFIX}/${PKGMANDIR}/man1/copytape.1
+	${INSTALL_MAN} ${WRKSRC}/copytape.5 ${PREFIX}/${PKGMANDIR}/man5/copytape.5
 
 .include "../../mk/bsd.pkg.mk"
Index: cpphs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/cpphs/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- cpphs/Makefile	14 Mar 2006 15:51:13 -0000	1.2
+++ cpphs/Makefile	20 Apr 2006 13:23:17 -0000
@@ -15,7 +15,7 @@
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cpphs ${PREFIX}/bin/cpphs
-	@${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/${PKGMANDIR}/man1
 
 
 .include "../../lang/ghc/buildlink3.mk"
Index: csup/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/csup/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- csup/Makefile	20 Mar 2006 15:44:47 -0000	1.4
+++ csup/Makefile	20 Apr 2006 13:23:17 -0000
@@ -16,6 +16,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/csup ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/csup.1 ${PREFIX}/man/man1/csup.1
+	${INSTALL_MAN} ${WRKSRC}/csup.1 ${PREFIX}/${PKGMANDIR}/man1/csup.1
 
 .include "../../mk/bsd.pkg.mk"
Index: db1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/db1/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- db1/Makefile	14 Aug 2005 13:58:53 -0000	1.5
+++ db1/Makefile	20 Apr 2006 13:23:17 -0000
@@ -20,7 +20,7 @@
 	${INSTALL_DATA} ${BUILD_DIRS}/include/${F} ${PREFIX}/include/${F}
 .endfor
 .for F in btree.3 dbopen.3 hash.3 mpool.3 recno.3
-	${INSTALL_MAN} ${WRKSRC}/man/${F} ${PREFIX}/man/man3/${F}
+	${INSTALL_MAN} ${WRKSRC}/man/${F} ${PREFIX}/${PKGMANDIR}/man3/${F}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
Index: di/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/di/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- di/Makefile	28 Nov 2005 00:27:24 -0000	1.3
+++ di/Makefile	20 Apr 2006 13:23:17 -0000
@@ -15,12 +15,12 @@
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES
 	${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/en_US/LC_MESSAGES
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/po/de_DE.po \
 		${PREFIX}/${PKGLOCALEDIR}/locale/de_DE/LC_MESSAGES/di.po
 	${INSTALL_DATA} ${WRKSRC}/po/en_US.po \
 		${PREFIX}/${PKGLOCALEDIR}/locale/en_US/LC_MESSAGES/di.po
-	${INSTALL_MAN} ${WRKSRC}/di.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/di.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/di ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
Index: dia2code/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/dia2code/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- dia2code/Makefile	11 Apr 2005 21:11:04 -0000	1.3
+++ dia2code/Makefile	20 Apr 2006 13:23:17 -0000
@@ -30,7 +30,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dia2code/dia2code ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dia2code.1 ${PREFIX}/man/man1/dia2code.1
+	${INSTALL_MAN} ${WRKSRC}/dia2code.1 ${PREFIX}/${PKGMANDIR}/man1/dia2code.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dia2code
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dia2code/README
 
Index: dnswalk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/dnswalk/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- dnswalk/Makefile	7 Oct 2005 12:00:13 -0000	1.5
+++ dnswalk/Makefile	20 Apr 2006 13:23:17 -0000
@@ -19,6 +19,6 @@
 	${INSTALL_SCRIPT} ${WRKSRC}/dnswalk     ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/makereports ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/sendreports ${PREFIX}/bin/
-	${INSTALL_MAN}    ${WRKSRC}/dnswalk.1   ${PREFIX}/man/man1/
+	${INSTALL_MAN}    ${WRKSRC}/dnswalk.1   ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
Index: flexdump/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/flexdump/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- flexdump/Makefile	14 Mar 2006 01:27:59 -0000	1.5
+++ flexdump/Makefile	20 Apr 2006 13:23:17 -0000
@@ -27,7 +27,7 @@
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/flexbackup.conf ${EGDIR}/flexbackup.conf
 	${INSTALL_SCRIPT} ${WRKSRC}/flexbackup ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/flexbackup.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 ${PREFIX}/${PKGMANDIR}/man5/
 
 .include "../../mk/bsd.pkg.mk"
Index: freevrrpd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/freevrrpd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- freevrrpd/Makefile	14 Mar 2006 01:27:59 -0000	1.5
+++ freevrrpd/Makefile	20 Apr 2006 13:23:36 -0000
@@ -19,7 +19,7 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/freevrrpd ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/freevrrpd.conf.sample ${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/freevrrpd.sh ${PREFIX}/etc/rc.d
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${PREFIX}/${PKGMANDIR}/man8
 
 
 .include "../../mk/bsd.pkg.mk"
Index: ftpsesame/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ftpsesame/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ftpsesame/Makefile	14 Mar 2006 01:27:59 -0000	1.5
+++ ftpsesame/Makefile	20 Apr 2006 13:23:36 -0000
@@ -16,8 +16,8 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ftpsesame ${PREFIX}/sbin/ftpsesame
-	${INSTALL_MAN} ${WRKSRC}/ftpsesame.8 ${PREFIX}/man/man8/ftpsesame.8
-	${INSTALL_MAN} ${WRKSRC}/ftpsesame.cat8 ${PREFIX}/man/cat8/ftpsesame.0
+	${INSTALL_MAN} ${WRKSRC}/ftpsesame.8 ${PREFIX}/${PKGMANDIR}/man8/ftpsesame.8
+	${INSTALL_MAN} ${WRKSRC}/ftpsesame.cat8 ${PREFIX}/${PKGMANDIR}/cat8/ftpsesame.0
 
 .include "../../security/pflkm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: gtk-theme-switch/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/gtk-theme-switch/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- gtk-theme-switch/Makefile	27 Jul 2005 16:25:32 -0000	1.9
+++ gtk-theme-switch/Makefile	20 Apr 2006 13:23:36 -0000
@@ -13,7 +13,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/switch ${PREFIX}/bin/gtk-theme-switch
-	${INSTALL_MAN} ${WRKSRC}/switch.1 ${PREFIX}/man/man1/gtk-theme-switch.1
+	${INSTALL_MAN} ${WRKSRC}/switch.1 ${PREFIX}/${PKGMANDIR}/man1/gtk-theme-switch.1
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: hping3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/hping3/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- hping3/Makefile	2 Nov 2005 18:00:16 -0000	1.3
+++ hping3/Makefile	20 Apr 2006 13:23:36 -0000
@@ -14,7 +14,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hping3 ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/docs/hping3.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/docs/hping3.8 ${PREFIX}/${PKGMANDIR}/man8/
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: html2latex/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/html2latex/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- html2latex/Makefile	17 Jan 2006 10:20:00 -0000	1.4
+++ html2latex/Makefile	20 Apr 2006 13:23:36 -0000
@@ -16,6 +16,6 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC:Q}/html2latex ${PREFIX:Q}/bin/html2latex
-	${INSTALL_MAN} ${WRKSRC:Q}/html2latex.1 ${PREFIX:Q}/man/man1
+	${INSTALL_MAN} ${WRKSRC:Q}/html2latex.1 ${PREFIX:Q}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: ices-vorbis/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ices-vorbis/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ices-vorbis/Makefile	9 Mar 2006 21:02:10 -0000	1.2
+++ ices-vorbis/Makefile	20 Apr 2006 13:23:36 -0000
@@ -23,7 +23,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE}
-	${INSTALL_MAN} ${WRKSRC}/debian/ices2.1 ${PREFIX}/man/man1/${PKGBASE}.1
+	${INSTALL_MAN} ${WRKSRC}/debian/ices2.1 ${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}.1
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	for i in basic.html config.html faq.html index.html inputs.html \
 		intro.html style.css ; \
Index: igal/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/igal/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- igal/Makefile	28 Sep 2005 21:08:32 -0000	1.5
+++ igal/Makefile	20 Apr 2006 13:23:36 -0000
@@ -25,7 +25,7 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/igal ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/igal.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/igal.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/igal
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/igal
 	cd ${WRKSRC} && \
Index: iptstate/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/iptstate/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- iptstate/Makefile	20 Jan 2006 22:58:00 -0000	1.3
+++ iptstate/Makefile	20 Apr 2006 13:23:36 -0000
@@ -13,6 +13,6 @@
 
 do-install:
 	cd ${WRKSRC:Q} && ${INSTALL_PROGRAM} iptstate ${PREFIX:Q}/bin/
-	cd ${WRKSRC:Q} && ${INSTALL_MAN} man/man1/iptstate.1 ${PREFIX:Q}/man/man1/
+	cd ${WRKSRC:Q} && ${INSTALL_MAN} man/man1/iptstate.1 ${PREFIX:Q}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
Index: l2tpd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/l2tpd/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- l2tpd/Makefile	14 Mar 2006 01:28:00 -0000	1.10
+++ l2tpd/Makefile	20 Apr 2006 13:23:36 -0000
@@ -50,9 +50,9 @@
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/l2tpd ${PREFIX:Q}/bin
 	${INSTALL_DATA_DIR} ${DOCDIR:Q}
 	${INSTALL_DATA} ${WRKSRC:Q}/README ${DOCDIR:Q}
-	${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tpd.8 ${PREFIX:Q}/man/man8
-	${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tp-secrets.5 ${PREFIX:Q}/man/man5
-	${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tpd.conf.5 ${PREFIX:Q}/man/man5
+	${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tpd.8 ${PREFIX:Q}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tp-secrets.5 ${PREFIX:Q}/${PKGMANDIR}/man5
+	${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tpd.conf.5 ${PREFIX:Q}/${PKGMANDIR}/man5
 	${INSTALL_DATA_DIR} ${EGDIR:Q}
 	${INSTALL_DATA} ${WRKSRC:Q}/doc/l2tpd.conf.sample ${EGDIR:Q}
 	${INSTALL_DATA} ${WRKSRC:Q}/doc/l2tp-secrets.sample ${EGDIR:Q}
Index: ldp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ldp/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ldp/Makefile	26 Feb 2006 18:30:14 -0000	1.4
+++ ldp/Makefile	20 Apr 2006 13:23:36 -0000
@@ -14,6 +14,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ldp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ldp.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/ldp.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
Index: libuuid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/libuuid/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- libuuid/Makefile	11 Feb 2006 19:32:25 -0000	1.9
+++ libuuid/Makefile	20 Apr 2006 13:23:36 -0000
@@ -24,7 +24,7 @@
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/misc/uuidgen ${PREFIX:Q}/bin/uuidgen
-	${INSTALL_MAN} ${WRKSRC:Q}/misc/uuidgen.1 ${PREFIX:Q}/man/man1/uuidgen.1
+	${INSTALL_MAN} ${WRKSRC:Q}/misc/uuidgen.1 ${PREFIX:Q}/${PKGMANDIR}/man1/uuidgen.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: links1/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/links1/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- links1/Makefile	9 Apr 2006 14:02:45 -0000	1.13
+++ links1/Makefile	20 Apr 2006 13:23:36 -0000
@@ -15,7 +15,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/links ${PREFIX}/bin/links1
-	${INSTALL_MAN} ${WRKSRC}/links.1 ${PREFIX}/man/man1/links1.1
+	${INSTALL_MAN} ${WRKSRC}/links.1 ${PREFIX}/${PKGMANDIR}/man1/links1.1
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: linux-makedev/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/linux-makedev/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- linux-makedev/Makefile	14 Mar 2006 01:28:01 -0000	1.4
+++ linux-makedev/Makefile	20 Apr 2006 13:23:36 -0000
@@ -32,7 +32,7 @@
 		&& ${MV} ${WRKSRC}/MAKEDEV.tmp ${WRKSRC}/MAKEDEV
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/MAKEDEV.man ${PREFIX}/man/man8/MAKEDEV.8
+	${INSTALL_MAN} ${WRKSRC}/MAKEDEV.man ${PREFIX}/${PKGMANDIR}/man8/MAKEDEV.8
 	${INSTALL_SCRIPT} ${WRKSRC}/MAKEDEV ${PREFIX}/sbin/
 
 .include "../../mk/bsd.pkg.mk"
Index: lorder/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/lorder/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lorder/Makefile	11 Jun 2004 17:23:54 -0000	1.1.1.1
+++ lorder/Makefile	20 Apr 2006 13:23:36 -0000
@@ -37,6 +37,6 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/lorder ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/lorder.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${FILESDIR}/lorder.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
Index: memdump/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/memdump/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- memdump/Makefile	2 Nov 2005 18:00:22 -0000	1.3
+++ memdump/Makefile	20 Apr 2006 13:23:36 -0000
@@ -14,6 +14,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/memdump ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/memdump.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/memdump.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
Index: mkdep/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/mkdep/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- mkdep/Makefile	28 Sep 2005 20:50:10 -0000	1.5
+++ mkdep/Makefile	20 Apr 2006 13:23:36 -0000
@@ -17,7 +17,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mkdep ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mkdep.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/mkdep.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../pkgtools/libnbcompat/buildlink3.mk"
 
Index: mplayer-share/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/mplayer-share/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- mplayer-share/Makefile	3 Feb 2006 00:40:53 -0000	1.2
+++ mplayer-share/Makefile	20 Apr 2006 13:23:36 -0000
@@ -22,7 +22,7 @@
 	${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/DOCS
 	${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer
Index: n0t/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/n0t/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- n0t/Makefile	11 Apr 2005 21:14:11 -0000	1.3
+++ n0t/Makefile	20 Apr 2006 13:23:36 -0000
@@ -14,7 +14,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/n0t ${PREFIX}/sbin/n0t
-	${INSTALL_MAN} ${WRKSRC}/n0t.1 ${PREFIX}/share/man/man1/n0t.1
+	${INSTALL_MAN} ${WRKSRC}/n0t.1 ${PREFIX}/share/${PKGMANDIR}/man1/n0t.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/n0t/
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/n0t/
 
Index: ncc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ncc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ncc/Makefile	11 Apr 2005 21:14:13 -0000	1.3
+++ ncc/Makefile	20 Apr 2006 13:23:36 -0000
@@ -21,7 +21,7 @@
 	${LN} -s nccnav ${PREFIX}/bin/nccnavi
 	${INSTALL_DATA_DIR} ${PREFIX}/share/ncc
 	${INSTALL_DATA} ${WRKSRC}/doc/nognu ${PREFIX}/share/ncc
-	${INSTALL_MAN} ${WRKSRC}/ncc.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ncc.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ncc
 	${INSTALL_DATA} ${WRKSRC}/doc/KEYS.txt ${PREFIX}/share/doc/ncc
 	${INSTALL_DATA} ${WRKSRC}/doc/TROUBLES ${PREFIX}/share/doc/ncc
Index: neb-cd512/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/neb-cd512/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- neb-cd512/Makefile	28 Nov 2005 21:36:42 -0000	1.3
+++ neb-cd512/Makefile	20 Apr 2006 13:23:36 -0000
@@ -20,6 +20,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/neb-cd512 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/neb-cd512.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/neb-cd512.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: neb-hdtoolbox/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/neb-hdtoolbox/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- neb-hdtoolbox/Makefile	2 Nov 2005 18:00:23 -0000	1.3
+++ neb-hdtoolbox/Makefile	20 Apr 2006 13:23:36 -0000
@@ -20,6 +20,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/neb-hdtoolbox ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/neb-hdtoolbox.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/neb-hdtoolbox.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: neb-wipe/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/neb-wipe/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- neb-wipe/Makefile	14 Mar 2006 00:04:45 -0000	1.4
+++ neb-wipe/Makefile	20 Apr 2006 13:23:36 -0000
@@ -20,6 +20,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/neb-wipe ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/neb-wipe.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/neb-wipe.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: netkit-tftp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/netkit-tftp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- netkit-tftp/Makefile	2 Nov 2005 18:00:24 -0000	1.2
+++ netkit-tftp/Makefile	20 Apr 2006 13:23:36 -0000
@@ -14,8 +14,8 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tftp/tftp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tftp/tftp.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/tftp/tftp.1 ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/tftpd/tftpd ${PREFIX}/sbin/in.tftpd
-	${INSTALL_MAN} ${WRKSRC}/tftpd/tftpd.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/tftpd/tftpd.8 ${PREFIX}/${PKGMANDIR}/man8/
 
 .include "../../mk/bsd.pkg.mk"
Index: nnrpd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/nnrpd/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- nnrpd/Makefile	14 Mar 2006 01:28:03 -0000	1.6
+++ nnrpd/Makefile	20 Apr 2006 13:23:36 -0000
@@ -82,10 +82,10 @@
 		${PREFIX}/share/examples/nnrpd/
 	${INSTALL_DATA} ${WRKSRC}/samples/moderators \
 		${PREFIX}/share/examples/nnrpd/
-	${INSTALL_MAN} ${WRKSRC}/doc/dbz.3  ${PREFIX}/man/man3/
-	${INSTALL_MAN} ${WRKSRC}/doc/nnrp.access.5 ${PREFIX}/man/man5/
-	${INSTALL_MAN} ${WRKSRC}/doc/moderators.5 ${PREFIX}/man/man5/
-	${INSTALL_MAN} ${WRKSRC}/doc/nnrpd.8  ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/dbz.3  ${PREFIX}/${PKGMANDIR}/man3/
+	${INSTALL_MAN} ${WRKSRC}/doc/nnrp.access.5 ${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/moderators.5 ${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/nnrpd.8  ${PREFIX}/${PKGMANDIR}/man8/
 
 .include "../../wip/c-news/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
Index: nos-tun/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/nos-tun/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- nos-tun/Makefile	11 Apr 2005 21:14:32 -0000	1.3
+++ nos-tun/Makefile	20 Apr 2006 13:23:36 -0000
@@ -20,6 +20,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nos-tun ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/nos-tun.8 ${PREFIX}/man/man8/nos-tun.8
+	${INSTALL_MAN} ${WRKSRC}/nos-tun.8 ${PREFIX}/${PKGMANDIR}/man8/nos-tun.8
 
 .include "../../mk/bsd.pkg.mk"
Index: omniORB/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/omniORB/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- omniORB/Makefile	5 Dec 2005 22:27:46 -0000	1.4
+++ omniORB/Makefile	20 Apr 2006 13:23:36 -0000
@@ -36,7 +36,7 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${PREFIX}/share/doc/omniORB/
 	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${PREFIX}/share/doc/omniORB/
 	${INSTALL_DATA} ${WRKSRC}/doc/omniORB/* ${PREFIX}/share/doc/omniORB/omniORB/
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../lang/python/pyversion.mk"
 .include "../../lang/python/extension.mk"
Index: oops/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/oops/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- oops/Makefile	14 Mar 2006 01:28:03 -0000	1.13
+++ oops/Makefile	20 Apr 2006 13:23:36 -0000
@@ -72,8 +72,8 @@
 	for m in koi-alt.tab koi-iso.tab koi-win.tab;			\
 	do ${INSTALL_DATA} ${WRKSRC:Q}/src/tables/"$$m" ${EGDIR:Q}/tables; \
 	done
-	${INSTALL_MAN} ${WRKSRC:Q}/doc/oops.8 ${PREFIX:Q}/man/man8
-	${INSTALL_MAN} ${WRKSRC:Q}/doc/oopsctl.8 ${PREFIX:Q}/man/man8
+	${INSTALL_MAN} ${WRKSRC:Q}/doc/oops.8 ${PREFIX:Q}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC:Q}/doc/oopsctl.8 ${PREFIX:Q}/${PKGMANDIR}/man8
 
 .include "../../mk/compiler.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: opera-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/opera-devel/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- opera-devel/Makefile	14 Mar 2006 01:28:06 -0000	1.15
+++ opera-devel/Makefile	20 Apr 2006 13:23:36 -0000
@@ -122,7 +122,7 @@
 	@${ECHO}
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1
 .endif
 
 # regenerate distinfo for all ports supported by this package
Index: pkg_fake/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/pkg_fake/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- pkg_fake/Makefile	2 Jan 2006 09:06:21 -0000	1.6
+++ pkg_fake/Makefile	20 Apr 2006 13:23:45 -0000
@@ -26,6 +26,6 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC:Q}/pkg_fake ${PREFIX:Q}/sbin/
-	${INSTALL_MAN} ${WRKSRC:Q}/pkg_fake.1 ${PREFIX:Q}/man/man1/
+	${INSTALL_MAN} ${WRKSRC:Q}/pkg_fake.1 ${PREFIX:Q}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
Index: pkg_select/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/pkg_select/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- pkg_select/Makefile	20 Jan 2006 23:20:52 -0000	1.22
+++ pkg_select/Makefile	20 Apr 2006 13:23:45 -0000
@@ -34,7 +34,7 @@
 	${INSTALL_DATA} ${WRKSRC:Q}/${PKGBASE:Q}.conf.example ${EXAMPLEDIR:Q}
 	${INSTALL_DATA} ${WRKSRC:Q}/mirrors.cvs ${PREFIX:Q}/share/pkg_select
 	${INSTALL_DATA} ${WRKSRC:Q}/mirrors.ftp ${PREFIX:Q}/share/pkg_select
-	${INSTALL_MAN} ${WRKSRC:Q}/pkg_select.1 ${PREFIX:Q}/man/man1
+	${INSTALL_MAN} ${WRKSRC:Q}/pkg_select.1 ${PREFIX:Q}/${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
Index: plugger/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/plugger/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- plugger/Makefile	14 Mar 2006 01:28:08 -0000	1.12
+++ plugger/Makefile	20 Apr 2006 13:23:45 -0000
@@ -20,7 +20,7 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PKGVERSION} ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/plugger.so ${PREFIX}/lib/
-	${INSTALL_MAN} ${WRKSRC}/plugger.7 ${PREFIX}/man/man7/
+	${INSTALL_MAN} ${WRKSRC}/plugger.7 ${PREFIX}/${PKGMANDIR}/man7/
 	${INSTALL_DATA} ${WRKSRC}/pluggerrc ${EGDIR}/
 
 .include "../../mk/x11.buildlink3.mk"
Index: pmars/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/pmars/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- pmars/Makefile	16 Apr 2006 02:55:14 -0000	1.1.1.1
+++ pmars/Makefile	20 Apr 2006 13:23:45 -0000
@@ -22,7 +22,7 @@
 	${INSTALL_DATA} ${WRKSRC}/CONTRIB ${PREFIX}/share/pmars/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pmars/warriors
 	${INSTALL_DATA} ${WRKSRC}/*.red ${PREFIX}/share/pmars/warriors/
-	${INSTALL_MAN} ${WRKSRC}/pmars.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/pmars.6 ${PREFIX}/${PKGMANDIR}/man6
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: png2ico/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/png2ico/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- png2ico/Makefile	2 Nov 2005 18:00:25 -0000	1.2
+++ png2ico/Makefile	20 Apr 2006 13:23:45 -0000
@@ -14,7 +14,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/png2ico ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/png2ico.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/png2ico.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
Index: prtunnel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/prtunnel/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- prtunnel/Makefile	11 Apr 2005 21:14:52 -0000	1.6
+++ prtunnel/Makefile	20 Apr 2006 13:23:45 -0000
@@ -12,6 +12,6 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/prtunnel ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/prtunnel.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/prtunnel.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: py-plucker/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/py-plucker/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- py-plucker/Makefile	14 Mar 2006 01:28:11 -0000	1.5
+++ py-plucker/Makefile	20 Apr 2006 13:23:45 -0000
@@ -52,7 +52,7 @@
 		${PREFIX}/${PYSITELIB}/PyPlucker/helper
 	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/${PYSITELIB}/PyPlucker
 	${PYTHONBIN} -O ${PYCOMPILEALL} ${PREFIX}/${PYSITELIB}/PyPlucker
-	${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${EGDIR}
 .for f in exclusionlist.txt home.html pluckerrc.sample
 	${INSTALL_DATA} ${WRKSRC}/${f} ${EGDIR}
Index: rar3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/rar3/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- rar3/Makefile	28 Sep 2005 20:50:11 -0000	1.4
+++ rar3/Makefile	20 Apr 2006 13:23:45 -0000
@@ -25,7 +25,7 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rar ${PREFIX}/bin/rar3
 	${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin/unrar3
-	${INSTALL_MAN} ${WRKSRC}/rar.txt ${PREFIX}/man/cat1/rar3.1
+	${INSTALL_MAN} ${WRKSRC}/rar.txt ${PREFIX}/${PKGMANDIR}/cat1/rar3.1
 	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${PREFIX}/etc/rarfiles.lst
 	${INSTALL_DATA} ${WRKSRC}/default.sfx ${PREFIX}/lib/default.sfx
 	${INSTALL_DATA_DIR} ${PREFIX}/share/rar3
Index: realvnc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/realvnc/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- realvnc/Makefile	17 Jan 2006 10:20:47 -0000	1.6
+++ realvnc/Makefile	20 Apr 2006 13:23:45 -0000
@@ -66,11 +66,11 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/modules/extensions
 	${INSTALL_PROGRAM} ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ${PREFIX}/lib/modules/extensions/vnc.so
-	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/man/man1/vncviewer.1
-	${INSTALL_MAN} ${WRKSRC}/x0vncserver/x0vncserver.man ${PREFIX}/man/man1/x0vncserver.1
-	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/man/man1/vncpasswd.1
-	${INSTALL_MAN} ${WRKSRC}/vncconfig/vncconfig.man ${PREFIX}/man/man1/vncconfig.1
-	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/man/man1/vncserver.1
+	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man ${PREFIX}/${PKGMANDIR}/man1/vncviewer.1
+	${INSTALL_MAN} ${WRKSRC}/x0vncserver/x0vncserver.man ${PREFIX}/${PKGMANDIR}/man1/x0vncserver.1
+	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
+	${INSTALL_MAN} ${WRKSRC}/vncconfig/vncconfig.man ${PREFIX}/${PKGMANDIR}/man1/vncconfig.1
+	${INSTALL_MAN} ${WRKSRC}/vncserver.man ${PREFIX}/${PKGMANDIR}/man1/vncserver.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/vnc/classes
 	${INSTALL_DATA} ${WRKSRC}/../common/javabin/* ${PREFIX}/share/vnc/classes
 
Index: relaydb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/relaydb/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- relaydb/Makefile	28 Jun 2005 17:07:23 -0000	1.1.1.1
+++ relaydb/Makefile	20 Apr 2006 13:23:45 -0000
@@ -14,7 +14,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/relaydb ${PREFIX}/bin/relaydb
-	${INSTALL_MAN} ${WRKSRC}/relaydb.8 ${PREFIX}/man/man8/relaydb.8
-	${INSTALL_MAN} ${WRKSRC}/relaydb.cat8 ${PREFIX}/man/cat8/relaydb.cat8
+	${INSTALL_MAN} ${WRKSRC}/relaydb.8 ${PREFIX}/${PKGMANDIR}/man8/relaydb.8
+	${INSTALL_MAN} ${WRKSRC}/relaydb.cat8 ${PREFIX}/${PKGMANDIR}/cat8/relaydb.cat8
 
 .include "../../mk/bsd.pkg.mk"
Index: rsyslog/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/rsyslog/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- rsyslog/Makefile	16 Mar 2006 11:20:13 -0000	1.4
+++ rsyslog/Makefile	20 Apr 2006 13:23:45 -0000
@@ -26,8 +26,8 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syslogd ${PREFIX}/sbin/rsyslogd
-	${INSTALL_MAN} ${WRKSRC}/rsyslogd.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/rsyslog.conf.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/rsyslogd.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/rsyslog.conf.5 ${PREFIX}/${PKGMANDIR}/man5
 	${INSTALL_DATA_DIR} ${EGDIR} ${PREFIX}/share/doc/rsyslog
 	${INSTALL_DATA} ${WRKSRC}/createDB.sql ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.conf ${EGDIR}/rsyslog.conf
Index: runit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/runit/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- runit/Makefile	7 Jan 2006 09:04:03 -0000	1.3
+++ runit/Makefile	20 Apr 2006 13:23:45 -0000
@@ -29,7 +29,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${CMDDIR}/* ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${PREFIX}/${PKGMANDIR}/man8
 	cd ${WRKSRC}/etc && ${PAX} -rwppm . ${EXAMPLEDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCDIR}
Index: sara/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/sara/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- sara/Makefile	2 Nov 2005 18:00:26 -0000	1.3
+++ sara/Makefile	20 Apr 2006 13:23:45 -0000
@@ -47,7 +47,7 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sara ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/sara.8  ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/sara.8  ${PREFIX}/${PKGMANDIR}/man8/
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/sara/
 	${INSTALL_DATA} ${WRKSRC}/config/* ${PREFIX}/etc/sara/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sara/
Index: sarg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/sarg/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- sarg/Makefile	14 Mar 2006 01:28:13 -0000	1.14
+++ sarg/Makefile	20 Apr 2006 13:23:45 -0000
@@ -64,7 +64,7 @@
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/sarg ${PREFIX}/sbin
-		${INSTALL_MAN} ${WRKSRC}/sarg.1 ${PREFIX}/man/man1
+		${INSTALL_MAN} ${WRKSRC}/sarg.1 ${PREFIX}/${PKGMANDIR}/man1
 		${INSTALL_DATA_DIR} ${EGDIR}
 		${INSTALL_DATA_DIR} ${DATADIR}/fonts
 		${INSTALL_DATA_DIR} ${DATADIR}/images
Index: scite/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/scite/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- scite/Makefile	31 Oct 2005 08:09:30 -0000	1.10
+++ scite/Makefile	20 Apr 2006 13:23:45 -0000
@@ -22,7 +22,7 @@
 
 do-install:
 	cd ${WRKSRC}/scite/gtk && ${GMAKE} GTK2=1 install
-	${INSTALL_MAN} ${WRKSRC}/scite/doc/scite.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/scite/doc/scite.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
Index: sid-milter/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/sid-milter/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sid-milter/Makefile	6 Apr 2006 07:18:30 -0000	1.9
+++ sid-milter/Makefile	20 Apr 2006 13:23:45 -0000
@@ -42,7 +42,7 @@
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sid-milter
 
 	${INSTALL_LIB} ${WRKSRC}/${SIDWORK}/libar/libar.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/libar/ar.0 ${PREFIX}/man/cat3/
+	${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/libar/ar.0 ${PREFIX}/${PKGMANDIR}/cat3/
 	${INSTALL_PROGRAM} ${WRKSRC}/${SIDWORK}/sid-filter/sid-filter \
 		${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${SIDWORK}/sid-filter/sid-filter.0 \
Index: sks/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/sks/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sks/Makefile	6 Apr 2006 07:18:31 -0000	1.9
+++ sks/Makefile	20 Apr 2006 13:23:45 -0000
@@ -33,6 +33,6 @@
 	@cd ${WRKSRC} && ${MAKE_PROGRAM} sks.8
 	${INSTALL_PROGRAM} ${WRKSRC}/sks ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sks.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/sks.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
Index: sleuthkit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/sleuthkit/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sleuthkit/Makefile	11 Apr 2005 21:15:36 -0000	1.5
+++ sleuthkit/Makefile	20 Apr 2006 13:23:45 -0000
@@ -17,7 +17,7 @@
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mactime ${PREFIX}/bin/
 	${RM} ${WRKSRC}/bin/mactime
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sorter/
 	${INSTALL_DATA} ${WRKSRC}/share/sorter/* ${PREFIX}/share/sorter
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sleuthkit/
Index: smtprc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/smtprc/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- smtprc/Makefile	2 Dec 2004 16:39:07 -0000	1.4
+++ smtprc/Makefile	20 Apr 2006 13:23:45 -0000
@@ -29,7 +29,7 @@
 	${INSTALL_DATA} ${WRKSRC}/rcheck.conf ${PREFIX}/share/examples/smtprc
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/smtprc
 	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/smtprc
-	${INSTALL_MAN} ${WRKSRC}/smtprc.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/smtprc.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: smtprc-gui/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/smtprc-gui/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- smtprc-gui/Makefile	9 May 2004 21:44:19 -0000	1.3
+++ smtprc-gui/Makefile	20 Apr 2006 13:23:45 -0000
@@ -25,6 +25,6 @@
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gsmtprc.new ${PREFIX}/bin/gsmtprc
-	${INSTALL_MAN} ${WRKSRC}/gsmtprc.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/gsmtprc.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: smtpscan/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/smtpscan/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- smtpscan/Makefile	11 Apr 2005 21:15:52 -0000	1.3
+++ smtpscan/Makefile	20 Apr 2006 13:23:45 -0000
@@ -32,6 +32,6 @@
 	${INSTALL_DATA} ${WRKSRC}/src/fingerprints ${SSSHARE}
 	${INSTALL_DATA} ${WRKSRC}/src/tests ${SSSHARE}
 	${INSTALL_SCRIPT} ${WRKSRC}/smtpscan ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/docs/smtpscan.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/smtpscan.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Index: tcpspy/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/tcpspy/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- tcpspy/Makefile	2 Nov 2005 18:00:28 -0000	1.3
+++ tcpspy/Makefile	20 Apr 2006 13:23:45 -0000
@@ -14,6 +14,6 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpspy ${PREFIX}/sbin/tcpspy
-	${INSTALL_MAN} ${WRKSRC}/tcpspy.8 ${PREFIX}/man/man8/tcpspy.8
+	${INSTALL_MAN} ${WRKSRC}/tcpspy.8 ${PREFIX}/${PKGMANDIR}/man8/tcpspy.8
 
 .include "../../mk/bsd.pkg.mk"
Index: tripwire2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/tripwire2/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- tripwire2/Makefile	28 Nov 2005 00:27:28 -0000	1.6
+++ tripwire2/Makefile	20 Apr 2006 13:23:45 -0000
@@ -29,9 +29,9 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/${SYSPRE}/* \
 		${PREFIX}/sbin/
 	#TODO# make this in a foreach loop
-	${INSTALL_MAN} ${WRKSRC}/../man/man4/*.4 ${PREFIX}/man/man4/
-	${INSTALL_MAN} ${WRKSRC}/../man/man5/*.5 ${PREFIX}/man/man5/
-	${INSTALL_MAN} ${WRKSRC}/../man/man8/*.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/../man/man4/*.4 ${PREFIX}/${PKGMANDIR}/man4/
+	${INSTALL_MAN} ${WRKSRC}/../man/man5/*.5 ${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_MAN} ${WRKSRC}/../man/man8/*.8 ${PREFIX}/${PKGMANDIR}/man8/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tripwire/
 	${INSTALL_DATA} ${WRKSRC}/../policy/*.txt ${PREFIX}/share/tripwire/
 
Index: ttysnoop/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/ttysnoop/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ttysnoop/Makefile	3 Nov 2005 13:01:53 -0000	1.8
+++ ttysnoop/Makefile	20 Apr 2006 13:23:45 -0000
@@ -20,7 +20,7 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttysnoop ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/ttysnoops ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/ttysnoop.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/ttysnoop.8 ${PREFIX}/${PKGMANDIR}/man8/
 	${INSTALL_DATA_DIR} ${VARBASE}/spool/ttysnoop
 
 ONLY_FOR_PLATFORM=	Linux-*-*
Index: typespeed/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/typespeed/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- typespeed/Makefile	17 Jan 2006 10:20:47 -0000	1.7
+++ typespeed/Makefile	20 Apr 2006 13:23:45 -0000
@@ -22,8 +22,8 @@
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/typespeed
 	${INSTALL_PROGRAM} ${WRKSRC}/typespeed ${PREFIX}/lib/typespeed
 	${INSTALL_SCRIPT} ${WRKDIR}/.typespeed ${PREFIX}/bin/typespeed
-	${INSTALL_MAN} ${WRKSRC}/typespeed.cat6 ${PREFIX}/man/cat6/typespeed.0
-	${INSTALL_MAN} ${WRKSRC}/typespeed.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/typespeed.cat6 ${PREFIX}/${PKGMANDIR}/cat6/typespeed.0
+	${INSTALL_MAN} ${WRKSRC}/typespeed.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/typespeed
 	${INSTALL_DATA} ${WRKSRC}/words.* ${PREFIX}/share/typespeed
 
Index: viewer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/viewer/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- viewer/Makefile	12 Jun 2005 23:51:29 -0000	1.4
+++ viewer/Makefile	20 Apr 2006 13:23:45 -0000
@@ -13,7 +13,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/viewer ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/viewer.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/viewer.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
Index: vmac/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/vmac/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- vmac/Makefile	11 Apr 2005 21:16:11 -0000	1.8
+++ vmac/Makefile	20 Apr 2006 13:23:45 -0000
@@ -32,7 +32,7 @@
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/vMac ${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/vmac.0 ${PREFIX}/man/man1
+		${INSTALL_MAN} ${WRKSRC}/vmac.0 ${PREFIX}/${PKGMANDIR}/man1
 		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vMac
 		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/vMac
 		${INSTALL_DATA} ${WRKSRC}/README.rom ${PREFIX}/share/doc/vMac
Index: wimon-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/wimon-devel/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- wimon-devel/Makefile	11 Apr 2005 21:16:12 -0000	1.4
+++ wimon-devel/Makefile	20 Apr 2006 13:23:45 -0000
@@ -19,7 +19,7 @@
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wimon ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/man/man8/wimon.8
+	${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/${PKGMANDIR}/man8/wimon.8
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.