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

Remove redundant (and sometimes erroneous) comments.

11 files changed, 22 insertions, 76 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 2bc04cfd0ac..eaabe45c7e6 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/02/28 11:37:20 tron Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/15 10:38:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.45 1997/08/13 18:35:22 andreas Exp 
 #
 
@@ -36,4 +36,4 @@
 #    SUBDIR += xlbiff
 #    SUBDIR += youbin
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 38becfa8df3..171af756989 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:    elm
-# See also: http://www.ozone.fmi.fi/KEH/
-# Version required:     2.4.25.ME+32
-# Date created:         26 June 1995
-# Whom:                 ache
-#
-# $NetBSD: Makefile,v 1.4 1998/03/10 14:29:45 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:30 agc Exp $
 # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
@@ -43,4 +37,4 @@ post-install:
 			${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \
 	fi
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index 770639ad762..be255fff914 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection Makefile for:    exmh2
-# Version required:		2.0.1
-# Date created:			1 Jan 97
-# Whom:				Peter Wemm <peter@freebsd.org>
-#
-# $NetBSD: Makefile,v 1.5 1998/02/28 10:37:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/02/15 05:36:54 peter Exp
 #
 
@@ -61,4 +56,4 @@ do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
 		WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/install
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index d69c2a65a20..11cfd804115 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:	faces-1.6.1
-# Version required:	1.6.1
-# Date created:		09 December 96
-# Whom:			Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
-#			Andreas Klemm <andreas@FreeBSD.ORG>
-#
-# $NetBSD: Makefile,v 1.6 1998/03/10 14:32:54 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp
 #
 
@@ -36,4 +30,4 @@ post-install:
 	@${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \
 		-e 's|@x11base@|'${X11BASE}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 600eb936f1d..d2de289e068 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	fetchmail
-# Version required:     4.3.6
-# Date created:		26 Oct 1996
-# Whom:			Ville Eerola <ve@sci.fi>
-#
-# $NetBSD: Makefile,v 1.4 1998/03/16 08:24:49 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:31 agc Exp $
 # $FreeBSD Id: Makefile,v 1.55 1998/01/29 17:13:07 ache Exp
 #
 
@@ -33,4 +28,4 @@ post-install:
 	   fetchmail-FAQ.html fetchmail-features.html \
 	   design-notes.html ${FDOC}
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index d2c0678440e..d9d9d778e29 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	metamail
-# Version required:	2.7
-# Date created:		17 Oct 1994
-# Whom:			torstenb
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 20:29:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:27:26 asami Exp
 #
 
@@ -27,4 +22,4 @@ MAN4=		mailcap.4
 post-patch:
 	${RM} -f ${WRKDIR}/mm2.7/src/bin/*.orig
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 48103f557ea..633b8a04cd7 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,10 +1,4 @@
-#
-# New ports collection makefile for:	mutt
-# Version required:			mutt-0.91i
-# Date Created:				11 April 1998
-# Whom:					tron
-#
-# $NetBSD: Makefile,v 1.4 1998/04/12 23:34:21 tron Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:31 agc Exp $
 
 DISTNAME=	mutt-0.91i
 CATEGORIES=	mail
@@ -31,4 +25,4 @@ post-install:
 	${CP} ${WRKSRC}/doc/manual.txt ${PREFIX}/share/doc/mutt
 	${CP} ${WRKSRC}/doc/pgp-Notes.txt ${PREFIX}/share/doc/mutt
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index a75fffb8ec6..50a772b61d1 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	nmh
-# Version required:     		0.23
-# Date created:				26 July 1997
-# Whom:					Scott Blachowicz <Scott.Blachowicz@seaslug.org>
-#
-# $NetBSD: Makefile,v 1.13 1998/02/23 14:21:27 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/15 10:38:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -41,4 +36,4 @@ post-patch:
 post-install:
 	@PKG_PREFIX='${PREFIX}' sh -f ${PKGDIR}/INSTALL
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 000e95c6bce..d98b1203e7c 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:	pine
-# http://www.washington.edu/pine/
-# Version required:     3.96
-# Date created:		03 September 1994
-# Whom:			mr
-#
-# $NetBSD: Makefile,v 1.9 1998/03/19 02:32:29 cjs Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 # Note: If you want to have pine's default behaviour of not allowing
@@ -58,4 +52,4 @@ post-install:
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} doc/tech-notes.txt ${PREFIX}/share/doc/pine
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 454c31d854e..f08e8ff96bf 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	procmail
-# Version required:     3.11pre7
-# Date created:		24 September 1994
-# Whom:			adam
-#
-# $NetBSD: Makefile,v 1.2 1998/02/27 23:53:08 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:31 agc Exp $
 # $FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
 #
 
@@ -19,4 +14,4 @@ INSTALL_TARGET= install-suid install.man
 MAN1=		procmail.1 formail.1 lockfile.1
 MAN5=		procmailex.5 procmailrc.5 procmailsc.5
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 4a6b272068a..5334b390b5d 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	qpopper
-# Version required:     		2.41beta1
-# Date created:				February 12, 1998
-# Whom:					Ted Lemon <mellon@fugue.com>
-#
-# $NetBSD: Makefile,v 1.3 1998/02/15 22:25:12 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:32 agc Exp $
 #
 
 DISTNAME=	qpopper2.41beta1
@@ -36,4 +31,4 @@ do-install:
 	 ${INSTALL} -o ${MANOWN} -c -g ${MANGRP} -m ${MANMODE} popper.0 \
 					${LOCALBASE}/man/cat8/qpopper.0 )
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"