From 4bf89af1dd149fa5a20ed8019485b1278dc75e04 Mon Sep 17 00:00:00 2001
From: kei <kei>
Date: Mon, 27 Nov 2000 12:54:46 +0000
Subject: Reworked previous in different way.  Manpages are now installed
 properly whether MANZ is set to YES or not.  Problem pointed out by Matthias
 Scheler in private mail.  Thanks!

---
 sysutils/cdrecord/Makefile  | 10 +++++++---
 sysutils/cdrecord/pkg/PLIST |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'sysutils/cdrecord')

diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index a14112e2782..b62fe525d9c 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2000/11/27 04:58:27 kei Exp $
+# $NetBSD: Makefile,v 1.35 2000/11/27 12:54:48 kei Exp $
 
 DISTNAME=	cdrecord-1.9
 CATEGORIES=	sysutils
@@ -15,8 +15,9 @@ TARGET_ARCH=	${MACHINE_ARCH}-netbsd-cc
 TARGET_DIR=	OBJ/${TARGET_ARCH}
 #override ARCH to avoid picking up a bad ${ARCH} during the build
 MAKE_ENV+=      ARCH=""
+TBL?=		tbl
 
-post-patch:
+post-extract:
 	@cd ${WRKSRC}; \
 	    ${MV} mkisofs/mkisofs.8 mkisofs/mkisofs.tbl
 
@@ -29,6 +30,9 @@ do-configure:
 	${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
 	${LN} -sf netbsd-cc.rul ${TARGET_ARCH}.rul
 
+post-build:
+	${TBL} ${WRKSRC}/mkisofs/mkisofs.tbl > ${WRKSRC}/mkisofs/mkisofs.8
+
 do-install:
 	cd ${WRKSRC}/cdda2wav; \
 	    ${INSTALL_PROGRAM} ${TARGET_DIR}/cdda2wav ${PREFIX}/bin; \
@@ -38,7 +42,7 @@ do-install:
 	    ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
 	cd ${WRKSRC}/mkisofs; \
 	    ${INSTALL_PROGRAM} ${TARGET_DIR}/mkisofs ${PREFIX}/bin; \
-	    ${INSTALL_MAN} mkisofs.tbl ${PREFIX}/man/man8
+	    ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
 	cd ${WRKSRC}/misc; \
 	    ${INSTALL_PROGRAM} ${TARGET_DIR}/readcd ${PREFIX}/bin; \
 	    ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
diff --git a/sysutils/cdrecord/pkg/PLIST b/sysutils/cdrecord/pkg/PLIST
index a02bb25c9d3..1359c83cd40 100644
--- a/sysutils/cdrecord/pkg/PLIST
+++ b/sysutils/cdrecord/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2000/11/27 04:58:27 kei Exp $
+@comment $NetBSD: PLIST,v 1.11 2000/11/27 12:54:48 kei Exp $
 bin/cdda2wav
 bin/cdrecord
 bin/mkisofs
@@ -6,4 +6,4 @@ bin/readcd
 man/man1/cdda2wav.1
 man/man1/cdrecord.1
 man/man1/readcd.1
-man/man8/mkisofs.tbl
+man/man8/mkisofs.8
-- 
cgit v1.2.3