Change {ONLY,NOT}_FOR_{ARCH,OPSYS} format to {ONLY,NOT}_FOR_PLATFORM

pattern match format.  Minor pkglint along the way.

10 files changed, 100 insertions, 104 deletions

diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index bb4238e6582..6445d90b94c 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 1998/11/12 23:03:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:37 tv Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/11/18 11:22:35 asami Exp
 #
 
-DISTNAME=	bcc
-PKGNAME=	bcc-95.3.12
-CATEGORIES=	devel
+DISTNAME=		bcc
+PKGNAME=		bcc-95.3.12
+CATEGORIES=		devel
 
-MAINTAINER=	tsarna@netbsd.org
+MAINTAINER=		tsarna@netbsd.org
 
-NOT_FOR_ARCHS=	alpha	#Severe LP64 problems
+NOT_FOR_PLATFORM=	*-*-alpha	# Severe LP64 problems
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 43ebcff8d7f..a1bf1ddf5c1 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.10 1998/11/12 23:03:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.11 1999/05/24 20:39:37 tv Exp $
 # FreeBSD Id: Makefile,v 1.1 1996/11/16 01:51:25 jdp Exp
 #
 
-DISTNAME=	gc4.12
-PKGNAME=	boehm-gc-4.12
-CATEGORIES=	devel
-MASTER_SITES=	http://reality.sgi.com/employees/boehm_mti/gc_source/
+DISTNAME=		gc4.12
+PKGNAME=		boehm-gc-4.12
+CATEGORIES=		devel
+MASTER_SITES=		http://reality.sgi.com/employees/boehm_mti/gc_source/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://reality.sgi.com/employees/boehm_mti/gc.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://reality.sgi.com/employees/boehm_mti/gc.html
 
-NOT_FOR_ARCHS+=	sparc		# SEGV in "./test_cpp 1" in build: target
-NOT_FOR_ARCHS+=	alpha		# needs dlopen, ELF, still SEGV's
+NOT_FOR_PLATFORM=	*-*-sparc	# SEGV in "./test_cpp 1" in build: target
+NOT_FOR_PLATFORM+=	*-*-alpha	# needs dlopen, ELF, still SEGV's
 
-WRKSRC=		${WRKDIR}/gc
-ALL_TARGET=	BSD-pkg-all
-INSTALL_TARGET=	BSD-pkg-install
-MAKE_ENV+=	CP="${CP}"
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
-MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}"
+WRKSRC=			${WRKDIR}/gc
+ALL_TARGET=		BSD-pkg-all
+INSTALL_TARGET=		BSD-pkg-install
+MAKE_ENV+=		CP="${CP}" INSTALL_DATA="${INSTALL_DATA}" \
+			INSTALL_MAN="${INSTALL_MAN}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index 7b3b4c91c04..da44b211cb5 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1999/04/14 21:39:03 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:37 tv Exp $
 #
 
-DISTNAME=       diffutils-2.7
-CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU:=diffutils/}
+DISTNAME=		diffutils-2.7
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_GNU:=diffutils/}
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.gnu.org/software/diffutils/diffutils.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnu.org/software/diffutils/diffutils.html
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=
 
-INFO_FILES=	diff.info
+INFO_FILES=		diff.info
 
-NOT_FOR_OPSYS=	NetBSD # in base system
+NOT_FOR_PLATFORM=	NetBSD-*-*	# in base system
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 1c6bbfa007c..affe33edc73 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.17 1999/05/20 20:09:50 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/05/24 20:39:37 tv Exp $
 #
 
-DISTNAME=	libgtop-1.0.1
-CATEGORIES=	devel gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+DISTNAME=		libgtop-1.0.1
+CATEGORIES=		devel gnome
+MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
+			ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
+			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	gettext-0.10.35:../../devel/gettext
-DEPENDS+=	gnome-libs-1.0.5:../../x11/gnome-libs
-DEPENDS+=	guile-1.3:../../lang/guile
+DEPENDS+=		gettext-0.10.35:../../devel/gettext \
+			gnome-libs-1.0.5:../../x11/gnome-libs \
+			guile-1.3:../../lang/guile
 
-NOT_FOR_ARCHS=	alpha	# problems with gtk
+NOT_FOR_PLATFORM=	*-*-alpha	# problems with gtk
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=
+USE_X11BASE=
+USE_GMAKE=
+USE_LIBTOOL=
 
-IGNORE=		"got broken by removal of Mach VM"
+IGNORE=			"got broken by removal of Mach VM"
 
 CONFIGURE_ARGS+=	--with-glib-prefix=${LOCALBASE} \
 			--with-libgtop-guile --with-catgets
diff --git a/devel/mit-pthreads/Makefile b/devel/mit-pthreads/Makefile
index 1579d535ac1..87d7f213ed6 100644
--- a/devel/mit-pthreads/Makefile
+++ b/devel/mit-pthreads/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.18 1999/05/02 19:46:16 tron Exp $
+# $NetBSD: Makefile,v 1.19 1999/05/24 20:39:37 tv Exp $
 #
 
 DISTNAME=		pthreads-1_60_beta6
 PKGNAME=		mit-pthreads-1.60b6
 CATEGORIES=		devel
 MASTER_SITES=		ftp://sipb.mit.edu/pub/pthreads/
-ONLY_FOR_ARCHS=		alpha arm32 i386 sparc
-ONLY_FOR_OPSYS=		NetBSD
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,arm32,i386,sparc}
 
 MAINTAINER=		agc@netbsd.org
 HOMEPAGE=		http://www.mit.edu:8001/people/proven/pthreads.html
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 0406fd36c80..15056a52751 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.17 1998/09/22 06:11:36 garbled Exp $
+# $NetBSD: Makefile,v 1.18 1999/05/24 20:39:38 tv Exp $
 
-DISTNAME=	ncurses-1.9.9g
-CATEGORIES=	devel
+DISTNAME=		ncurses-1.9.9g
+CATEGORIES=		devel
 # XXX this should be moved to ftp.netcom.com:/pub/zm/zmbenhal/ncurses/
 # XXX once upgraded to the latest version - hubertf
-MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/gnu/ncurses/
+MASTER_SITES=		ftp://ftp.fu-berlin.de/unix/gnu/ncurses/
 
-MAINTAINER=	hubertf@netbsd.org
-HOMEPAGE=	http://www.gnu.org/software/ncurses/ncurses.html
+MAINTAINER=		hubertf@netbsd.org
+HOMEPAGE=		http://www.gnu.org/software/ncurses/ncurses.html
 
-NOT_FOR_ARCHS=	alpha	# needs to be libtooled
+NOT_FOR_PLATFORM=	*-*-alpha	# needs to be libtooled
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-normal --with-shared --enable-bsdpad
-WRKSRC=		${WRKDIR}/ncurses_1.9.9g
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-normal --with-shared --enable-bsdpad
+WRKSRC=			${WRKDIR}/ncurses_1.9.9g
 
 post-patch:
 	( cd ${WRKSRC}/man ; ${RM} -f tput.1 tset.1 clear.1 )
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 5d2b9740ccd..1a872369a97 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:16:49 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1999/05/24 20:39:38 tv Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
 #
 
-DISTNAME=	noweb-2.8a
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.virginia.edu/pub/nr/
-EXTRACT_SUFX=	.tgz
-ONLY_FOR_ARCHS=	alpha i386
+DISTNAME=		noweb-2.8a
+CATEGORIES=		devel
+MASTER_SITES=		ftp://ftp.cs.virginia.edu/pub/nr/
+EXTRACT_SUFX=		.tgz
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,i386}
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.cs.virginia.edu/~nr/noweb/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.cs.virginia.edu/~nr/noweb/
 
-DEPENDS+=	icon-9.3.1:../../lang/icon
+DEPENDS=		icon-9.3.1:../../lang/icon
 
-WRKSRC=		${WRKDIR}/src
+WRKSRC=			${WRKDIR}/src
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 558122b46e3..63e991f5cdf 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.10 1998/08/20 15:16:50 tsarna Exp $
+# $NetBSD: Makefile,v 1.11 1999/05/24 20:39:38 tv Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/10/13 05:11:40 jmacd Exp
 #
 
-DISTNAME= 	prcs-1.2.8
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.xcf.berkeley.edu/pub/prcs/
+DISTNAME= 		prcs-1.2.8
+CATEGORIES=		devel
+MASTER_SITES=		ftp://ftp.xcf.berkeley.edu/pub/prcs/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.XCF.Berkeley.EDU/~jmacd/prcs.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.XCF.Berkeley.EDU/~jmacd/prcs.html
 
-ONLY_FOR_ARCHS=	alpha arm32 i386 mips* pc532 powerpc sparc vax
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,arm32,i386,mips*,pc532,powerpc,sparc,vax}
 
-GNU_CONFIGURE=	yes
-USE_GTEXINFO=	yes
+GNU_CONFIGURE=
+USE_GTEXINFO=
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index 4571e816e43..24b33a7edeb 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,25 +1,23 @@
-# $NetBSD: Makefile,v 1.11 1999/05/22 03:23:13 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1999/05/24 20:39:38 tv Exp $
 
-DISTNAME=	PTL2-current-990512
-PKGNAME=	ptl2-990512
-CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.media.osaka-cu.ac.jp/pub/PTL/PTL2/PTL2-current-990512/
+DISTNAME=		PTL2-current-990512
+PKGNAME=		ptl2-990512
+CATEGORIES=		devel
+MASTER_SITES=		ftp://ftp.media.osaka-cu.ac.jp/pub/PTL/PTL2/PTL2-current-990512/
 
-MAINTAINER=	msaitoh@netbsd.org
-HOMEPAGE=	http://www.media.osaka-cu.ac.jp/~k-abe/PTL/
+MAINTAINER=		msaitoh@netbsd.org
+HOMEPAGE=		http://www.media.osaka-cu.ac.jp/~k-abe/PTL/
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=		${LOCALBASE}/bin/perl:../../lang/perl5
 
-DIST_SUBDIR=	${PKGNAME}
+CONFLICTS=		ptl-current-*
 
-CONFLICTS=	ptl-current-*
+USE_GMAKE=
 
-USE_GMAKE=	YES
+MAKE_ENV=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
+PLIST_SRC=		${WRKDIR}/PLIST
 
-MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_SCRIPT}"
-PLIST_SRC=	${WRKDIR}/PLIST
-
-NOT_FOR_ARCHS=	alpha
+NOT_FOR_PLATFORM=	*-*-alpha
 
 post-install:
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/PTL/include
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 82381aa691f..550850f327d 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.4 1999/04/14 21:39:03 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:38 tv Exp $
 #
 
-DISTNAME=       rcs-5.7
-CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU:=rcs/}
+DISTNAME=		rcs-5.7
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_GNU:=rcs/}
 
-MAINTAINER=	gnu@gnu.org
-HOMEPAGE=	http://www.gnu.org/software/rcs/rcs.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnu.org/software/rcs/rcs.html
 
-NOT_FOR_OPSYS=	NetBSD # in the base system
+NOT_FOR_PLATFORM=	NetBSD-*-*	# in the base system
 
-DEPENDS+=	diffutils-2.7:../../devel/diffutils
+DEPENDS=		diffutils-2.7:../../devel/diffutils
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	PATH=${LOCALBASE}/bin:$PATH
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV=		PATH=${LOCALBASE}/bin:$PATH
 
 post-install:
 	${RM} -f ${PREFIX}/bin/rcslog