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.

24 files changed, 60 insertions, 141 deletions

diff --git a/Packages.txt b/Packages.txt
index cac97e08e62..e65c387429f 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.53 1999/04/15 20:39:38 tron Exp $
+# $NetBSD: Packages.txt,v 1.54 1999/07/02 08:37:20 agc Exp $
 ###########################################################################
 
 			==========================
@@ -682,17 +682,8 @@ fact that the CPU type is an Intel-based little-endian CPU.
 
 To test whether you are working on a 4.4 BSD-derived system, you should use
 the BSD definition, which is defined in <sys/param.h> on said systems.
-Unfortunately, it may not always be appropriate to include that header file
-without checking whether it's available:
 
-  [ Note that this will no longer work with NetBSD 1.3I (current)
-    and later since we no longer define "unix" or "__unix__" by
-    default with the compiler! Someone with knowledge how to solve
-    this cleanly should correct this note.                         ]
-
-        #if (defined(__unix__) || defined(unix)) && !defined(USG)
         #include <sys/param.h>
-        #endif
 
 and then you can surround the BSD-specific parts of your port using the
 conditional:
@@ -820,6 +811,12 @@ not - if it needs one which is not already there, it will be appended
 automatically, and if there is a .gz suffix which is not needed, it
 will be deleted automatically.
 
+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.
+
 
  6.4 Feedback to the author
  ==========================
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index a5e949aca55..85ac37401cb 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/05/05 16:54:03 bad Exp $
+# $NetBSD: Makefile,v 1.14 1999/07/02 08:37:21 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp
 #
 
@@ -13,11 +13,7 @@ HOMEPAGE=	http://www.textuality.com/bonnie/index.html
 
 NO_CONFIGURE=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 post-extract:
 	${MV} ${WRKSRC}/Bonnie.c ${WRKSRC}/bonnie.c
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 57101d13edc..982c22c9a72 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/03/06 22:50:31 tron Exp $
+# $NetBSD: Makefile,v 1.15 1999/07/02 08:37:22 agc Exp $
 # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
 #
 
@@ -15,11 +15,7 @@ RESTRICTED=	"'No redistribution' copyright"
 MIRROR_DISTFILE= no
 NO_WRKSUBDIR=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index c0a43f1c5ca..e8fb4de7322 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/09/22 14:41:05 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/07/02 08:37:22 agc Exp $
 
 DISTNAME=	modemd-970221
 PKGNAME=	modemd-19970221
@@ -7,11 +7,7 @@ MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
 
 MAINTAINER=	tsarna@netbsd.org
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 pre-install:
 	${MKDIR} ${PREFIX}/share/examples/modemd
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index 6445d90b94c..25a1f47005c 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:37 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/07/02 08:37:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/18 11:22:35 asami Exp
 #
 
@@ -10,10 +10,6 @@ MAINTAINER=		tsarna@netbsd.org
 
 NOT_FOR_PLATFORM=	*-*-alpha	# Severe LP64 problems
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile
index 6b08e81eed3..a4b64faeb5f 100644
--- a/devel/libscsi/Makefile
+++ b/devel/libscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/12/28 02:48:38 tv Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/02 08:37:23 agc Exp $
 #
 
 DISTNAME=	libscsi-1.6
@@ -9,10 +9,6 @@ MAINTAINER=	packages@netbsd.org
 
 MAKE_ENV=	LIBDIR=${PREFIX}/lib MANDIR=${PREFIX}/man NOPIC=1 NOPROFILE=1
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 4119d5809d7..127a5a6f00e 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/01 14:07:56 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/07/02 08:37:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
@@ -13,8 +13,9 @@ MAINTAINER=		packages@netbsd.org
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
-OPSYS!=			uname -s
-.if (${OPSYS} == "NetBSD")
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
 MANCOMPRESSED=		yes
 .endif
 
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index c50a16f94e3..4900df95950 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/05/24 20:39:40 tv Exp $
+# $NetBSD: Makefile,v 1.5 1999/07/02 08:37:23 agc Exp $
 #
 
 DISTNAME=		doscmd-19960502-2
@@ -14,11 +14,7 @@ WRKSRC=			${WRKDIR}/doscmd
 
 MAKE_ENV=		X11BASE=${X11BASE}
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 do-configure:
 	@cd ${WRKSRC} && \
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 6d4092cdfea..9d3bba52907 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/06/20 21:06:20 tron Exp $
+# $NetBSD: Makefile,v 1.13 1999/07/02 08:37:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
 #
 
@@ -16,9 +16,6 @@ DIST_SUBDIR=		icon
 NO_WRKSUBDIR=		true
 ALL_TARGET=		Icon Icon-iconc
 
-.include "../../mk/bsd.prefs.mk"
-.if defined(MANZ)
-MANCOMPRESSED=		yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index b5a309acbd1..1368005670e 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/20 11:57:14 tv Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/02 08:37:23 agc Exp $
 
 DISTNAME=	mailwrapper-19990412
 CATEGORIES=	mail
@@ -9,15 +9,12 @@ MAINTAINER=	tron@netbsd.org
 MIRROR_DISTFILE=	no
 NO_CONFIGURE=		yes
 NO_PATCH=		yes
+MANCOMPRESSED_IF_MANZ=	yes
 
 .if exists(/usr/sbin/mailwrapper)
 IGNORE=         "is part of your NetBSD distribution"
 .endif
 
-.include "../../mk/bsd.prefs.mk"
-.if defined(MANZ)
-MANCOMPRESSED=	1
-.endif
 WRKSRC=		${WRKDIR}/mailwrapper
 
 MAILER_CONF=	/etc/mailer.conf
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 59cd7e37923..71f8f888df1 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/06/27 20:09:23 christos Exp $
+# $NetBSD: Makefile,v 1.11 1999/07/02 08:37:24 agc Exp $
 
 DISTNAME=	postfix-19990601
 CATEGORIES=	mail
@@ -8,6 +8,7 @@ MAINTAINER=	christos@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
 
 MIRROR_DISTFILE= no
+MANCOMPRESSED_IF_MANZ=	yes
 
 pre-patch:
 	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
@@ -39,10 +40,4 @@ pre-install:
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=  yes
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 383375dd91c..3eb4694e5c5 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/07/03 23:30:10 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/07/02 08:37:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/04/30 03:18:06 asami Exp
 #
 
@@ -12,12 +12,7 @@ MAINTAINER=	packages@netbsd.org
 
 MIRROR_DISTFILE= no
 WRKSRC=		${WRKDIR}/ls
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 pre-patch:
 	${CP} ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
diff --git a/misc/team/Makefile b/misc/team/Makefile
index 83af2e7c169..e434d215033 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/07/03 23:30:10 tron Exp $
+# $NetBSD: Makefile,v 1.13 1999/07/02 08:37:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/30 03:18:06 asami Exp
 #
 
@@ -9,11 +9,6 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	packages@netbsd.org
 
 MIRROR_DISTFILE= no
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 4e5aae9e15c..66910c5e0a4 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.288 1999/07/02 00:11:22 hubertf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.289 1999/07/02 08:37:26 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -2181,7 +2181,8 @@ depend:
 tags:
 .endif
 
-# if automatic manual page compression is done, set it if MANZ is set
+# if automatic manual page compression is done by the package according
+# to MANZ's value, set MANCOMPRESSED if MANZ is set
 .if defined(MANCOMPRESSED_IF_MANZ) && defined(MANZ)
 MANCOMPRESSED=	yes
 .endif
diff --git a/net/dip/Makefile b/net/dip/Makefile
index ca667eaed50..99eb0ede186 100644
--- a/net/dip/Makefile
+++ b/net/dip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/07/03 23:30:10 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/07/02 08:37:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/04/30 03:18:07 asami Exp
 #
 
@@ -14,11 +14,6 @@ MAINTAINER=	packages@netbsd.org
 
 MIRROR_DISTFILE= no
 NO_CONFIGURE=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/spegla/Makefile b/net/spegla/Makefile
index c5b0a3d5237..9df0b19d1ef 100644
--- a/net/spegla/Makefile
+++ b/net/spegla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/02/26 11:27:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/07/02 08:37:27 agc Exp $
 #
 
 DISTNAME=	spegla-1.04
@@ -7,11 +7,6 @@ MASTER_SITES=	ftp://ftp.luth.se/pub/unix/mirror/ \
 		ftp://subzero.campus.luth.se/pub/spegla/
 
 MAINTAINER=	jnilsson@ludd.luth.se
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile
index 31f966eee03..2336715bc41 100644
--- a/net/ttcp/Makefile
+++ b/net/ttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:17:20 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1999/07/02 08:37:27 agc Exp $
 #
 
 DISTNAME=	ttcp
@@ -12,11 +12,6 @@ HOMEPAGE=	http://www.ccci.com/tools/ttcp/
 
 NO_CONFIGURE=	yes
 NO_WRKSUBDIR=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"
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 \
diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile
index 4119d5809d7..127a5a6f00e 100644
--- a/plan9/sam/Makefile
+++ b/plan9/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/01 14:07:56 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/07/02 08:37:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
@@ -13,8 +13,9 @@ MAINTAINER=		packages@netbsd.org
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
-OPSYS!=			uname -s
-.if (${OPSYS} == "NetBSD")
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
 MANCOMPRESSED=		yes
 .endif
 
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 0f43a1fa151..04262db53bb 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/04/26 19:25:06 garbled Exp $
+# $NetBSD: Makefile,v 1.8 1999/07/02 08:37:29 agc Exp $
 #
 
 DISTNAME=	catdoc-0.35
@@ -9,11 +9,7 @@ MAINTAINER=	packages@netbsd.org
 
 DEPENDS=	tk-8.0.5:../../x11/tk80
 
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 USE_X11=	yes
 CFLAGS+=	-Dunix
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index ab92fceb91b..3f47a60e2af 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/08/20 15:17:40 tsarna Exp $
+# $NetBSD: Makefile,v 1.10 1999/07/02 08:37:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/07 19:47:09 max Exp
 #
 
@@ -10,11 +10,11 @@ MASTER_SITES=	ftp://cclub.tutcc.tut.ac.jp/pub/xmascot/
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 HOMEPAGE=	http://cclub.cc.tut.ac.jp/xmascot/
 
-OPSYS!=		uname -s
-
 USE_IMAKE=	yes
 
-.if (${OPSYS} != "NetBSD")
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "NetBSD"
 MANCOMPRESSED=	yes
 .endif
 
diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile
index 356f0999b94..cc5dc1bc171 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:58 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/07/02 08:37:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp
 #
 
@@ -12,11 +12,6 @@ MAINTAINER=	packages@netbsd.org
 USE_X11BASE=	yes
 IGNOREFILES=	${DISTFILES}
 WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
-
-.include "../../mk/bsd.prefs.mk"
-
-.ifdef MANZ
-MANCOMPRESSED=	yes
-.endif
+MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.pkg.mk"