Use the bsd.pkg.mk and bsd.pkg.subdir.mk files in the pkgsrc tree.

Remove redundant (and sometimes erroneous) comments.

10 files changed, 20 insertions, 68 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 6ce217b63fa..d6d1557869d 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/02/19 21:48:56 tron Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp
 #
 
@@ -29,4 +29,4 @@
     SUBDIR += xemacs20
     SUBDIR += xvile
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 6e826d8528c..56bcecff7f1 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	GNU emacs
-# Version required:	20.2
-# Date created:		11 October 1997
-# Whom:			hubertf
-#
-# $NetBSD: Makefile,v 1.12 1998/04/13 13:46:39 tron Exp $
+# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 #
 
@@ -41,4 +36,4 @@ post-install:
 	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
 .endfor
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 12f77da0248..2ed6214e7ce 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,11 +1,4 @@
-# New ports collection makefile for:	joe
-# Version required:	2.8
-# Date created:		01 Jul 1995
-# Whom:			torstenb@FreeBSD.ORG
-#
-# Imported into NetBSD by explorer@flame.org
-#
-# $NetBSD: Makefile,v 1.4 1998/04/07 13:04:21 tv Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/17 07:01:28 obrien Exp
 #
 
@@ -23,4 +16,4 @@ MAN1=		joe.1
 
 CFLAGS+=	-DTERMINFO
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 913f9bce427..117b7c3b99a 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    sam
-# Version required:     4.3
-# Date created:         Sun Aug 13 12:36:14 CDT 1995
-# Whom:                 erich@rrnet.com
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:28:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
@@ -30,4 +25,4 @@ MAN3=		add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 graphics.3 rgbpix.3
 MAN4=		font.4 keyboard.4 utf.4
 MAN6=		bitmap.6 regexp.6
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ssam/Makefile b/editors/ssam/Makefile
index 2c66fbb5908..19662bd9c84 100644
--- a/editors/ssam/Makefile
+++ b/editors/ssam/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	ssam
-# Version required:			1.9
-# Date created:				Thu Oct 23 21:00:32 BST 1997
-# Whom:					Alistair Crooks (agc@netbsd.org)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 04:50:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:22 agc Exp $
 #
 
 DISTNAME=	ssam-1.9
@@ -19,4 +14,4 @@ MAN1=		ssam.1
 GNU_CONFIGURE=	yes
 ALL_TARGET=	tst
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index cf09680803e..3b04b1ab470 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    vile
-# Version required:     		7.3
-# Date created:         		Wed Nov 26, 1996
-# Whom:                 		pgf
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 04:53:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:22 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
 #
 
@@ -24,4 +19,4 @@ post-install:
 	@echo "You might want to copy the *.rc files from the source tree before"
 	@echo "doing \`make clean'."
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index eed54613a59..3a6c8541163 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,10 +1,4 @@
-#
-# New ports collection makefile for:	vim
-# Version required:			vim-5.0
-# Date Created:				19 February 1998
-# Whom:					tron
-#
-# $NetBSD: Makefile,v 1.4 1998/03/01 13:35:54 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:23 agc Exp $
 
 DISTNAME=	vim-5.0
 CATEGORIES=	editors
@@ -21,4 +15,4 @@ GNU_CONFIGURE=	yes
 MAN1=	ex.1 gview.1 gvim.1 rgview.1 rgvim.1 rview.1 rvim.1 view.1 vim.1 \
 	xxd.1 vim-ctags.1 vim-etags.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 9561eca9067..a8f22206952 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    wily
-# Version required:     		0.13.36
-# Date created:         		Tue Oct 21 16:06:30 BST 1997
-# Whom:                 		agc@netbsd.org (Alistair Crooks)
-#
-# $NetBSD: Makefile,v 1.2 1998/01/24 22:30:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:45 agc Exp $
 #
 
 DISTNAME=	wily-0.13.36
@@ -16,4 +11,4 @@ MAINTAINER=	agc@netbsd.org
 GNU_CONFIGURE=	yes
 MAN1=		wily.1
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 95e8278f1f0..916d5386107 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	X-Emacs
-# Version required:			20.3
-# Date created:				26 August 1997
-# Whom:					Michael Elbel (me)
-#
-# $NetBSD: Makefile,v 1.19 1998/02/24 23:37:55 tron Exp $
+# $NetBSD: Makefile,v 1.20 1998/04/15 10:38:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 #
 
@@ -75,4 +70,4 @@ post-install:
 		${WRKSRC}/lib-src/gzip-el.sh ${PREFIX}/lib/xemacs-20.3/lisp; \
 	fi
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 5abfca89a94..459ff5a671b 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    xvile
-# Version required:     		7.3
-# Date created:         		Wed Nov 26, 1996
-# Whom:                 		pgf
-#
-# $NetBSD: Makefile,v 1.4 1997/12/22 07:45:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
@@ -37,4 +32,4 @@ post-install:
 	@echo "And also take a look at README.MENU !"
 .endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"