diff options
-rw-r--r-- | benchmarks/bonnie/Makefile | 8 | ||||
-rw-r--r-- | benchmarks/bonnie/patches/patch-ab | 2 | ||||
-rw-r--r-- | comms/kermit/Makefile | 6 | ||||
-rw-r--r-- | comms/kermit/files/Makefile.sed | 2 | ||||
-rw-r--r-- | net/ttcp/Makefile | 10 | ||||
-rw-r--r-- | net/ttcp/patches/patch-aa | 2 |
6 files changed, 14 insertions, 16 deletions
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index 06e3334a8d6..9eb57364d02 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -3,7 +3,7 @@ # Date created: 26 September 1994 # Whom: se # -# $NetBSD: Makefile,v 1.4 1998/03/07 13:58:27 tron Exp $ +# $NetBSD: Makefile,v 1.5 1998/03/20 22:04:08 frueauf Exp $ # $FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp # @@ -17,10 +17,8 @@ MAINTAINER= se@FreeBSD.org NO_CONFIGURE= yes -CAT1= bonnie.0 -MAN1= bonnie.1 - -MANCOMPRESSED= 1 +# Do not list MAN/CAT pages here. It will confuse if MANZ is set. +# The pkg uses BSD-style-Makefiles itself, so it does the right thing. post-extract: ${MV} ${WRKSRC}/Bonnie.c ${WRKSRC}/bonnie.c diff --git a/benchmarks/bonnie/patches/patch-ab b/benchmarks/bonnie/patches/patch-ab index 3319d1b35ac..6270f7847ce 100644 --- a/benchmarks/bonnie/patches/patch-ab +++ b/benchmarks/bonnie/patches/patch-ab @@ -11,6 +11,6 @@ +MANDIR=${PREFIX}/man -Bonnie: -+MANZ= 1 ++MANINSTALL= maninstall catinstall + +.include <bsd.prog.mk> diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile index 288599fea38..9260b79897f 100644 --- a/comms/kermit/Makefile +++ b/comms/kermit/Makefile @@ -3,7 +3,7 @@ # Date created: Oct 27, 1994 # Whom: pst # -# $NetBSD: Makefile,v 1.5 1998/03/10 13:39:53 frueauf Exp $ +# $NetBSD: Makefile,v 1.6 1998/03/20 22:04:08 frueauf Exp $ # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp # @@ -19,12 +19,12 @@ RESTRICTED= "'No redistribution' copyright" MIRROR_DISTFILE= no NO_WRKSUBDIR= yes -PLIST_SRC= ${WRKDIR}/.PLIST-src +# Do not list MAN/CAT pages here. It will confuse if MANZ is set. +# The pkg uses BSD-style-Makefiles itself, so it does the right thing. post-install: @${MKDIR} ${PREFIX}/share/examples/kermit ${INSTALL_DATA} ${FILESDIR}/dot.kermrc ${PREFIX}/share/examples/kermit @${CAT} ${PKGDIR}/DESCR - [ "X$$MANZ" = X"" ] && ${SED} -e 's|.gz$$||' < ${PKGDIR}/PLIST > ${PLIST_SRC} .include <bsd.port.mk> diff --git a/comms/kermit/files/Makefile.sed b/comms/kermit/files/Makefile.sed index 39d8775fd5f..d217dc4055d 100644 --- a/comms/kermit/files/Makefile.sed +++ b/comms/kermit/files/Makefile.sed @@ -9,6 +9,8 @@ SRCS= ckcmai.c ckucmd.c ckuusr.c ckuus2.c ckuus3.c ckuus4.c ckuus5.c \ BINDIR=%%PREFIX%%/bin MANDIR=%%PREFIX%%/man +MANINSTALL= maninstall catinstall + CLEANFILES+= ckcpro.c ckcwart.o wart kermit.1 DPADD= ${LIBCURSES} ${LIBTERM} diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile index 8d891a8639e..ba70ee43f99 100644 --- a/net/ttcp/Makefile +++ b/net/ttcp/Makefile @@ -1,9 +1,9 @@ # New ports collection makefile for: ttcp -# Version required: ??? +# Version required: 1.12 # Date created: 14 December 1997 # Whom: thorpej # -# $NetBSD: Makefile,v 1.8 1998/03/07 13:57:00 tron Exp $ +# $NetBSD: Makefile,v 1.9 1998/03/20 22:04:08 frueauf Exp $ # DISTNAME= ttcp @@ -17,9 +17,7 @@ MAINTAINER= thorpej@NetBSD.ORG NO_CONFIGURE= yes NO_WRKSUBDIR= yes -CAT1= ttcp.0 -MAN1= ttcp.1 - -MANCOMPRESSED= 1 +# Do not list MAN/CAT pages here. It will confuse if MANZ is set. +# The pkg uses BSD-style-Makefiles itself, so it does the right thing. .include <bsd.port.mk> diff --git a/net/ttcp/patches/patch-aa b/net/ttcp/patches/patch-aa index 7433b9ee798..9eded3601ff 100644 --- a/net/ttcp/patches/patch-aa +++ b/net/ttcp/patches/patch-aa @@ -7,6 +7,6 @@ +BINDIR=${PREFIX}/bin +MANDIR=${PREFIX}/man + -+MANZ= 1 ++MANINSTALL= maninstall catinstall + +.include <bsd.prog.mk> |