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

Remove redundant (and sometimes erroneous) comments.

6 files changed, 15 insertions, 40 deletions

diff --git a/security/Makefile b/security/Makefile
index 8a80f3b27b2..9fc3898b231 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/03/19 14:26:28 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:46 agc Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/11/09 10:17:02 asami Exp
 #
 
@@ -27,4 +27,4 @@
 #    SUBDIR += vscan
 #    SUBDIR += xinetd
 
-.include <bsd.port.subdir.mk>
+.include "../mk/bsd.pkg.subdir.mk"
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 96c2a6bf3bc..9e2dbc27441 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	p5-MD5
-# Version required:			1.7
-# Date created:				September 30th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
-# $NetBSD: Makefile,v 1.3 1998/01/24 22:48:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:23 jfitz Exp
 #
 
@@ -23,4 +18,4 @@ MANPREFIX=	${PREFIX}/lib/perl5
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index f388a47ed05..5b4e61a21c7 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	pgp2
-# Version required:     2.6.3(i)a
-# Date created:         8 Jul 1995 (ache@FreeBSD.ORG)
-# Whom:                 tv@NetBSD.ORG
-#
-# $NetBSD: Makefile,v 1.4 1998/03/26 10:48:32 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -91,4 +86,4 @@ do-install:
 	[ -f ${PGPLIB}/pgp.hlp ] || \
 		${INSTALL_DATA} ${WRKDIR}/en.hlp ${PGPLIB}/pgp.hlp
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 88959a0b01e..6f62a39243e 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: rsaref
-# Version required:     2.0
-# Date created:         17 Feb 1998
-# Whom:                 tv@netbsd.org
-#
-# $NetBSD: Makefile,v 1.5 1998/04/12 22:03:05 tv Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:47 agc Exp $
 #
 
 DISTNAME=		rsaref20
@@ -53,4 +48,4 @@ do-install:
 	cd ${WRKDIR}/doc && \
 		${INSTALL_DATA} info.txt rsaref.txt ${PREFIX}/share/doc/rsaref
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 759f1ddcde7..c2bb2310c28 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	ssh
-# Version required:     		1.2.22
-# Date created:				19971214
-# Whom:					hubertf@netbsd.org
-#
-# $NetBSD: Makefile,v 1.15 1998/03/19 02:20:53 tv Exp $
+# $NetBSD: Makefile,v 1.16 1998/04/15 10:38:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -23,8 +18,8 @@ GNU_CONFIGURE=		YES
 
 # Include local make config file here.  It is essential to have this
 # precede any override targets (those that override defaults in
-# <bsd.port.mk> that test variables that may be set here.  Note that
-# this inclusion is otherwise redundant, since <bsd.port.mk> includes
+# <bsd.pkg.mk> that test variables that may be set here.  Note that
+# this inclusion is otherwise redundant, since <bsd.pkg.mk> includes
 # <bsd.own.mk>, which includes it.
 # XXX: FIXME ! We need a simple way of doing this in many dozen pkgs.
 
@@ -149,7 +144,7 @@ post-install:
 pre-clean:
 	@${RM} -f ${PKGDIR}/PLIST ${PKGDIR}/MESSAGE ${PKGDIR}/DEINSTALL
 
-# Include <bsd.port.mk> here.  It is essential to have all the override
+# Include <bsd.pkg.mk> here.  It is essential to have all the override
 # targets precede inclusion of this.
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 63c09482b56..781b3f07497 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    sudo
-# Version required:     1.5.3
-# Date created:         Sun Dec 14 23:01:32 MET 1997
-# Whom:                 soren@t.dk
-#
-# $NetBSD: Makefile,v 1.4 1998/01/24 22:52:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
 #
 
@@ -24,4 +19,4 @@ MAN8=		sudo.8 visudo.8
 post-install:
 	cd ${WRKSRC} ; ${CP} sample.sudoers ${PREFIX}/etc/sudoers.example
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"