From 8666c472fdd25411a54955c9e23e3c64c19d9b49 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Thu, 29 Jul 2004 21:44:01 +0000
Subject: Pullup ticket 78 to the pkgsrc-2004Q2 branch, requested by Grant
 Beattie

follow pkgsrc conventions for including bsd.pkg.mk

	Module Name:    pkgsrc
	Committed By:   grant
	Date:           Sat Jul 10 09:08:44 UTC 2004

	Modified Files:
		pkgsrc/devel/as31: Makefile
		pkgsrc/net/tcpdstat: Makefile

	Log Message:
	.include "../../mk/bsd.pkg.mk" not .include <../../mk/bsd.pkg.mk>
---
 devel/as31/Makefile       | 4 ++--
 doc/CHANGES-pkgsrc-2004Q2 | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index 5b3209ec413..3778a296263 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:13:27 agc Exp $
+# $NetBSD: Makefile,v 1.6.4.1 2004/07/29 21:44:01 agc Exp $
 
 DISTNAME=	asm.8051
 PKGNAME=	as31-19900126
@@ -21,4 +21,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/as31.man ${PREFIX}/man/man1/as31.1
 	${INSTALL_DATA} ${WRKSRC}/as31.cat ${PREFIX}/man/cat1/as31.0
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index d6e65b999bb..e28289c2982 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.41 2004/07/29 21:40:45 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.42 2004/07/29 21:44:01 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -78,4 +78,6 @@ Pullup ticket 76, requested by Grant Beattie [agc 2004-07-29]
 	build fix for tcpdpriv
 Pullup ticket 77, requested by Grant Beattie [agc 2004-07-29]
 	build fix for tcpdstat
+Pullup ticket 78, requested by Grant Beattie [agc 2004-07-29]
+	follow pkgsrc conventions for including bsd.pkg.mk
 
-- 
cgit v1.2.3