Include bsd.prefs.mk so that variables can be set in /etc/mk.conf

6 files changed, 19 insertions, 10 deletions

diff --git a/net/bing/Makefile b/net/bing/Makefile
index 69fd5da0fe9..89bd998c8fd 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:29 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/06/03 13:16:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/10/13 09:14:49 tg Exp
 #
 
@@ -10,6 +10,8 @@ MAINTAINER=	packages@netbsd.org
 
 MAN8= 		bing.8
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/bing
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 0a32de8b334..53fdfc0d4b2 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/06/03 13:16:56 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/01/03 10:14:21 obrien Exp
 #
 
@@ -14,6 +14,8 @@ MAINTAINER=     packages@netbsd.org
 GNU_CONFIGURE=	yes
 MAN1=		rsync.1
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 	@strip ${PREFIX}/bin/rsync
 .if !defined(NOPORTDOCS)
diff --git a/net/rumba/Makefile b/net/rumba/Makefile
index d0f70b266a9..3d8c87e7e4a 100644
--- a/net/rumba/Makefile
+++ b/net/rumba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/04/26 15:25:59 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/06/03 13:16:57 agc Exp $
 # $FreeBSD Id: Makefile,v 1.2 1997/07/21 19:28:46 max Exp
 #
 
@@ -14,6 +14,8 @@ MAINTAINER=	tron@netbsd.org
 MAKE_ENV=	PWD=${WRKSRC}
 MAN8=		smbmount.8
 
+.include "../../mk/bsd.prefs.mk"
+
 post-extract:
 	@${MKDIR} ${WRKDIR}/unrumba
 	@${LN} -s ${FILESDIR}/unrumba.c ${WRKDIR}/unrumba
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9cf70964001..8f4c9b1c7ed 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:39 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/03 13:16:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
 #
 
@@ -21,6 +21,8 @@ SAMBA_SPOOL=	/var/spool/samba
 SAMBA_LOGDIR=	/var/log
 SAMBA_PRIVATE=	${PREFIX}/private
 
+.include "../../mk/bsd.prefs.mk"
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba/faq
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 201920c0526..82c541c6560 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/06/03 13:16:57 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
 #
 
@@ -15,6 +15,8 @@ ALL_TARGET=	tcptrace
 
 DOCFILES=	COPYRIGHT README README.tput_graphs
 
+.include "../../mk/bsd.prefs.mk"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 574807f3f86..c13bd5d832b 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.9 1998/05/10 10:30:14 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/03 13:16:57 agc Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
-CATEGORIES=	athena
+CATEGORIES=	net athena
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/
 
 MAINTAINER=	mycroft@NetBSD.ORG
 
-.if exists(/etc/mk.conf)
-.include </etc/mk.conf>
-.endif
+.include "../../mk/bsd.prefs.mk"
+
 .if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
 CONFIGURE_ARGS+="--with-krb4"
 CONFIGURE_ENV+=CPPFLAGS=-I/usr/include/kerberosIV