Fixed PKGMANDIR.

5 files changed, 17 insertions, 15 deletions

diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index ed01153cf68..71460b5d783 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/10/08 05:22:19 salo Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/12 02:27:57 rillig Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -24,11 +24,11 @@ SUBST_FILES.man=	doc/mmg.1
 SUBST_SED.man=		-e 's,(doc/,(${PREFIX}/share/doc/mmg/,g'
 SUBST_MESSAGE.man=	Fixing paths in manual page.
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mmg/mmg ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/mmg.1 ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mmg/images/
 	${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \
 		${PREFIX}/share/doc/mmg/images/
diff --git a/multimedia/mmg/distinfo b/multimedia/mmg/distinfo
index 2e003f1972e..da35553346f 100644
--- a/multimedia/mmg/distinfo
+++ b/multimedia/mmg/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2006/10/08 05:22:19 salo Exp $
+$NetBSD: distinfo,v 1.19 2006/11/12 02:27:57 rillig Exp $
 
 SHA1 (mkvtoolnix-1.7.0.tar.bz2) = c705af2778faac3e5244015646e331e811500b26
 RMD160 (mkvtoolnix-1.7.0.tar.bz2) = 0c90a44f0b6df466a4799ed8fa2f99791059c7fb
 Size (mkvtoolnix-1.7.0.tar.bz2) = 655481 bytes
 SHA1 (patch-aa) = a7e07acb9e9a3245519acedff6d6f41344d07cb2
 SHA1 (patch-ab) = 99f08611648f523dec37197487921b092fba556e
+SHA1 (patch-ac) = 70fae8c7ff5a92f305b9a1b100f843206fc13ad4
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index f17e426b2ea..cab11c214ee 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/10/14 08:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/11/12 02:27:39 rillig Exp $
 
 DISTNAME=		vlnx440e
 PKGNAME=		uvscan-4.40
@@ -44,7 +44,7 @@ CONF_FILES+=		${EGDATDIR}/names.dat ${UVSCANDIR}/names.dat
 CONF_FILES+=		${EGDATDIR}/scan.dat ${UVSCANDIR}/scan.dat
 REQD_DIRS=		${UVSCANDIR}
 
-INSTALLATION_DIRS=	bin man/man1 sbin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 sbin
 
 USE_TOOLS+=		gtar:run
 
@@ -65,7 +65,7 @@ post-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/update_dat ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${UVSCANDIR}
 	${RM} -f ${PREFIX}/bin/uvscan
 	${LN} -sf ../${UVSCANDIR:S/${PREFIX}\///}/uvscan ${PREFIX}/bin/uvscan
diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index 976f2229b3a..bc65deb2093 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/21 16:31:25 yyamano Exp $
+# $NetBSD: Makefile,v 1.25 2006/11/12 02:22:44 rillig Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
@@ -56,13 +56,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/asclock ${PREFIX}/libexec/asclock-classic
 	${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if (${OPSYS} == SunOS) || (${OPSYS} == "Linux") || (${OPSYS} == "Interix") || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/asclock.man ${PREFIX}/man/man1/asclock.1
-	@${ECHO} man/man1/asclock.1 >> ${PLIST_SRC}
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/asclock.man ${PREFIX}/${PKGMANDIR}/man1/asclock.1
+	@${ECHO} ${PKGMANDIR}/man1/asclock.1 >> ${PLIST_SRC}
 .else
-	${INSTALL_MAN_DIR} ${PREFIX}/man/cat1
-	${INSTALL_MAN} ${WRKSRC}/asclock.0 ${PREFIX}/man/cat1/asclock.0
-	@${ECHO} man/cat1/asclock.0 >> ${PLIST_SRC}
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/cat1
+	${INSTALL_MAN} ${WRKSRC}/asclock.0 ${PREFIX}/${PKGMANDIR}/cat1/asclock.0
+	@${ECHO} ${PKGMANDIR}/cat1/asclock.0 >> ${PLIST_SRC}
 .endif
 	${INSTALL_DATA_DIR} ${PREFIX}/share/asclock-classic
 .for LANGUAGE in ${LANGUAGES}
diff --git a/x11/xp/Makefile b/x11/xp/Makefile
index 878b7d9bdb5..fa25935289f 100644
--- a/x11/xp/Makefile
+++ b/x11/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:48 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/11/12 02:26:33 rillig Exp $
 
 DISTNAME=	xp-1.2b10
 PKGREVISION=	2
@@ -9,5 +9,6 @@ MAINTAINER=	jdc@NetBSD.org
 COMMENT=	Fast X11 text file viewer using Athena widgets
 
 USE_IMAKE=	yes
+MAKE_FLAGS+=	MANPATH=${PREFIX}/${PKGMANDIR}
 
 .include "../../mk/bsd.pkg.mk"