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!

7 files changed, 27 insertions, 34 deletions

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
diff --git a/sysutils/mkhybrid/Makefile b/sysutils/mkhybrid/Makefile
index ac8e41e2206..0a817c9d5ec 100644
--- a/sysutils/mkhybrid/Makefile
+++ b/sysutils/mkhybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/11/27 05:00:20 kei Exp $
+# $NetBSD: Makefile,v 1.10 2000/11/27 12:54:46 kei Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/06/16 16:50:06 dburr Exp
 #
 
@@ -11,11 +11,14 @@ HOMEPAGE=	http://www.ps.ucl.ac.uk/~jcpearso/mkhybrid.html
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-Dunix
-
+TBL?=		tbl
 ALL_TARGET=	World
 
-post-patch:
+post-extract:
 		@cd ${WRKSRC}; \
 		${MV} mkhybrid.8 mkhybrid.tbl
 
+post-build:
+		${TBL} ${WRKSRC}/mkhybrid.tbl > ${WRKSRC}/mkhybrid.8
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mkhybrid/files/patch-sum b/sysutils/mkhybrid/files/patch-sum
index 04273c9a952..e72796dd082 100644
--- a/sysutils/mkhybrid/files/patch-sum
+++ b/sysutils/mkhybrid/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.3 2000/11/27 05:01:09 kei Exp $
+$NetBSD: patch-sum,v 1.4 2000/11/27 12:54:47 kei Exp $
 
 MD5 (patch-aa) = b564ab16cdfdac1957d6091e86442e8d
-MD5 (patch-ab) = ea9d23c53c00cd711227dd28e7854160
+MD5 (patch-ab) = 9c74a118a6adb674f48a6133b9aa36ef
 MD5 (patch-ac) = e5d3512a69d12073e0311e56d3f45896
 MD5 (patch-ad) = e24552ac5a188d246ce90abf814e7bca
 MD5 (patch-ae) = 0f99958e066a59c55a3abdf044d40d5d
 MD5 (patch-af) = 651615ad997c21a07c2db102c766b30e
-MD5 (patch-ag) = 52133439489dc5ff159f87eb4b1d6fbb
+MD5 (patch-ag) = 2ca8f4cefaab8231d7b241afea77d206
diff --git a/sysutils/mkhybrid/patches/patch-ab b/sysutils/mkhybrid/patches/patch-ab
index 26c2a737aad..16c622e82e7 100644
--- a/sysutils/mkhybrid/patches/patch-ab
+++ b/sysutils/mkhybrid/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 1999/05/15 07:27:50 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 2000/11/27 12:54:47 kei Exp $
 
---- mkhybrid.8.orig	Tue Apr 27 15:31:54 1999
-+++ mkhybrid.8	Sat May 15 09:02:27 1999
+--- mkhybrid.tbl.orig	Tue Apr 27 15:31:54 1999
++++ mkhybrid.tbl	Sat May 15 09:02:27 1999
 @@ -228,8 +228,10 @@
  [
  .B \--dave
diff --git a/sysutils/mkhybrid/patches/patch-ag b/sysutils/mkhybrid/patches/patch-ag
index 71eb4c8bab2..5d05d87269a 100644
--- a/sysutils/mkhybrid/patches/patch-ag
+++ b/sysutils/mkhybrid/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2000/11/27 05:00:20 kei Exp $
+$NetBSD: patch-ag,v 1.4 2000/11/27 12:54:47 kei Exp $
 
 --- Makefile.in.orig	Wed Mar 17 07:17:02 1999
-+++ Makefile.in	Mon Nov 27 13:48:13 2000
++++ Makefile.in	Mon Nov 27 21:35:50 2000
 @@ -15,7 +15,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -11,26 +11,12 @@ $NetBSD: patch-ag,v 1.3 2000/11/27 05:00:20 kei Exp $
  
  prefix = @prefix@
  exec_prefix =  @exec_prefix@
-@@ -38,7 +38,7 @@
- # Where to put the manual pages.
- mandir = $(prefix)/man/man8
- # Extension (not including `.') for the manual page filenames.
--manext = 8
-+manext = tbl
- 
- #### End of system configuration section. ####
- 
-@@ -68,11 +68,11 @@
+@@ -68,7 +68,7 @@
  apple_driver.o: apple_driver.c mac_label.h
  	$(CC) -c $(CFLAGS) $(srcdir)/apple_driver.c
  
 -install: mkisofs mkisofs.8
-+install: mkhybrid mkhybrid.tbl
++install: mkhybrid mkhybrid.8
  	[ -d $(bindir) ] || mkdir $(bindir)
  	[ -d $(mandir) ] || mkdir $(mandir)
  	$(INSTALL_PROGRAM) mkhybrid $(bindir)/mkhybrid
--	-$(INSTALL_DATA) $(srcdir)/mkhybrid.8 $(mandir)/mkhybrid.$(manext)
-+	-$(INSTALL_DATA) $(srcdir)/mkhybrid.tbl $(mandir)/mkhybrid.$(manext)
- 
- tree.o: tree.c mkisofs.h iso9660.h exclude.h config.h Makefile
- 	$(CC) -c $(CFLAGS) $(srcdir)/tree.c
diff --git a/sysutils/mkhybrid/pkg/PLIST b/sysutils/mkhybrid/pkg/PLIST
index e4c42393159..af6363e61c9 100644
--- a/sysutils/mkhybrid/pkg/PLIST
+++ b/sysutils/mkhybrid/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2000/11/27 05:00:20 kei Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/11/27 12:54:47 kei Exp $
 bin/mkhybrid
-man/man8/mkhybrid.tbl.gz
+man/man8/mkhybrid.8