Use a relative path for bsd.pkg.mk instead of relying on the search path.

19 files changed, 37 insertions, 40 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index a03b7636569..b88d81b3bf9 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/08/17 11:18:05 rh Exp $
+# $NetBSD: Makefile,v 1.7 1999/09/28 20:40:02 soren Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
@@ -23,4 +23,4 @@ post-configure:
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index d1e3ffbf2a4..96f7c679593 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/05/26 20:48:16 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:03 soren Exp $
 
 DISTNAME=	pilotmgr-1.107
 CATEGORIES=	comms
@@ -47,4 +47,4 @@ do-install:
 		done
 		${LN} -fs ${PM_DOC_DIR} ${PM_PERL_DIR}/docs
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 794b6e2fd4a..67f5d499343 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/15 20:39:41 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/09/28 20:40:03 soren Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/26 02:16:00 steve Exp
 #
 
@@ -28,4 +28,4 @@ do-install:
 	@${MKDIR} ${PREFIX}/share/doc/xcoral/HTML/icons
 	${CP} -r ${WRKSRC}/Doc/* ${PREFIX}/share/doc/xcoral
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index ddc2431bc61..a0b240e9940 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/04/26 18:38:28 garbled Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:03 soren Exp $
 
 DISTNAME=	nethack-all-3.2.2
 CATEGORIES=	games x11
@@ -20,4 +20,4 @@ NO_CONFIGURE=	yes
 
 do-install:	# empty
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index c1cdf22a012..69f94e80526 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/04/02 22:31:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/09/28 20:40:03 soren Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/12/08 01:11:27 max Exp
 #
 
@@ -22,4 +22,4 @@ post-extract:
 post-install:
 	${X11BASE}/bin/mkfontdir ${X11BASE}/lib/X11/fonts/misc
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 3462605285b..ff95daaa4ea 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/06/28 11:52:26 agc Exp $
+# $NetBSD: Makefile,v 1.12 1999/09/28 20:40:03 soren Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.13
@@ -58,4 +58,4 @@ post-patch:
 	done
 .endif
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/archie/Makefile b/net/archie/Makefile
index f6f5ade6faa..681f6e2cc68 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/07/08 00:38:25 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/09/28 20:40:04 soren Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/07/21 00:04:13 fenner Exp
 #
 
@@ -13,4 +13,4 @@ HOMEPAGE=	http://www.bunyip.com/products/archie/
 
 WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index c147aedd16f..fb6814a8bd7 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/04/15 20:39:46 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/09/28 20:40:04 soren Exp $
 # FreeBSD Id: Makefile,v 1.12 1996/12/01 01:23:22 obrien Exp
 #
 
@@ -10,4 +10,4 @@ MAINTAINER=		packages@netbsd.org
 
 USE_IMAKE=		yes
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 4a8c0aa5078..bebae5bb1d0 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/09/08 18:55:59 jwise Exp $
+# $NetBSD: Makefile,v 1.6 1999/09/28 20:40:04 soren Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
@@ -30,4 +30,4 @@ pre-install:
 post-install:
 	${PREFIX}/bin/texconfig rehash
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/libident/Makefile b/security/libident/Makefile
index ca5255fd37e..0968ef1838e 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/03/12 16:29:03 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:04 soren Exp $
 # FreeBSD ID: Makefile,v 1.6 1998/01/25 20:42:37 torstenb Exp
 
 DISTNAME=	libident-0.22
@@ -12,4 +12,4 @@ USE_LIBTOOL=	yes
 ALL_TARGET=	netbsd
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 70e9490a86b..1948b24ac9f 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 1999/09/18 22:04:55 kim Exp $
+# $NetBSD: Makefile,v 1.61 1999/09/28 20:40:04 soren Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -193,9 +193,6 @@ post-install:
 	fi
 	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd.sh
 
-# Include <bsd.pkg.mk> here.  It is essential to have all the override
-# targets precede inclusion of this.
-
 BUILD_DEFS+=		DONT_USE_IDEA SSH_CONF_DIR SSH_SUID USE_RSAREF2
 BUILD_DEFS+=		LIBWRAP_FWD M68060 USE_SOCKS USE_INET6
 
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 9dfd82c91d9..06c6dbe24c4 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/27 14:25:18 drochner Exp $
+# $NetBSD: Makefile,v 1.2 1999/09/28 20:40:05 soren Exp $
 # FreeBSD Id: Makefile,v 1.17 1999/04/24 09:25:32 kuriyama Exp
 
 DISTNAME=	db141
@@ -34,4 +34,4 @@ do-install:
 post-install:
 	@${CAT} ${FILESDIR}/install-note
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 2a07945b113..4dd4c2eafa7 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/09/02 20:16:46 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/09/28 20:40:05 soren Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp
 
 DISTNAME=       analog3.32
@@ -34,4 +34,4 @@ do-install:
 	${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg \
 	  ${PREFIX}/etc/analog.cfg.default
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/squid-current/Makefile b/www/squid-current/Makefile
index 7b546e42539..c8705d20e60 100644
--- a/www/squid-current/Makefile
+++ b/www/squid-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/03/08 10:53:57 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/09/28 20:40:05 soren Exp $
 #
 
 DISTNAME=	squid-2.1.PATCH2
@@ -62,4 +62,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
 	@${SETENV} ${MAKE_ENV} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 65065d3c461..be23343ef36 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/08/17 23:10:55 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/09/28 20:40:05 soren Exp $
 
 DISTNAME=	squid-2.2.STABLE4-src
 PKGNAME=	squid-2.2s4
@@ -69,4 +69,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
 	@${SETENV} ${MAKE_ENV} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 4b1ac89609f..7d81bbe327a 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/05/10 07:48:01 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/09/28 20:40:05 soren Exp $
 # FreeBSD Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp
 
 DISTNAME=	w3c-httpd-3.0A
@@ -31,7 +31,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiparse ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/Daemon/${OSNAME}/cgiutils ${PREFIX}/sbin
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
 
 .if (${OPSYS} == "FreeBSD")
 OSNAME=	freebsd
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index dfefcd1397e..acf09f58a6c 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/04/01 14:07:56 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:06 soren Exp $
 # $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
 #
 
@@ -19,4 +19,4 @@ USE_IMAKE=	yes
 pre-install:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 5f48ef9b7c6..053ae169221 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/04/01 14:07:56 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:06 soren Exp $
 # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
 #
 
@@ -18,4 +18,4 @@ NO_BUILD=	yes
 post-extract:
 	@chmod -R go+rX ${WRKDIR}
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview/Makefile b/x11/xview/Makefile
index 87400761128..3cdc45baf69 100644
--- a/x11/xview/Makefile
+++ b/x11/xview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/26 19:30:28 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1999/09/28 20:40:06 soren Exp $
 #
 
 DISTNAME=	xview3.2p1-X11R6
@@ -22,4 +22,4 @@ NO_CONFIGURE=	yes
 
 do-install:	# empty
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"