From b679393db5497be44aec2d03789089a77bd46d07 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Fri, 2 Jul 1999 08:37:20 +0000
Subject: Some packages use bsd-style .mk files when building, and so any
 manual pages that are installed will be gzip-compressed, if MANZ is set, or
 not if MANZ is not set.  If the package uses bsd-style .mk files, the
 variable MANCOMPRESSED_IF_MANZ should be set to a value of "yes" in the
 package Makefile.  This replaces the previous method of specific inclusion of
 bsd.prefs.mk, followed by a check for MANZ and conditional assignment of
 MANCOMPRESSED.

Add appropriate documentation, and change all necessary ocurrences in
package Makefiles.
---
 pkgtools/ftp/Makefile         | 9 ++-------
 pkgtools/pax/Makefile         | 9 ++-------
 pkgtools/pkg_install/Makefile | 6 ++----
 3 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/ftp/Makefile b/pkgtools/ftp/Makefile
index bf8b38fcfd1..d6c0f953578 100644
--- a/pkgtools/ftp/Makefile
+++ b/pkgtools/ftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/09/03 11:43:59 agc Exp $
+# $NetBSD: Makefile,v 1.2 1999/07/02 08:37:28 agc Exp $
 #
 
 DISTNAME=		ftp-19980903
@@ -13,11 +13,6 @@ WRKSRC=			${WRKDIR}/ftp
 MAKE_ENV+=		BINDIR=/usr/bin MANDIR=/usr/share/man
 NO_PKG_REGISTER=	yes
 NO_PACKAGE=		No package registration is done
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=		yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile
index 56704127ed4..c6ff289785b 100644
--- a/pkgtools/pax/Makefile
+++ b/pkgtools/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/23 13:47:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/02 08:37:28 agc Exp $
 #
 
 DISTNAME=		pax-19980903
@@ -14,12 +14,7 @@ WRKSRC=			${WRKDIR}/pax
 MAKE_ENV+=		BINDIR=/bin MANDIR=/usr/share/man
 NO_PKG_REGISTER=	yes
 NO_PACKAGE=		No package registration is done
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=		yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 post-extract: 
 	${GREP} -v __RCSID ${FILESDIR}/pwcache.c >${WRKSRC}/pwcache.c
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index dd2fc6ae9bd..d3a8f65e372 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/05/30 16:54:16 tron Exp $
+# $NetBSD: Makefile,v 1.23 1999/07/02 08:37:28 agc Exp $
 #
 
 # Note to package maintainers:
@@ -23,13 +23,11 @@ NO_MTREE=		yes
 NO_PATCH=		yes
 NO_PKG_REGISTER=	yes
 NO_PACKAGE=		No package registration is done
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
 LOCALBASE=		/usr
-.ifdef MANZ
-MANCOMPRESSED=		yes
-.endif
 
 post-install:
 	if [ ! -f $${PKG_DBDIR:-/var/db/pkg}/pkgdb.byfile.db ]; then \
-- 
cgit v1.2.3