From 2829e658f2ba62cb77f3f151f468ec8de1549bd5 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sun, 7 Jan 2007 09:13:46 +0000
Subject: 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.
---
 news/nntpclnt/Makefile | 6 +++---
 news/trn/Makefile      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'news')

diff --git a/news/nntpclnt/Makefile b/news/nntpclnt/Makefile
index e97f3bec3c9..1270d0b135b 100644
--- a/news/nntpclnt/Makefile
+++ b/news/nntpclnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/09/26 19:00:20 christos Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:08 rillig Exp $
 
 DISTNAME=	nntpclnt-1.6.1
 PKGREVISION=	6
@@ -26,7 +26,7 @@ PLIST_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 CONFIG_SH=	${FILESDIR}/config.${OPSYS}.sh
 ONLY_FOR_PLATFORM=	NetBSD-*-* SunOS-*-* DragonFly-*-* Linux-*-*
 
-INSTALLATION_DIRS=	bin include lib man/man3
+INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man3
 
 do-configure:
 	${SED} -e s,@PREFIX@,${PREFIX}, -e s,@PKGSYSCONFDIR@,${PKG_SYSCONFDIR}, \
@@ -42,7 +42,7 @@ do-install:
 	  ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/nntp.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/libnntpclnt.a ${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/man/man3/
+	${INSTALL_DATA} ${WRKSRC}/nntpclnt.3 ${PREFIX}/${PKGMANDIR}/man3/
 	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/trn/Makefile b/news/trn/Makefile
index 3884d820859..cf86a0b4cfc 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:08 rillig Exp $
 
 DISTNAME=		trn-4.0-test76
 PKGNAME=		trn-4.76
@@ -71,9 +71,9 @@ CONFIGURE_ARGS+=	-d -e -D bin=${PREFIX:Q}/bin \
 			-D useinews=${PREFIX:Q}'/bin/inews'
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 \
-		${PREFIX}/man/man1/rn.1.gz
+	@${RM} -f ${PREFIX}/bin/rn ${PREFIX}/${PKGMANDIR}/man1/rn.1 \
+		${PREFIX}/${PKGMANDIR}/man1/rn.1.gz
 	@${LN} -s trn ${PREFIX}/bin/rn
-	@${LN} -s trn.1 ${PREFIX}/man/man1/rn.1
+	@${LN} -s trn.1 ${PREFIX}/${PKGMANDIR}/man1/rn.1
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3