From 258b808c9f6f683ca8810e74e4dce09adb0493fb Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 15 Apr 1998 10:38:15 +0000 Subject: Use the bsd.pkg.mk and bsd.pkg.subdir.mk files in the pkgsrc tree. Remove redundant (and sometimes erroneous) comments. --- mbone/Makefile | 4 ++-- mbone/imm/Makefile | 9 ++------- mbone/nte/Makefile | 13 ++++--------- mbone/rat/Makefile | 9 ++------- mbone/sdr/Makefile | 15 ++------------- mbone/vat/Makefile | 9 ++------- mbone/vic/Makefile | 9 ++------- 7 files changed, 16 insertions(+), 52 deletions(-) (limited to 'mbone') diff --git a/mbone/Makefile b/mbone/Makefile index b73f2cd106f..da3b871d6e8 100644 --- a/mbone/Makefile +++ b/mbone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/03/19 14:20:10 frueauf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $ # Id: Makefile,v 1.5 1996/12/03 10:41:49 asami Exp # @@ -13,4 +13,4 @@ SUBDIR += vic # SUBDIR += wb -.include +.include "../mk/bsd.pkg.subdir.mk" diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile index c0171759d1d..2621ccf814e 100644 --- a/mbone/imm/Makefile +++ b/mbone/imm/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: imm -# Version required: 3.6a1 -# Date created: 1997/11/24 -# Whom: is -# -# $NetBSD: Makefile,v 1.6 1998/02/09 00:09:25 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $ # # NetBSD "imm" package # The original was based on the imm-3.5a1 FreeBSD port maintained @@ -23,4 +18,4 @@ LIB_DEPENDS= tk80.1:${PORTSDIR}/x11/tk80 ALL_TARGET= netbsd MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" -.include +.include "../../mk/bsd.pkg.mk" diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile index 1ad29b51277..4c181f2c3cb 100644 --- a/mbone/nte/Makefile +++ b/mbone/nte/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: nte -# Version required: 1.5a23 -# Date created: 5 September 1996 -# Whom: mycroft -# -# $NetBSD: Makefile,v 1.2 1998/03/20 07:22:05 mycroft Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:32 agc Exp $ # DISTNAME= nt.1.5a23 @@ -29,15 +24,15 @@ MAKE_ENV= TK_SRC=${TK_SRC} do-configure: cd ${WRKSRC}/netbsd && sh configure -.include +.include "../../mk/bsd.pkg.mk" #DISGUSTING HACK ALERT #Although nte includes an hsearch.c for those who don't have it in # libc, there's no way to get the default Makefile to build it. # So we build it here. -#This is below the .include since variable names in +#This is below the .include "../../mk/bsd.pkg.mk" since variable names in # targets or dependencies are evaluated when they are read so -# bsd.port.mk must have defined ${WRKSRC} already. +# bsd.pkg.mk must have defined ${WRKSRC} already. pre-build: ${WRKSRC}/netbsd/hsearch.o ${WRKSRC}/netbsd/hsearch.o: ${WRKSRC}/src/hsearch.c diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile index 1ededde2d8e..f14c1a6bc81 100644 --- a/mbone/rat/Makefile +++ b/mbone/rat/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: rat -# Version required: 3.0.23 -# Date created: 5 March 1998 -# Whom: mycroft -# -# $NetBSD: Makefile,v 1.2 1998/03/06 02:12:00 mycroft Exp $ +# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:32 agc Exp $ # DISTNAME= rat-3.0 @@ -31,4 +26,4 @@ do-install: install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ man/man1/rat.1 ${LOCALBASE}/man/man1/rat.1 ) -.include +.include "../../mk/bsd.pkg.mk" diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index a5a6e5c9256..55096db040a 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -1,17 +1,6 @@ -# Packages collection makefile for: sdr -# Version required: 2.3a1 -# Date created: 18 November 1997 -# By: Ignatios Souvatzis -# -# $NetBSD: Makefile,v 1.5 1998/01/30 13:57:55 agc Exp $ +# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp # -# Based on: -# New ports collection makefile for: sdr -# Version required: 2.3a1 -# Date created: 5 September 1996 -# Whom: Bill Fenner -# DISTNAME= sdr.V2.3a1 PKGNAME= sdr-2.3a1 @@ -33,4 +22,4 @@ USE_X11= yes post-extract: -@rm ${WRKSRC}/src/libs.tcl -.include +.include "../../mk/bsd.pkg.mk" diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 166c18a206c..13891673d74 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: vat -# Version required: 4.0b2 -# Date created: 2 November 1996 -# Whom: fenner -# -# $NetBSD: Makefile,v 1.7 1998/03/16 08:01:58 mycroft Exp $ +# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:33 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp # @@ -32,4 +27,4 @@ MAN1= vat.1 post-install: @strip ${PREFIX}/bin/vat -.include +.include "../../mk/bsd.pkg.mk" diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 4e0daf522d6..c0db6323cac 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: vic -# Version required: 2.8 -# Date created: 1997 Nov 19 -# Whom: is -# -# $NetBSD: Makefile,v 1.4 1998/01/30 13:57:57 agc Exp $ +# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:33 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp # @@ -24,4 +19,4 @@ post-install: strip ${PREFIX}/bin/vic strip ${PREFIX}/bin/histtolut -.include +.include "../../mk/bsd.pkg.mk" -- cgit v1.2.3