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

pattern match format.  Minor pkglint along the way.

79 files changed, 1019 insertions, 1076 deletions

diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 6fe8c0d37ad..11a8760e783 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.15 1999/05/22 21:47:01 tv Exp $
+# $NetBSD: Makefile,v 1.16 1999/05/24 20:39:35 tv Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp 
 #
 
-DISTNAME=       rarbsd
-PKGNAME=        rar-2.01
-CATEGORIES=	archivers
-MASTER_SITES=   ftp://ftp.inetpros.net/pub/rar/ \
-		ftp://ftp.kiarchive.ru/pub/unix/arcers/
-EXTRACT_SUFX=   .exe
-ONLY_FOR_ARCHS=	i386
-ONLY_FOR_OPSYS=	NetBSD
+DISTNAME=		rarbsd
+PKGNAME=		rar-2.01
+CATEGORIES=		archivers
+MASTER_SITES=		ftp://ftp.inetpros.net/pub/rar/ \
+			ftp://ftp.kiarchive.ru/pub/unix/arcers/
+EXTRACT_SUFX=		.exe
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-MAINTAINER=     packages@netbsd.org
+MAINTAINER=		packages@netbsd.org
 
-NO_PACKAGE=     Only unmodified original package can be distributed
+NO_PACKAGE=		Only unmodified original package can be distributed
 
-NO_WRKSUBDIR=   yes
-EXTRACT_CMD=	${DOWNLOADED_DISTFILE} >/dev/null
+NO_WRKSUBDIR=		yes
+EXTRACT_CMD=		${DOWNLOADED_DISTFILE} >/dev/null
 
 pre-extract:
 	@${CHMOD} a+x ${DISTDIR}/${DISTFILES}
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 49cc2c527f7..35ca7ff5080 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 1998/12/28 19:16:50 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:35 tv Exp $
 #
 
-DISTNAME=	BladeEnc-076-bsd-i386
-PKGNAME=	bladeenc-0.76
-CATEGORIES=	audio
-MASTER_SITES=	http://home.swipnet.se/~w-82625/encoder/binaries/
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		BladeEnc-076-bsd-i386
+PKGNAME=		bladeenc-0.76
+CATEGORIES=		audio
+MASTER_SITES=		http://home.swipnet.se/~w-82625/encoder/binaries/
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://bladeenc.home.ml.org/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://bladeenc.home.ml.org/
 
-NO_BUILD=	yes
+NO_BUILD=
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bladeenc ${PREFIX}/bin/
diff --git a/audio/mbrola-linux/Makefile b/audio/mbrola-linux/Makefile
index 8fb1b1c3b0b..ce2cfb2ae7a 100644
--- a/audio/mbrola-linux/Makefile
+++ b/audio/mbrola-linux/Makefile
@@ -1,28 +1,25 @@
-# $NetBSD: Makefile,v 1.4 1999/04/15 14:53:10 proff Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:35 tv Exp $
 
-DISTNAME=	mbrola-linux-301g1
-WRKSRC=		${WRKDIR}
-CATEGORIES=	audio
-MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/pclinux/
-DISTFILES=	mbr301g1.zip
+DISTNAME=		mbrola-linux-301g1
+CATEGORIES=		audio
+MASTER_SITES=		ftp://tcts.fpms.ac.be/pub/mbrola/pclinux/
+EXTRACT_SUFX=		.zip
 
-MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/
+MAINTAINER=		proff@iq.org
+HOMEPAGE=		http://tcts.fpms.ac.be/synthesis/
 
-BUILD_DEPENDS=	unzip:../../archivers/unzip
+BUILD_DEPENDS=		unzip:../../archivers/unzip
 
-LICENSE=	non-commercial-use
+LICENSE=		non-commercial-use
 
-EXTRACT_CMD=	unzip ${DOWNLOADED_DISTFILE} 
+EXTRACT_CMD=		unzip -Loq ${DOWNLOADED_DISTFILE}
+NO_WRKSUBDIR=
+NO_BUILD=
 
-ONLY_FOR_ARCHS=	i386
-
-NO_BUILD=	yes
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
+# Do not strip Linux binaries.
 do-install:
-# INSTALL_PROGRAM attempts to strip the targer, however
-# strip doesn't know how to strip linux binraries, so
-# use INSTALL_SCRIPT instead
 	${INSTALL_SCRIPT} ${WRKSRC}/mbrola ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index 2722c3e5f87..e4644d45afe 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.3 1999/05/12 15:08:45 tv Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/24 20:39:35 tv Exp $
 #
 
-DISTNAME=	binkd-0.9.2
-CATEGORIES=	comms
-MASTER_SITES=	http://www.corbina.net/~maloff/binkd/
-EXTRACT_SUFX=	.zip
+DISTNAME=		binkd-0.9.2
+CATEGORIES=		comms
+MASTER_SITES=		http://www.corbina.net/~maloff/binkd/
+EXTRACT_SUFX=		.zip
 
-MAINTAINER=	tv@netbsd.org	# aka "Todd Vierling" @ 1:396/1.5
-HOMEPAGE=	http://www.corbina.net/~maloff/binkd/
+MAINTAINER=		tv@netbsd.org	# aka "Todd Vierling" @ 1:396/1.5
+HOMEPAGE=		http://www.corbina.net/~maloff/binkd/
 
-BUILD_DEPENDS=	unzip:../../archivers/unzip
+BUILD_DEPENDS=		unzip:../../archivers/unzip
 
-GNU_CONFIGURE=	yes
-EXTRACT_CMD=	unzip -qo ${DOWNLOADED_DISTFILE}
+GNU_CONFIGURE=		yes
+EXTRACT_CMD=		unzip -Loq ${DOWNLOADED_DISTFILE}
 
-NO_CDROM=	"extremely limited usefulness to the general public"
-NOT_FOR_ARCHS=	alpha sparc64
+NO_CDROM=		"extremely limited usefulness to the general public"
+NOT_FOR_PLATFORM=	*-*-{alpha,sparc64}
 
 post-extract:
 	@cd ${WRKSRC}/mkfls/unix && ${CHMOD} +x configure && ${CP} * ../../
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index 674f84543fc..8ce30e8eb79 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/04/16 20:27:16 jlam Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/24 20:39:36 tv Exp $
 #
 
 DISTNAME=		xisp-2.5p4
@@ -12,9 +12,9 @@ HOMEPAGE=		http://users.hol.gr/~dbouras/
 DEPENDS+=		xforms-0.88:../../x11/xforms
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-ONLY_FOR_ARCHS=		arm32 i386 m68k sparc ns32k
+ONLY_FOR_PLATFORM=	NetBSD-*-{arm32,i386,m68k,sparc,ns32k}
 
-USE_X11BASE=		yes
+USE_X11BASE=
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 34993d3b368..7b39028a308 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,23 +1,20 @@
-# $NetBSD: Makefile,v 1.4 1999/02/19 14:28:08 rh Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:36 tv Exp $
 #
 
-DISTNAME=	gtksql-0.2
-CATEGORIES=	databases
-MASTER_SITES=	http://www.multimania.com/bbrox/GtkSQL/ \
-		ftp://ftp.infodrom.north.de/pub/unix/gtkbuffet/apps/gtksql/
+DISTNAME=		gtksql-0.2
+CATEGORIES=		databases
+MASTER_SITES=		http://www.multimania.com/bbrox/GtkSQL/ \
+			ftp://ftp.infodrom.north.de/pub/unix/gtkbuffet/apps/gtksql/
 
-MAINTAINER=	packages@NetBSD.org
-HOMEPAGE=	http://www.multimania.com/bbrox/GtkSQL/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.multimania.com/bbrox/GtkSQL/
 
-DEPENDS+=	gtk10-1.0.6:../../x11/gtk10
-DEPENDS+=	postgresql-6.4.2:../../databases/postgresql
+DEPENDS+=		gtk10-1.0.6:../../x11/gtk10
+DEPENDS+=		postgresql-6.4.2:../../databases/postgresql
 
-# restriction inherit from postgresql
-NOT_FOR_ARCHS=	alpha mips
+USE_X11BASE=
 
-USE_X11BASE=	yes
-
-PGUSER?=	pgsql
+PGUSER?=		pgsql
 
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index dcc02247135..9af768e63fe 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,40 +1,36 @@
-# $NetBSD: Makefile,v 1.2 1999/05/20 20:09:50 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:36 tv Exp $
 #
 
-DISTNAME=	mysql-3.22.22
-PKGNAME=	${DISTNAME:S/-/-server-/}
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \
-		ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.22/
+DISTNAME=		mysql-3.22.22
+PKGNAME=		${DISTNAME:S/-/-server-/}
+CATEGORIES=		databases
+MASTER_SITES=		ftp://ftp.mysql.com/pub/mysql/Downloads/MySQL-3.22/ \
+			ftp://ftp.netcasting.net/pub/mysql/Downloads/MySQL-3.22/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mysql.com/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.mysql.com/
 
-DEPENDS=	${DISTNAME:S/-/-client-/}:../../databases/mysql-client
+DEPENDS=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
 
-NO_CDROM=	"Restrictive license."
+NO_CDROM=		"Restrictive license."
 
 .include "../../mk/bsd.prefs.mk"
 
-MYSQL_DATADIR?=	/var/mysql
+MYSQL_DATADIR?=		/var/mysql
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--localstatedir=${MYSQL_DATADIR} \
-		--with-named-z-libs=z --with-named-curses=curses \
-		--without-perl --without-debug --without-bench \
-		--without-docs --with-low-memory
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR} \
+			--with-named-z-libs=z --with-named-curses=curses \
+			--without-perl --without-debug --without-bench \
+			--without-docs --with-low-memory
 
-CFLAGS+=	-Dunix
-
-# not yet... works on some platforms but not all
-#CC=		${LOCALBASE}/bin/ptlgcc
-#CXX=		${LOCALBASE}/bin/ptlg++
+CFLAGS+=		-Dunix
 
 # platforms on which included mit-pthreads is usable
-ONLY_FOR_ARCHS=	alpha arm32 i386 sparc
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,arm32,i386,sparc} SunOS-*-sparc
 
-USE_GMAKE=	yes
-USE_PERL5=	yes
+USE_GMAKE=
+USE_PERL5=
 
 post-extract:
 	@cd ${WRKSRC} && for dir in dbug heap isam merge mysys strings; do \
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 221caf4c73f..e40705d9dfe 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,42 +1,42 @@
-# $NetBSD: Makefile,v 1.31 1999/04/13 15:31:05 agc Exp $
+# $NetBSD: Makefile,v 1.32 1999/05/24 20:39:36 tv Exp $
 # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
 #
 
-DISTNAME=	postgresql-6.4.2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.PostgreSQL.org/pub/ \
-		ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/ \
-		ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/
+DISTNAME=		postgresql-6.4.2
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
+CATEGORIES=		databases
+MASTER_SITES=		ftp://ftp.PostgreSQL.org/pub/ \
+			ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/ \
+			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.PostgreSQL.ORG/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.PostgreSQL.ORG/
 
-BUILD_DEPENDS+=	bison:../../devel/bison
-DEPENDS+=	tk-8.0.5:../../x11/tk80
-DEPENDS+=	tcl-8.0.5:../../lang/tcl80
-DEPENDS+=	addnerd-1.6:../../sysutils/addnerd
+BUILD_DEPENDS+=		bison:../../devel/bison
+DEPENDS+=		tk-8.0.5:../../x11/tk80 \
+			tcl-8.0.5:../../lang/tcl80 \
+			addnerd-1.6:../../sysutils/addnerd
 
 # Needs ELF clue, mips has no TAS implementation
-NOT_FOR_ARCHS=	alpha mips
+NOT_FOR_PLATFORM=	*-*-{alpha,mips}
 
-PLIST_SRC=	${WRKDIR}/PLIST.tmp
-REQ_FILE=	${WRKDIR}/REQ
+PLIST_SRC=		${WRKDIR}/PLIST.tmp
+REQ_FILE=		${WRKDIR}/REQ
 
-PGUSER?=	pgsql
-PGGROUP?=	ingres
+PGUSER?=		pgsql
+PGGROUP?=		ingres
 
-USE_GMAKE=	yes
-MAKEFILE=	GNUmakefile
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${PREFIX}/${PGUSER} \
-		--enable-locale \
-		--with-tcl \
-		--with-tclconfig="${PREFIX}/lib/tcl8.0 ${PREFIX}/lib/tk8.0" \
-		--with-includes=${PREFIX}/include \
-		--with-libs=${PREFIX}/lib \
-		--with-template=`${ECHO} ${OPSYS} | ${TR} '[A-Z]' '[a-z]'`
-CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0"
+USE_GMAKE=
+MAKEFILE=		GNUmakefile
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS= 	--prefix=${PREFIX}/${PGUSER} \
+			--enable-locale \
+			--with-tcl \
+			--with-tclconfig="${PREFIX}/lib/tcl8.0 ${PREFIX}/lib/tk8.0" \
+			--with-includes=${PREFIX}/include \
+			--with-libs=${PREFIX}/lib \
+			--with-template=`${ECHO} ${OPSYS} | ${TR} '[A-Z]' '[a-z]'`
+CONFIGURE_ENV+=		CPPFLAGS="-I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0"
 
 INSTALL_TARGET=	install install-man
 
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
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 465ee23391b..96baf18fd2c 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -1,64 +1,64 @@
-# $NetBSD: Makefile,v 1.42 1999/03/10 08:42:14 tron Exp $
+# $NetBSD: Makefile,v 1.43 1999/05/24 20:39:39 tv Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 #
 
-DISTNAME=	xemacs-20.4
-CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.xemacs.org/pub/xemacs/xemacs-20.4/ \
-		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs-20.4/ \
-		ftp://ftp.usyd.edu.au/pub/Xemacs/xemacs-20.4/ \
-		ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-20.4/ \
-		ftp://SunSITE.sut.ac.jp/pub/archives/xemacs/xemacs-20.4/ \
-		ftp://ftp.miranova.com/pub/xemacs/ \
-		ftp://ftp.gw.com/mirrors/pub/unix/xemacs/xemacs-20.4/
-DISTFILES=	xemacs-20.4.tar.gz xemacs-20.4-info.tar.gz
+DISTNAME=		xemacs-20.4
+CATEGORIES=		editors
+MASTER_SITES=		ftp://ftp.xemacs.org/pub/xemacs/xemacs-20.4/ \
+			ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs-20.4/ \
+			ftp://ftp.usyd.edu.au/pub/Xemacs/xemacs-20.4/ \
+			ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \
+			ftp://ftp.th-darmstadt.de/pub/editors/xemacs/xemacs-20.4/ \
+			ftp://SunSITE.sut.ac.jp/pub/archives/xemacs/xemacs-20.4/ \
+			ftp://ftp.miranova.com/pub/xemacs/ \
+			ftp://ftp.gw.com/mirrors/pub/unix/xemacs/xemacs-20.4/
+DISTFILES=		xemacs-20.4.tar.gz xemacs-20.4-info.tar.gz
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.xemacs.org/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.xemacs.org/
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	Xaw3d-1.5:../../x11/Xaw3d
-DEPENDS+=	png-1.0.3:../../graphics/png
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
+DEPENDS=		xpm-3.4k:../../graphics/xpm \
+			jpeg-6b:../../graphics/jpeg \
+			Xaw3d-1.5:../../x11/Xaw3d \
+			png-1.0.3:../../graphics/png \
+			gdbm-1.7.3:../../databases/gdbm
 
-NOT_FOR_ARCHS=	alpha mips	#fails purespace dumping
+NOT_FOR_PLATFORM=	*-*-{alpha,mips}	#fails purespace dumping
 
-HAS_CONFIGURE=	yes
+HAS_CONFIGURE=
 
 .include "../../mk/bsd.prefs.mk"
 
-WITH_DIALOGS=	--with-dialogs=athena3d
+WITH_DIALOGS=		--with-dialogs=athena3d
 WITH_SOUND=
 
 .if defined(USE_MULE)
-WITH_MULE=	--with-mule
-DISTFILES+=	xemacs-20.4-mule.tar.gz
-REALPLIST=	PLIST.mule
+WITH_MULE=		--with-mule
+DISTFILES+=		xemacs-20.4-mule.tar.gz
+REALPLIST=		PLIST.mule
 .else
-REALPLIST=	PLIST.nomule
+REALPLIST=		PLIST.nomule
 .endif
 
 .if defined(USE_XFACE)
-WITH_XFACE=	--with-xface
-DEPENDS+=	faces-1.6.1:../../mail/faces
+WITH_XFACE=		--with-xface
+DEPENDS+=		faces-1.6.1:../../mail/faces
 .else
-WITH_XFACE=	--with-xface=no
+WITH_XFACE=		--with-xface=no
 .endif
 
-CONFIGURE_ARGS+=${MACHINE_GNU_ARCH}--netbsd --prefix=${PREFIX} \
-		--site-includes=${PREFIX}/include \
-		--infopath="${PREFIX}/info:${X11BASE}/info:/usr/local/info" \
-		--site-libraries=${PREFIX}/lib \
-		--sitelispdir="${PREFIX}/lib/xemacs/site-lisp \
-		${PREFIX}/share/xemacs/site-lisp" -with-ncurses=no \
-		--with-session=yes \
-		${WITH_MULE} ${WITH_DIALOGS} ${WITH_XFACE} ${WITH_SOUND}
+CONFIGURE_ARGS+=	${MACHINE_GNU_ARCH}--netbsd --prefix=${PREFIX} \
+			--site-includes=${PREFIX}/include \
+			--infopath="${PREFIX}/info:${X11BASE}/info:/usr/local/info" \
+			--site-libraries=${PREFIX}/lib \
+			--sitelispdir="${PREFIX}/lib/xemacs/site-lisp \
+			${PREFIX}/share/xemacs/site-lisp" -with-ncurses=no \
+			--with-session=yes \
+			${WITH_MULE} ${WITH_DIALOGS} ${WITH_XFACE} ${WITH_SOUND}
 
-MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}" INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}" INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-PLIST_SRC=	${WRKDIR}/PLIST.tmp
+PLIST_SRC=		${WRKDIR}/PLIST.tmp
 
 pre-configure:
 	@${ECHO} "To compile in the MULE features, set the environment variable USE_MULE."
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index e35e14058e6..e1d5689d1ec 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:46 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:39 tv Exp $
 
 DISTNAME=		bochs-980707a
 CATEGORIES=		emulators
@@ -7,7 +7,7 @@ MASTER_SITES=		ftp://ftp.std.com/pub/bochs/
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://world.std.com/~bochs/
 
-NOT_FOR_ARCHS=		alpha	#runs, SEGV.
+NOT_FOR_PLATFORM=	*-*-alpha	#runs, SEGV.
 
 LICENSE=		shareware
 WRKSRC=			${WRKDIR}/bochs-980707
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index 5edfd48b0ae..50485e10aa0 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.12 1999/04/27 11:53:39 tv Exp $
+# $NetBSD: Makefile,v 1.13 1999/05/24 20:39:39 tv Exp $
 #
 
-DISTNAME=	compat12-${MACHINE_ARCH}
-PKGNAME=	compat12-1.2.1
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=		compat12-${MACHINE_ARCH}
+PKGNAME=		compat12-1.2.1
+CATEGORIES=		emulators
+MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.netbsd.org/Releases/formal-1.2/index.html
+MAINTAINER=		tv@netbsd.org
+HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.2/index.html
 
-ONLY_FOR_ARCHS=	i386 m68k ns32k sparc
-ONLY_FOR_OPSYS=	NetBSD
+ONLY_FOR_PLATFORM=	NetBSD-*-{i386,m68k,ns32k,sparc}
 
-NO_BUILD=	yes
+NO_BUILD=
 
 .include "../../mk/bsd.prefs.mk"
 
 # This installs in /usr to avoid dynamic linker annoyances
 LOCALBASE=	/usr 
-NO_MTREE=	yes
+NO_MTREE=
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/lib*.so* ${PREFIX}/lib/
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index 3b85db02389..32c0f7a8572 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,30 +1,24 @@
-# $NetBSD: Makefile,v 1.2 1999/04/27 11:53:39 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:39 tv Exp $
 #
 
-DISTNAME=	compat13-${MACHINE_ARCH}
-PKGNAME=	compat13-1.3.3
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=		compat13-${MACHINE_ARCH}
+PKGNAME=		compat13-1.3.3
+CATEGORIES=		emulators
+MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.netbsd.org/Releases/formal-1.3/index.html
+MAINTAINER=		tv@netbsd.org
+HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.3/index.html
 
-ONLY_FOR_ARCHS=	alpha arm32 i386 m68k mipsel ns32k sparc
-ONLY_FOR_OPSYS=	NetBSD
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,arm32,i386,m68k,mipsel,ns32k,sparc}
+NOT_FOR_PLATFORM=	NetBSD-1.3*-*
 
-# this is blank on "ineligible" version
-OPSYS_VER!=	uname -r
-.if (${OPSYS_VER:C/^1\.3.*//} == "")
-IGNORE=		"NetBSD version not new enough: ${OPSYS_VER}"
-.endif
-
-NO_BUILD=	yes
+NO_BUILD=
 
 .include "../../mk/bsd.prefs.mk"
 
 # This installs in /usr to avoid dynamic linker annoyances
-LOCALBASE=	/usr 
-NO_MTREE=	yes
+LOCALBASE=		/usr 
+NO_MTREE=
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/lib*.so* ${PREFIX}/lib/
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index 6487cedda13..c50a16f94e3 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:52 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/24 20:39:40 tv Exp $
 #
 
-DISTNAME=	doscmd-19960502-2
-PKGNAME=	doscmd-19960502.2
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/arch/i386/doscmd/
+DISTNAME=		doscmd-19960502-2
+PKGNAME=		doscmd-19960502.2
+CATEGORIES=		emulators
+MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/arch/i386/doscmd/
 
-MAINTAINER=	tsarna@netbsd.org
+MAINTAINER=		tsarna@netbsd.org
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-WRKSRC=		${WRKDIR}/doscmd
+WRKSRC=			${WRKDIR}/doscmd
 
-MAKE_ENV+=      X11BASE=${X11BASE}
+MAKE_ENV=		X11BASE=${X11BASE}
 
 .include "../../mk/bsd.prefs.mk"
 
 .ifdef MANZ
-MANCOMPRESSED=	1
+MANCOMPRESSED=
 .endif
 
 do-configure:
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index 598208f229b..9fb7354b476 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/05/22 19:33:49 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/24 20:39:40 tv Exp $
 #
 
 DISTNAME=		freebsd_lib-2.2.7
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.flame.org/NetBSD/
-ONLY_FOR_ARCHS=		i386
-ONLY_FOR_OPSYS=		NetBSD
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 MAINTAINER=		packages@netbsd.org
 
diff --git a/emulators/linux_lib/Makefile b/emulators/linux_lib/Makefile
index c1c9b382e68..aca6e119ecd 100644
--- a/emulators/linux_lib/Makefile
+++ b/emulators/linux_lib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 1999/05/17 00:18:15 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/05/24 20:39:40 tv Exp $
 # FreeBSD Id: Makefile,v 1.19 1997/12/04 17:34:28 asami Exp
 #
 
 DISTNAME=		linux_lib-2.4
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 MAINTAINER=		packages@netbsd.org
 
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index cb47011c2df..98b8597d74b 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,63 +1,59 @@
-# $NetBSD: Makefile,v 1.6 1999/05/21 00:09:27 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/24 20:39:40 tv Exp $
 
-DISTNAME=	suse_base-6.1
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.suse.com/pub/suse/i386/6.1/suse/a1/ \
-		ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/a1/
-DISTFILES=	aaa_dir.rpm shlibs.rpm ldso.rpm gppshare.rpm
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		suse_base-6.1
+CATEGORIES=		emulators
+MASTER_SITES=		ftp://ftp.suse.com/pub/suse/i386/6.1/suse/a1/ \
+			ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/a1/
+DISTFILES=		aaa_dir.rpm shlibs.rpm ldso.rpm gppshare.rpm
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.suse.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.suse.com/
 
-DEPENDS+=	rpm-2.5.4:../../misc/rpm
+DEPENDS=		rpm-2.5.4:../../misc/rpm
 
-CONFLICTS=	linux_SuSE-5.3 linux_lib-2.4
+CONFLICTS=		linux_SuSE-5.3 linux_lib-2.4
 
-DIST_SUBDIR=	suse
-MIRROR_DISTFILE= no
+DIST_SUBDIR=		suse
+MIRROR_DISTFILE= 	no
 
-EXTRACT_ONLY=	# empty
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
-MANCOMPRESSED=	yes
-INSTALL_FILE=	${WRKDIR}/INSTALL
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+EXTRACT_ONLY=		# empty
+NO_WRKSUBDIR=		yes
+MANCOMPRESSED=		yes
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-SBINDIR=	${PREFIX}/sbin
+EMULSUBDIR=		emul/linux
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+SBINDIR=		${PREFIX}/sbin
 
 do-build:
-		@for FILE in ${PKGDIR}/INSTALL ${PKGDIR}/PLIST \
-		  ${SCRIPTDIR}/*.sh; do \
-		  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
-		         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
-		         -e 's#@@AWK@@#${AWK}#g' \
-		         -e 's#@@PAX@@#${PAX}#g' \
-		         -e 's#@@PREFIX@@#${PREFIX}#g' \
-		    <$$FILE >${WRKDIR}/`basename $$FILE`; \
-		done
+	@for FILE in ${PKGDIR}/PLIST ${SCRIPTDIR}/*.sh; do \
+	  ${SED} -e 's#@@EMULDIR@@#${EMULDIR}#g' \
+	         -e 's#@@EMULSUBDIR@@#${EMULSUBDIR}#g' \
+	         -e 's#@@AWK@@#${AWK}#g' \
+	         -e 's#@@PAX@@#${PAX}#g' \
+	         -e 's#@@PREFIX@@#${PREFIX}#g' \
+	    <$$FILE >${WRKDIR}/`basename $$FILE`; \
+	done
 
 do-install:
-		cd ${WRKDIR}; \
-		for FILE in *.sh; do \
-		  ${INSTALL_SCRIPT} $$FILE ${SBINDIR}/`basename $$FILE .sh`; \
-		done
-		${MKDIR} ${EMULDIR}/dev
-		${LN} -fs /dev/sound ${EMULDIR}/dev/dsp
-		${LN} -fs /dev/null ${EMULDIR}/dev/null
-		@${CP} ${WRKDIR}/PLIST ${PLIST_SRC}
-		cd ${_DISTDIR} && \
-		${SBINDIR}/rpm2pkg ${DISTFILES} | \
-		${EGREP} -v '${EMULSUBDIR}/(tmp|usr/tmp|var)' >>${PLIST_SRC}
-		@cd ${EMULDIR} && ${RM} -rf tmp usr/tmp var
-		${INSTALL_DATA} ${FILESDIR}/ld.so.conf ${EMULDIR}/etc
-		@${ECHO} "@unexec rm -rf %D/${EMULSUBDIR}" >>${PLIST_SRC}
-		@${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+	cd ${WRKDIR}; \
+	for FILE in *.sh; do \
+	  ${INSTALL_SCRIPT} $$FILE ${SBINDIR}/`basename $$FILE .sh`; \
+	done
+	${MKDIR} ${EMULDIR}/dev
+	${LN} -fs /dev/sound ${EMULDIR}/dev/dsp
+	${LN} -fs /dev/null ${EMULDIR}/dev/null
+	@${CP} ${WRKDIR}/PLIST ${PLIST_SRC}
+	cd ${_DISTDIR} && \
+	${SBINDIR}/rpm2pkg ${DISTFILES} | \
+	${EGREP} -v '${EMULSUBDIR}/(tmp|usr/tmp|var)' >>${PLIST_SRC}
+	@cd ${EMULDIR} && ${RM} -rf tmp usr/tmp var
+	${INSTALL_DATA} ${FILESDIR}/ld.so.conf ${EMULDIR}/etc
+	@${ECHO} "@unexec rm -rf %D/${EMULSUBDIR}" >>${PLIST_SRC}
+	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
 
 show-shlib-type:
-		@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} linux-${MACHINE_ARCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_compat/Makefile b/emulators/suse_compat/Makefile
index e80bca44275..6037a217f96 100644
--- a/emulators/suse_compat/Makefile
+++ b/emulators/suse_compat/Makefile
@@ -1,40 +1,37 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/21 00:55:59 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:40 tv Exp $
 
-DISTNAME=	compat
-PKGNAME=	suse_compat-6.1
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.suse.com/pub/suse/i386/6.1/suse/a2/ \
-		ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/a2/
-EXTRACT_SUFX=	.rpm
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		compat
+PKGNAME=		suse_compat-6.1
+CATEGORIES=		emulators
+MASTER_SITES=		ftp://ftp.suse.com/pub/suse/i386/6.1/suse/a2/ \
+			ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/a2/
+EXTRACT_SUFX=		.rpm
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.suse.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.suse.com/
 
-DEPENDS+=	suse_base-6.1:../suse_base
+DEPENDS=		suse_base-6.1:../suse_base
 
-DIST_SUBDIR=	suse
-MIRROR_DISTFILE= no
+DIST_SUBDIR=		suse
+MIRROR_DISTFILE=	no
 
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
-MANCOMPRESSED=	yes
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+EXTRACT_ONLY=		# empty
+NO_BUILD=		yes
+NO_WRKSUBDIR=		yes
+MANCOMPRESSED=		yes
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-SBINDIR=	${PREFIX}/sbin
+EMULSUBDIR=		emul/linux
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+SBINDIR=		${PREFIX}/sbin
 
 do-install:
-		cd ${_DISTDIR} && \
-		${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
-		@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
-		${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
+	cd ${_DISTDIR} && \
+	${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
+	@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
+	${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
 
 show-shlib-type:
-		@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} linux-${MACHINE_ARCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_libc5/Makefile b/emulators/suse_libc5/Makefile
index 22369a3a0b3..cd30673d230 100644
--- a/emulators/suse_libc5/Makefile
+++ b/emulators/suse_libc5/Makefile
@@ -1,40 +1,37 @@
-# $NetBSD: Makefile,v 1.6 1999/05/21 00:48:45 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/24 20:39:41 tv Exp $
 
-DISTNAME=	shlibs5
-PKGNAME=	suse_libc5-6.1
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.suse.com/pub/suse/i386/6.1/suse/a1/ \
-		ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/a1/
-EXTRACT_SUFX=	.rpm
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		shlibs5
+PKGNAME=		suse_libc5-6.1
+CATEGORIES=		emulators
+MASTER_SITES=		ftp://ftp.suse.com/pub/suse/i386/6.1/suse/a1/ \
+			ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/a1/
+EXTRACT_SUFX=		.rpm
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.suse.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.suse.com/
 
-DEPENDS+=	suse_base-6.1:../suse_base
+DEPENDS=		suse_base-6.1:../suse_base
 
-DIST_SUBDIR=	suse
-MIRROR_DISTFILE= no
+DIST_SUBDIR=		suse
+MIRROR_DISTFILE=	no
 
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
-MANCOMPRESSED=	yes
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+EXTRACT_ONLY=		# empty
+NO_BUILD=		yes
+NO_WRKSUBDIR=		yes
+MANCOMPRESSED=		yes
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-SBINDIR=	${PREFIX}/sbin
+EMULSUBDIR=		emul/linux
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+SBINDIR=		${PREFIX}/sbin
 
 do-install:
-		cd ${_DISTDIR} && \
-		${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
-		@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
-		${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
+	cd ${_DISTDIR} && \
+	${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
+	@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
+	${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
 
 show-shlib-type:
-		@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} linux-${MACHINE_ARCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_linux/Makefile b/emulators/suse_linux/Makefile
index 2d7542fb1f1..ee5fd12073a 100644
--- a/emulators/suse_linux/Makefile
+++ b/emulators/suse_linux/Makefile
@@ -1,24 +1,21 @@
-# $NetBSD: Makefile,v 1.2 1999/05/21 01:00:58 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:41 tv Exp $
 
-DISTNAME=	suse_linux-6.1
-CATEGORIES=	emulators
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		suse_linux-6.1
+CATEGORIES=		emulators
+MASTER_SITES=		# empty
+DISTFILES=		# empty
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.suse.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.suse.com/
 
-DEPENDS+=	suse_compat-6.1:../suse_compat
-DEPENDS+=	suse_libc5-6.1:../suse_libc5
-DEPENDS+=	suse_xforms-6.1:../suse_xforms
+DEPENDS=		suse_compat-6.1:../suse_compat \
+			suse_libc5-6.1:../suse_libc5 \
+			suse_xforms-6.1:../suse_xforms
 
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_PATCH=	yes
+EXTRACT_ONLY=		# empty
+NO_BUILD=		yes
+NO_CHECKSUM=		yes
 
-do-install:	# empty
+do-install:		# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_x11/Makefile b/emulators/suse_x11/Makefile
index 828c15b68d7..408106affb8 100644
--- a/emulators/suse_x11/Makefile
+++ b/emulators/suse_x11/Makefile
@@ -1,39 +1,36 @@
-# $NetBSD: Makefile,v 1.4 1999/05/17 02:24:27 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:41 tv Exp $
 
-DISTNAME=	suse_x11-6.1
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.suse.com/pub/suse/i386/6.1/suse/x1/ \
-		ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/x1/
-DISTFILES=	xshared.rpm xpm.rpm
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		suse_x11-6.1
+CATEGORIES=		emulators
+MASTER_SITES=		ftp://ftp.suse.com/pub/suse/i386/6.1/suse/x1/ \
+			ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/x1/
+DISTFILES=		xshared.rpm xpm.rpm
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.suse.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.suse.com/
 
-DEPENDS+=	suse_base-6.1:../suse_base
+DEPENDS=		suse_base-6.1:../suse_base
 
-DIST_SUBDIR=	suse
-MIRROR_DISTFILE= no
+DIST_SUBDIR=		suse
+MIRROR_DISTFILE=	no
 
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
-MANCOMPRESSED=	yes
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+EXTRACT_ONLY=		# empty
+NO_BUILD=		yes
+NO_WRKSUBDIR=		yes
+MANCOMPRESSED=		yes
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-SBINDIR=	${PREFIX}/sbin
+EMULSUBDIR=		emul/linux
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+SBINDIR=		${PREFIX}/sbin
 
 do-install:
-		cd ${_DISTDIR} && \
-		${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
-		@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
-		${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
+	cd ${_DISTDIR} && \
+	${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
+	@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
+	${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
 
 show-shlib-type:
-		@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} linux-${MACHINE_ARCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_xforms/Makefile b/emulators/suse_xforms/Makefile
index c1c4296b073..ac4bc11f42b 100644
--- a/emulators/suse_xforms/Makefile
+++ b/emulators/suse_xforms/Makefile
@@ -1,40 +1,38 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/17 12:01:52 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:41 tv Exp $
 
-DISTNAME=	xforms
-PKGNAME=	suse_xforms-6.1
-CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.suse.com/pub/suse/i386/6.1/suse/xdev1/ \
-		ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/xdev1/
-EXTRACT_SUFX=	.rpm
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		xforms
+PKGNAME=		suse_xforms-6.1
+CATEGORIES=		emulators
+MASTER_SITES=		ftp://ftp.suse.com/pub/suse/i386/6.1/suse/xdev1/ \
+			ftp://ftp.cs.unm.edu/mirrors/SuSE61/suse/xdev1/
+EXTRACT_SUFX=		.rpm
+ONLY_FOR_PLATFORM=	*-*-i386
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.suse.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.suse.com/
 
-DEPENDS+=	suse_x11-6.1:../suse_x11
+DEPENDS=		suse_x11-6.1:../suse_x11
 
-DIST_SUBDIR=	suse
-MIRROR_DISTFILE= no
+DIST_SUBDIR=		suse
+MIRROR_DISTFILE=	no
 
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
-MANCOMPRESSED=	yes
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+EXTRACT_ONLY=		# empty
+NO_BUILD=		yes
+NO_WRKSUBDIR=		yes
+MANCOMPRESSED=		yes
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-SBINDIR=	${PREFIX}/sbin
+EMULSUBDIR=		emul/linux
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+SBINDIR=		${PREFIX}/sbin
 
 do-install:
-		cd ${_DISTDIR} && \
-		${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
-		@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
-		${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
+	cd ${_DISTDIR} && \
+	${SBINDIR}/rpm2pkg ${DISTFILES} >${PLIST_SRC}
+	@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
+	${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
 
 show-shlib-type:
-		@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} linux-${MACHINE_ARCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine-current/Makefile b/emulators/wine-current/Makefile
index 555a57faa30..5be00b46b47 100644
--- a/emulators/wine-current/Makefile
+++ b/emulators/wine-current/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1999/04/15 20:54:29 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:41 tv Exp $
 
 DISTNAME=		Wine-990328
 PKGNAME=		wine-990328
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://www.winehq.com/
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2bd11f61ba6..75c5f97713f 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 1999/04/15 20:39:42 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/05/24 20:39:42 tv Exp $
 
 DISTNAME=		Wine-981211
 PKGNAME=		wine-981211
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 MAINTAINER=		mycroft@netbsd.org
 HOMEPAGE=		http://www.winehq.com/
diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index 1768860e814..ca433bfc05e 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/02/05 07:38:14 nathanw Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:42 tv Exp $
 #
 
 DISTNAME=		xcopilot-0.6.6
@@ -10,7 +10,7 @@ HOMEPAGE=		http://xcopilot.cuspy.com/
 
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-NOT_FOR_ARCHS=		alpha	# suspected LP64 bugs
+NOT_FOR_PLATFORM=	*-*-alpha	# suspected LP64 bugs
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index a358a929501..63cd8d58e33 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.12 1999/04/05 17:23:01 mycroft Exp $
+# $NetBSD: Makefile,v 1.13 1999/05/24 20:39:42 tv Exp $
 #
 
-DISTNAME=	battalion
-PKGNAME=	battalion-1.4
-WRKSRC=		${WRKDIR}/battalionSource
-CATEGORIES=	games x11
-MASTER_SITES=	http://www.evl.uic.edu/aej/
-DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
+DISTNAME=		battalion
+PKGNAME=		battalion-1.4
+WRKSRC=			${WRKDIR}/battalionSource
+CATEGORIES=		games x11
+MASTER_SITES=		http://www.evl.uic.edu/aej/
+DISTFILES=		battalionSource1.4.tar.Z battalionSUN4.tar.gz
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.evl.uic.edu/aej/AndyBattalion.html
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://www.evl.uic.edu/aej/AndyBattalion.html
 
-DEPENDS+=	Mesa-3.0:../../graphics/Mesa
+DEPENDS=		Mesa-3.0:../../graphics/Mesa
 
-NOT_FOR_ARCHS=	alpha	# relies on Mesa (gcc)
+NOT_FOR_PLATFORM=	*-*-alpha	# relies on Mesa (gcc)
 
-EXTRACT_ONLY=	battalionSource1.4.tar.Z
-USE_X11BASE=	yes
+EXTRACT_ONLY=		battalionSource1.4.tar.Z
+USE_X11BASE=		yes
 
 do-install:
 	${INSTALL} -c -s -o root -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 6c1ed131835..cee919e8c32 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.3 1999/04/01 13:38:43 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/24 20:39:42 tv Exp $
 #
 
-DISTNAME=	cqcam-0.45a
-CATEGORIES=    	graphics x11
-MASTER_SITES=	http://www.cs.virginia.edu/~patrick/cqcam/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		cqcam-0.45a
+CATEGORIES=    		graphics x11
+MASTER_SITES=		http://www.cs.virginia.edu/~patrick/cqcam/
+EXTRACT_SUFX=		.tgz
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.cs.virginia.edu/~patrick/cqcam/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.cs.virginia.edu/~patrick/cqcam/
 
-# XXX uses inb/outb
-ONLY_FOR_ARCHS=	i386
+DEPENDS=		jpeg-6b:../../graphics/jpeg \
+			tk-8.0.5:../../x11/tk80
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	tk-8.0.5:../../x11/tk80
-
-LICENSE=	no-profit
+LICENSE=		no-profit
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index b7241ae5a00..093381d1206 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.3 1999/04/26 17:17:05 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/24 20:39:42 tv Exp $
 #
 
-DISTNAME=	ee-0.3.8
-CATEGORIES=	x11 gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ee/ \
-		ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ee/ \
-		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ee/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/ee/
+DISTNAME=		ee-0.3.8
+CATEGORIES=		x11 gnome
+MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ee/ \
+			ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ee/ \
+			ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ee/ \
+			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/ee/
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	gnome-core-1.0.5:../../x11/gnome-core
+DEPENDS=		gnome-core-1.0.5:../../x11/gnome-core
 
-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=		yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 
-LOCALSTATEDIR=	/var/gnome
+LOCALSTATEDIR=		/var/gnome
 
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index e7c37d0d0e2..9d507eed951 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -1,42 +1,41 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/17 12:40:42 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:43 tv Exp $
 
-DISTNAME=	mtv-1.0.9.2
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/RPMS/ \
-		ftp://ftp.mpeg.org/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/RPMS/
-DISTFILES=	${DISTNAME}-1.i386.rpm SDL-0.9.9-5.i386.rpm
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		mtv-1.0.9.2
+CATEGORIES=		graphics
+MASTER_SITES=		ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/RPMS/ \
+			ftp://ftp.mpeg.org/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/RPMS/
+DISTFILES=		${DISTNAME}-1.i386.rpm SDL-0.9.9-5.i386.rpm
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.mpegtv.com/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.mpegtv.com/
 
-DEPENDS+=	suse_xforms-6.1:../../emulators/suse_xforms
+DEPENDS=		suse_xforms-6.1:../../emulators/suse_xforms
 
-DIST_SUBDIR=	mtv
-LICENSE=	fee-based-commercial-use
+LICENSE=		fee-based-commercial-use
 
-EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_WRKSUBDIR=	yes
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
+EXTRACT_ONLY=		# empty
+NO_BUILD=		yes
+NO_PATCH=		yes
+NO_CONFIGURE=		yes
+NO_WRKSUBDIR=		yes
+PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-EMULSUBDIR=	emul/linux
-EMULDIR=	${PREFIX}/${EMULSUBDIR}
-SBINDIR=	${PREFIX}/sbin
+EMULSUBDIR=		emul/linux
+EMULDIR=		${PREFIX}/${EMULSUBDIR}
+SBINDIR=		${PREFIX}/sbin
 
 do-install:
-		@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 .for FILE in mtv mtvp
-		${LN} -fs ../${EMULSUBDIR}/usr/X11R6/bin/${FILE} ${PREFIX}/bin
+	${LN} -fs ../${EMULSUBDIR}/usr/X11R6/bin/${FILE} ${PREFIX}/bin
 .endfor
-		cd ${_DISTDIR} && \
-		${SBINDIR}/rpm2pkg ${DISTFILES} >>${PLIST_SRC}
-		@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
-		${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
+	cd ${_DISTDIR} && \
+	${SBINDIR}/rpm2pkg ${DISTFILES} >>${PLIST_SRC}
+	@${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" >>${PLIST_SRC}
+	${EMULDIR}/sbin/ldconfig -r ${EMULDIR} || ${TRUE}
 
 show-shlib-type:
-		@${ECHO} linux-${MACHINE_ARCH}
+	@${ECHO} linux-${MACHINE_ARCH}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 49e2824ac0d..a4bedef4cc3 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.8 1999/04/17 01:55:55 mjl Exp $
+# $NetBSD: Makefile,v 1.9 1999/05/24 20:39:43 tv Exp $
 
-DISTNAME=	clispsrc
-PKGNAME=	clisp-19990108
-CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp2.cons.org/pub/lisp/clisp/source/ \
-		ftp://ftp.tu-darmstadt.de/pub/programming/languages/lisp/clisp/source/
+DISTNAME=		clispsrc
+PKGNAME=		clisp-19990108
+CATEGORIES=		lang
+MASTER_SITES=		ftp://ftp2.cons.org/pub/lisp/clisp/source/ \
+			ftp://ftp.tu-darmstadt.de/pub/programming/languages/lisp/clisp/source/
 
-MAINTAINER=	mjl@emsi.priv.at
-HOMEPAGE=	http://clisp.cons.org/~haible/clisp.html
+MAINTAINER=		mjl@emsi.priv.at
+HOMEPAGE=		http://clisp.cons.org/~haible/clisp.html
 
-NOT_FOR_ARCHS=	alpha	# severe LP64 problems
+NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 problems
 
 MIRROR_DISTFILE=	no
 
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index c50146dfa08..75cb52aea04 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/04/07 10:36:29 agc Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:43 tv Exp $
 #
 
-DISTNAME=       egcs-1.1.2
-CATEGORIES=	lang
-MASTER_SITES=   ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.2/
+DISTNAME=		egcs-1.1.2
+CATEGORIES=		lang
+MASTER_SITES=		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.2/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://egcs.cygnus.com/index.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://egcs.cygnus.com/index.html
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
-NOT_FOR_OPSYS=	NetBSD	# In NetBSD base system
+NOT_FOR_PLATFORM=	NetBSD-*-*	# In NetBSD base system
 
-PREFIX=		${LOCALBASE}/egcs
+PREFIX=			${LOCALBASE}/egcs
 
-MAKE_ENV+=	CPPFLAGS=
+MAKE_ENV+=		CPPFLAGS=
 
-ALL_TARGET=	bootstrap
+ALL_TARGET=		bootstrap
 
-INFO_FILES=	cpp.info g77.info gcc.info
+INFO_FILES=		cpp.info g77.info gcc.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 8fba5f3b2b2..923d7bf27b1 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.8 1998/11/13 01:16:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1999/05/24 20:39:43 tv Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/09/01 12:28:30 tg Exp
 #
 
-DISTNAME=	elk-3.0
-PKGNAME=	elk-3.0.2
-CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.uni-bremen.de/pub/programming/languages/scheme/elk/
+DISTNAME=		elk-3.0
+PKGNAME=		elk-3.0.2
+CATEGORIES=		lang
+MASTER_SITES=		ftp://ftp.uni-bremen.de/pub/programming/languages/scheme/elk/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www-rn.informatik.uni-bremen.de/software/elk/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www-rn.informatik.uni-bremen.de/software/elk/
 
-NOT_FOR_ARCHS=	alpha mips	#elf loading problems, LP64
+NOT_FOR_PLATFORM=	*-*-{alpha,mips}	#elf loading problems, LP64
 
-ALL_TARGET=	default
+ALL_TARGET=		default
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 5ea5ec6163e..051c0b7578e 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.2 1999/04/14 21:39:04 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:43 tv Exp $
 
-DISTNAME=	gforth-0.4.0
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_GNU:=gforth/}
+DISTNAME=		gforth-0.4.0
+CATEGORIES=		lang
+MASTER_SITES=		${MASTER_SITE_GNU:=gforth/}
 
-MAINTAINER=	simonb@netbsd.org
-HOMEPAGE=	http://www.complang.tuwien.ac.at/forth/gforth/
+MAINTAINER=		simonb@netbsd.org
+HOMEPAGE=		http://www.complang.tuwien.ac.at/forth/gforth/
 
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=		YES
 INFO_FILES=		gforth.info
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index e293387241a..6d9361dca53 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.10 1998/08/20 15:17:05 tsarna Exp $
+# $NetBSD: Makefile,v 1.11 1999/05/24 20:39:44 tv Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
 #
 
-DISTNAME=       unix
-PKGNAME=	icon-9.3.1
-CATEGORIES=	lang
-MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
-EXTRACT_SUFX=	.tgz
-ONLY_FOR_ARCHS=	alpha i386
+DISTNAME=       	unix
+PKGNAME=		icon-9.3.1
+CATEGORIES=		lang
+MASTER_SITES=		http://www.cs.arizona.edu/icon/ftp/packages/unix/
+EXTRACT_SUFX=		.tgz
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,i386}
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.cs.arizona.edu/icon/index.htm
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.cs.arizona.edu/icon/index.htm
 
-DIST_SUBDIR=	icon
-NO_WRKSUBDIR=	true
-ALL_TARGET=	Icon Icon-iconc
+DIST_SUBDIR=		icon
+NO_WRKSUBDIR=		true
+ALL_TARGET=		Icon Icon-iconc
 
-OPSYS!=         uname -s
-.if (${OPSYS} == "NetBSD")
-MANCOMPRESSED=	yes
+.include "../../mk/bsd.prefs.mk"
+.if defined(MANZ)
+MANCOMPRESSED=		yes
 .endif
 
-MAN1=		icon.1
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index feeaee2da0c..d24485d1798 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/05/24 20:39:44 tv Exp $
 
 DISTNAME=		jdk1.1.6
 PKGNAME=		jdk-1.1.6
@@ -14,7 +14,7 @@ RESTRICTED=		'No redistribution of the Java(tm) Development Kit'
 NO_PACKAGE=		${RESTRICTED}
 MIRROR_DISTFILE=	no
 
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index ce732001170..c5b792ec5a8 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,28 +1,27 @@
-# $NetBSD: Makefile,v 1.16 1999/03/04 14:59:24 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/05/24 20:39:44 tv Exp $
 #
 
-DISTNAME=	kaffe-1.0.b3
-CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.transvirtual.com/pub/kaffe/
+DISTNAME=		kaffe-1.0.b3
+CATEGORIES=		lang
+MASTER_SITES=		ftp://ftp.transvirtual.com/pub/kaffe/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.transvirtual.com/kaffe.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.transvirtual.com/kaffe.html
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-1.0.3:../../graphics/png
-DEPENDS+=	giflib-3.0:../../graphics/giflib
+DEPENDS=		jpeg-6b:../../graphics/jpeg \
+			png-1.0.3:../../graphics/png \
+			giflib-3.0:../../graphics/giflib
 
-ONLY_FOR_ARCHS=	arm32 i386 m68k mips* sparc
-NOT_FOR_ARCHS=	alpha	#assembler problems
+ONLY_FOR_PLATFORM=	*-*-{arm32,i386,m68k,mips*,sparc}
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LOCALBASE=${LOCALBASE}
-MAKE_ENV=	PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} \
-		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
-		MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
-CFLAGS+=	-Dunix -I${LOCALBASE}/include -I${X11BASE}/include
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+			CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+			LOCALBASE=${LOCALBASE}
+MAKE_ENV=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} \
+			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+			MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}"
+CFLAGS+=		-Dunix -I${LOCALBASE}/include -I${X11BASE}/include
 
 post-install:
 	${MKDIR} ${PREFIX}/share/kaffe
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index 7e2617bee93..4341ac110cc 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/05/11 07:49:55 abs Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/24 20:39:44 tv Exp $
 #
 
 DISTNAME=		perl5.004_04
@@ -17,8 +17,7 @@ PLIST_SRC=		${PKGDIR}/PLIST-elf
 .elif exists(/usr/libexec/ld.so)
 PLIST_SRC=		${PKGDIR}/PLIST-aout
 .else
-# Need to determine `NOPIC' before bsd.own.mk is included.
-NOT_FOR_ARCHS!=		sysctl -n hw.machine_arch
+IGNORE=			"needs shared object support"
 .endif
 PATCHDIR=		../perl5/patches
 
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 91bf4b68c18..94b9139a085 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/05/24 20:39:44 tv Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/08/27 19:31:37 jmacd Exp
 #
 
-DISTNAME=	scheme48-0.52
-CATEGORIES=	lang
-MASTER_SITES=	http://www.neci.nj.nec.com/homepages/kelsey/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		scheme48-0.52
+CATEGORIES=		lang
+MASTER_SITES=		http://www.neci.nj.nec.com/homepages/kelsey/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER= 	packages@netbsd.org
-HOMEPAGE=	http://www.neci.nj.nec.com/homepages/kelsey/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.neci.nj.nec.com/homepages/kelsey/
 
-NOT_FOR_ARCHS=	alpha	# *severe* problems.  Bus error, alignment
+NOT_FOR_PLATFORM=	*-*-alpha	# *severe* problems.  Bus error, alignment
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-ALL_TARGET = 	enough
+GNU_CONFIGURE=  	yes
+CONFIGURE_ARGS=		--prefix=${PREFIX}
+ALL_TARGET=		enough
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index ce24ec32455..cbffbf1f743 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.5 1999/01/30 23:18:51 agc Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/24 20:39:44 tv Exp $
 #
 
-DISTNAME=       xfmail-1.3
-CATEGORIES=     mail x11
-MASTER_SITES=	ftp://burka.netvision.net.il/pub/xfmail/
+DISTNAME=		xfmail-1.3
+CATEGORIES=		mail x11
+MASTER_SITES=		ftp://burka.netvision.net.il/pub/xfmail/
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://Burka.NetVision.net.il/xfmail/xfmail.html
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://Burka.NetVision.net.il/xfmail/xfmail.html
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=       xforms-0.88:../../x11/xforms
+DEPENDS+=		gdbm-1.7.3:../../databases/gdbm \
+			xpm-3.4k:../../graphics/xpm \
+			xforms-0.88:../../x11/xforms
 
-ONLY_FOR_ARCHS=	arm32 i386 m68k sparc ns32k
+ONLY_FOR_PLATFORM=	*-*-{arm32,i386,m68k,sparc,ns32k}
 
-RESTRICTED=	"Selling this software requires permission of the authors."
+RESTRICTED=		"Selling this software requires permission of the authors."
 
-USE_X11BASE=	YES
-GNU_CONFIGURE=	YES
+USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
 
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/xfmail
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index 00993658473..a8ecd874ab9 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.4 1999/04/15 20:39:44 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:45 tv Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/09/26 23:18:07 steve Exp
 #
 
-DISTNAME=	xldlas-0.85
-WRKSRC=		${WRKDIR}/xldlas
-CATEGORIES=	math
-MASTER_SITES=	http://a42.com/~thor/xldlas/			\
-		http://sunsite.math.klte.hu/mirrors/xldlas/	\
-		${MASTER_SITE_SUNSITE:=X11/xapps/math/}
-EXTRACT_SUFX=	-source.tgz
+DISTNAME=		xldlas-0.85
+WRKSRC=			${WRKDIR}/xldlas
+CATEGORIES=		math
+MASTER_SITES=		http://a42.com/~thor/xldlas/			\
+			http://sunsite.math.klte.hu/mirrors/xldlas/	\
+			${MASTER_SITE_SUNSITE:=X11/xapps/math/}
+EXTRACT_SUFX=		-source.tgz
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://a42.com/~thor/xldlas/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://a42.com/~thor/xldlas/
 
-DEPENDS+=	xforms-0.88:../../x11/xforms
+DEPENDS=		xforms-0.88:../../x11/xforms
 
-ONLY_FOR_ARCHS=	arm32 i386 m68k sparc ns32k
+ONLY_FOR_PLATFORM=	*-*-{arm32,i386,m68k,sparc,ns32k}
 
-USE_X11BASE=	yes
+USE_X11BASE=		yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xldlas ${PREFIX}/bin
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 6949f0f9f32..abb710fc7e4 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/05/24 20:39:45 tv Exp $
 # FreeBSD Id: Makefile,v 1.7 1998/08/20 07:35:21 asami Exp
 #
 
-DISTNAME=	xlispstat-3-52-9
-PKGNAME=	xlispstat-3.52.9
-CATEGORIES=	math lang
-MASTER_SITES=	ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/
+DISTNAME=		xlispstat-3-52-9
+PKGNAME=		xlispstat-3.52.9
+CATEGORIES=		math lang
+MASTER_SITES=		ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.stat.umn.edu/~luke/xls/xlsinfo/xlsinfo.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.stat.umn.edu/~luke/xls/xlsinfo/xlsinfo.html
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
 
-NOT_FOR_ARCHS=	alpha #core dumps
+NOT_FOR_PLATFORM=	*-*-alpha	#core dumps
 
-ALL_TARGET=	xlispstat
+ALL_TARGET=		xlispstat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index b703450d5fc..62d82b95db2 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,28 +1,28 @@
-# $NetBSD: Makefile,v 1.16 1999/04/15 07:21:04 tron Exp $
+# $NetBSD: Makefile,v 1.17 1999/05/24 20:39:45 tv Exp $
 #
 
-DISTNAME=	nt.1.5a23
-PKGNAME=	nte-1.5a23
-CATEGORIES=	mbone tk80
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a23/
+DISTNAME=		nt.1.5a23
+PKGNAME=		nte-1.5a23
+CATEGORIES=		mbone tk80
+MASTER_SITES=		http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a23/
 
-MAINTAINER=	mycroft@netbsd.org
-HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/
+MAINTAINER=		mycroft@netbsd.org
+HOMEPAGE=		http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/
 
-BUILD_DEPENDS=	${TK_SRC}/generic/default.h:${TK_DIR}:configure
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+BUILD_DEPENDS=		${TK_SRC}/generic/default.h:${TK_DIR}:configure
+DEPENDS+=		tk-8.0.5:../../x11/tk80
 
-TK_DIR=         ${.CURDIR}/../../x11/tk80
-TK_SRC=		${TK_DIR}/${WRKDIR:T}/tk8.0.5
+TK_DIR=         	${.CURDIR}/../../x11/tk80
+TK_SRC=			${TK_DIR}/${WRKDIR:T}/tk8.0.5
 
-NOT_FOR_ARCHS=	alpha	# ANSI headers cause LP64 problems
+NOT_FOR_PLATFORM=	*-*-alpha	# ANSI headers cause LP64 problems
 
-RESTRICTED=	"Contains DES encryption"
-MIRROR_DISTFILE=no
-NO_WRKSUBDIR=	yes
-USE_GMAKE=	yes
+RESTRICTED=		"Contains DES encryption"
+MIRROR_DISTFILE=	no
+NO_WRKSUBDIR=		yes
+USE_GMAKE=		yes
 # Pass this on to our child
-MAKE_ENV=	TK_SRC=${TK_SRC}
+MAKE_ENV=		TK_SRC=${TK_SRC}
 
 do-configure:
 	cd ${WRKSRC}/netbsd && sh configure
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 25ccf51faef..31444d5e317 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.23 1999/04/05 03:36:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.24 1999/05/24 20:39:45 tv Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp 
 #
 
-DISTNAME=	vat-4.0b2
-CATEGORIES=	mbone
-MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
-DISTFILES=	vatsrc-4.0b2.tar.gz
+DISTNAME=		vat-4.0b2
+CATEGORIES=		mbone
+MASTER_SITES=		ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
+DISTFILES=		vatsrc-4.0b2.tar.gz
 
-MAINTAINER=	mycroft@netbsd.org
-HOMEPAGE=	http://www-nrg.ee.lbl.gov/vat/
+MAINTAINER=		mycroft@netbsd.org
+HOMEPAGE=		http://www-nrg.ee.lbl.gov/vat/
 
 # If configure is changed to look for libgsm.a in ${PREFIX}/lib, then
 # we can use this first BUILD_DEPENDS and save some work.
-#BUILD_DEPENDS=	${GSM_WORK}/inc/private.h:${GSM_DIR}:patch
-BUILD_DEPENDS=	${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
-DEPENDS+=	tk-8.0.5:../../x11/tk80
-#DEPENDS+=	gsm-1.0.10:${GSM_DIR}
+#BUILD_DEPENDS=		${GSM_WORK}/inc/private.h:${GSM_DIR}:patch
+BUILD_DEPENDS=		${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
+DEPENDS+=		tk-8.0.5:../../x11/tk80
+#DEPENDS+=		gsm-1.0.10:${GSM_DIR}
 
-NOT_FOR_ARCHS=	alpha	#filter.cc compiler error
+NOT_FOR_PLATFORM=	*-*-alpha	#filter.cc compiler error
 
-GSM_DIR=	${.CURDIR}/../../audio/gsm
-GSM_WORK=	${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
+GSM_DIR=		${.CURDIR}/../../audio/gsm
+GSM_WORK=		${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-gsm=${GSM_WORK}
-INSTALL_TARGET=	install install-man
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-gsm=${GSM_WORK}
+INSTALL_TARGET=		install install-man
 
 post-install:
 	@strip ${PREFIX}/bin/vat
diff --git a/misc/dync/Makefile b/misc/dync/Makefile
index 8d7ed56f4b6..963983b4432 100644
--- a/misc/dync/Makefile
+++ b/misc/dync/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1998/11/13 01:30:09 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:45 tv Exp $
 #
 
-DISTNAME=	dync-1.1
-CATEGORIES=	misc
-MASTER_SITES=	http://www.westley.demon.co.uk/src/
+DISTNAME=		dync-1.1
+CATEGORIES=		misc
+MASTER_SITES=		http://www.westley.demon.co.uk/src/
 
-MAINTAINER=	agc@netbsd.org
-HOMEPAGE=	http://www.westley.demon.co.uk/software.html
+MAINTAINER=		agc@netbsd.org
+HOMEPAGE=		http://www.westley.demon.co.uk/software.html
 
-NOT_FOR_ARCHS=	alpha	#dync: can't dlopen `lib1.so.1.0'
+NOT_FOR_PLATFORM=	*-*-alpha	#dync: can't dlopen `lib1.so.1.0'
 
-GNU_CONFIGURE=	yes
-ALL_TARGET=	tst
+GNU_CONFIGURE=		yes
+ALL_TARGET=		tst
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 77a659caaa8..a805b95da30 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.272 1999/05/24 18:42:00 tv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.273 1999/05/24 20:39:50 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -17,16 +17,6 @@
 # NEVER override the "regular" targets unless you want to open
 # a major can of worms.
 
-##### Transitional compatibility: #####
-ONLY_FOR_OPSYS?=	*
-ONLY_FOR_ARCHS?=	*
-.for __opsys__ in ${ONLY_FOR_OPSYS}
-.for __arch__ in ${ONLY_FOR_ARCHS}
-ONLY_FOR_PLATFORM+=	${__opsys__}-*-${__arch__}
-.endfor
-.endfor
-NOT_FOR_PLATFORM+=	${NOT_FOR_OPSYS:S/$/-*-*/} ${NOT_FOR_ARCHS:S/^/*-*-/}
-
 ##### Include any preferences, if not already included, and common definitions
 .include "../../mk/bsd.prefs.mk"
 
@@ -618,6 +608,13 @@ EXTRACT_ONLY?=	${DISTFILES}
 	@${FALSE}
 .endif
 
+.if defined(ONLY_FOR_ARCHS) || defined(NOT_FOR_ARCHS) \
+	|| defined(ONLY_FOR_OPSYS) || defined(NOT_FOR_OPSYS)
+.BEGIN:
+	@${ECHO_MSG} 'ONLY/NOT_FOR_ARCHS/OPSYS are deprecated and must be replaced with ONLY/NOT_FOR_PLATFORM.'
+	@${FALSE}
+.endif
+
 # Note this has to start with a capital letter (or more accurately, it
 #  shouldn't match "[a-z]*"), see the target "delete-package-links" below.
 PKGREPOSITORYSUBDIR?=	All
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index bb05bf96609..9332654f990 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.13 1999/04/28 20:22:09 rvb Exp $
+# $NetBSD: Makefile,v 1.14 1999/05/24 20:39:46 tv Exp $
 #
 
-DISTNAME=	coda-5.2.2
-PKGNAME=	coda-client-5.2.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		coda-5.2.2
+PKGNAME=		coda-client-5.2.2
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	rvb@cs.cmu.edu
-HOMEPAGE=	http://www.coda.cs.cmu.edu/
+MAINTAINER=		rvb@cs.cmu.edu
+HOMEPAGE=		http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS=		gdbm-1.7.3:../../databases/gdbm \
+			readline-2.2:../../devel/readline
 
-ONLY_FOR_ARCHS=	arm32 i386 ns32k
+ONLY_FOR_PLATFORM=	NetBSD-*-{arm32,i386,ns32k}
 
-#LICENSE=	GPL
+#LICENSE=		GPL
 
-ALL_TARGET=	coda
-INSTALL_TARGET=	client-install
+ALL_TARGET=		coda
+INSTALL_TARGET=		client-install
 
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 8c5adf53a69..b1f0bae8f00 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,27 +1,27 @@
-# $NetBSD: Makefile,v 1.13 1999/04/28 20:22:10 rvb Exp $
+# $NetBSD: Makefile,v 1.14 1999/05/24 20:39:46 tv Exp $
 #
 
-DISTNAME=	coda-5.2.2
-PKGNAME=	coda-server-5.2.2
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		coda-5.2.2
+PKGNAME=		coda-server-5.2.2
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	rvb@cs.cmu.edu
-HOMEPAGE=	http://www.coda.cs.cmu.edu/
+MAINTAINER=		rvb@cs.cmu.edu
+HOMEPAGE=		http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS=		gdbm-1.7.3:../../databases/gdbm \
+			readline-2.2:../../devel/readline
 
-ONLY_FOR_ARCHS=	arm32 i386 ns32k
+ONLY_FOR_PLATFORM=	*-*-{arm32,i386,ns32k}
 
-#LICENSE=	GPL
+#LICENSE=		GPL
 
-ALL_TARGET=	coda
-INSTALL_TARGET=	server-install
+ALL_TARGET=		coda
+INSTALL_TARGET=		server-install
 
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile
index 8d3d9d12cab..4a146ce0802 100644
--- a/net/coda_client/Makefile
+++ b/net/coda_client/Makefile
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.8 1999/04/26 19:08:44 garbled Exp $
+# $NetBSD: Makefile,v 1.9 1999/05/24 20:39:46 tv Exp $
 #
 
-DISTNAME=	coda-4.6.6
-PKGNAME=	coda-client-4.6.6.1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		coda-4.6.6
+PKGNAME=		coda-client-4.6.6.1
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	rvb@cs.cmu.edu
-HOMEPAGE=	http://www.coda.cs.cmu.edu/
+MAINTAINER=		rvb@cs.cmu.edu
+HOMEPAGE=		http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS=		gdbm-1.7.3:../../databases/gdbm \
+			readline-2.2:../../devel/readline
 
-NOT_FOR_ARCHS=	alpha  # needs custom asm.
+ONLY_FOR_PLATFORM=	NetBSD-*-*
+NOT_FOR_PLATFORM=	NetBSD-*-alpha	# needs custom asm.
 
-ALL_TARGET=	coda
-INSTALL_TARGET=	client-install
+ALL_TARGET=		coda
+INSTALL_TARGET=		client-install
 
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda_server/Makefile b/net/coda_server/Makefile
index 209a702f931..8d9b39e2025 100644
--- a/net/coda_server/Makefile
+++ b/net/coda_server/Makefile
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.8 1999/04/26 19:08:44 garbled Exp $
+# $NetBSD: Makefile,v 1.9 1999/05/24 20:39:46 tv Exp $
 #
 
-DISTNAME=	coda-4.6.6
-PKGNAME=	coda-server-4.6.6.1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		coda-4.6.6
+PKGNAME=		coda-server-4.6.6.1
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	rvb@cs.cmu.edu
-HOMEPAGE=	http://www.coda.cs.cmu.edu/
+MAINTAINER=		rvb@cs.cmu.edu
+HOMEPAGE=		http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS=		gdbm-1.7.3:../../databases/gdbm \
+			readline-2.2:../../devel/readline
 
-NOT_FOR_ARCHS=	alpha # needs custom asm.
+ONLY_FOR_PLATFORM=	NetBSD-*-*
+NOT_FOR_PLATFORM=	*-*-alpha	# needs custom asm.
 
-ALL_TARGET=	coda
-INSTALL_TARGET=	server-install
+ALL_TARGET=		coda
+INSTALL_TARGET=		server-install
 
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+USE_GMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index 4acf7c52d30..f5cdb0b8790 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,48 +1,48 @@
-# $NetBSD: Makefile,v 1.31 1999/05/20 20:09:51 tron Exp $
+# $NetBSD: Makefile,v 1.32 1999/05/24 20:39:46 tv Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
-DISTNAME=	kdenetwork-1.1
-CATEGORIES=	net kde
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.kde.org/
-
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	uulib-0.5.13:../../converters/uulib
-DEPENDS+=	kdesupport-1.1:../../converters/kdesupport
-DEPENDS+=	kdebase-1.1:../../x11/kdebase
-
-NOT_FOR_ARCHS=	alpha	# LP64/ELF problems
-
-USE_X11BASE=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-LIBTOOL_FLAGS=	--cplusplus --install-la
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
-		"--with-qt-dir=${PREFIX}" \
-		"--with-qt-includes=${PREFIX}/include/qt"
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=        -I${LOCALBASE}/include
-CONFIGURE_ENV=  KDEDIR=${PREFIX} \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CFLAGS}" \
-		all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
-
-GCC_VERSION!=   gcc --version
+DISTNAME=		kdenetwork-1.1
+CATEGORIES=		net kde
+MASTER_SITES=		ftp://ftp.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/ \
+			ftp://ftp.de.kde.org/pub/kde/stable/1.1/distribution/tar/generic/source/bz2/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.kde.org/
+
+DEPENDS=		gdbm-1.7.3:../../databases/gdbm \
+			uulib-0.5.13:../../converters/uulib \
+			kdesupport-1.1:../../converters/kdesupport \
+			kdebase-1.1:../../x11/kdebase
+
+NOT_FOR_PLATFORM=	*-*-alpha	# LP64/ELF problems
+
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+LIBTOOL_FLAGS=		--cplusplus --install-la
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		"--datadir=${PREFIX}/share/kde" \
+			"--with-qt-dir=${PREFIX}" \
+			"--with-qt-includes=${PREFIX}/include/qt"
+CPPFLAGS+=		-I${LOCALBASE}/include
+CFLAGS+=		-I${LOCALBASE}/include
+CONFIGURE_ENV=  	KDEDIR=${PREFIX} \
+			CPPFLAGS="${CPPFLAGS}" \
+			CXXFLAGS="${CFLAGS}" \
+			all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib"
+
+GCC_VERSION!=   	gcc --version
 .if (${GCC_VERSION:C/-.*$$//} == egcs)
-PLIST_SRC=	${PKGDIR}/PLIST.egcs
+PLIST_SRC=		${PKGDIR}/PLIST.egcs
 .else
-PLIST_SRC=	${PKGDIR}/PLIST.gcc
+PLIST_SRC=		${PKGDIR}/PLIST.gcc
 .endif
 
 post-install:
 .if (${GCC_VERSION:C/-.*$$//} != egcs)
-		@find ${PREFIX}/share/kde/locale -name ksirc.mo | xargs ${RM}
+	@find ${PREFIX}/share/kde/locale -name ksirc.mo | xargs ${RM}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 20f8233e85e..16beee5b0d8 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/04/07 12:54:16 agc Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:47 tv Exp $
 #
 
-DISTNAME=	libpcap-0.4
-CATEGORIES=	net
-MASTER_SITES= 	ftp://ftp.ee.lbl.gov/
-EXTRACT_SUFX=	.tar.Z
+DISTNAME=		libpcap-0.4
+CATEGORIES=		net
+MASTER_SITES= 		ftp://ftp.ee.lbl.gov/
+EXTRACT_SUFX=		.tar.Z
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=		packages@netbsd.org
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
-NOT_FOR_OPSYS=	NetBSD # in base system
+NOT_FOR_PLATFORM=	NetBSD-*-*	# in base system
 
 INSTALL_TARGET+=	install-incl install-man
 
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a5ed53b366d..d60765eb0d6 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,28 +1,28 @@
-# $NetBSD: Makefile,v 1.7 1998/11/04 00:06:32 bad Exp $
+# $NetBSD: Makefile,v 1.8 1999/05/24 20:39:47 tv Exp $
 
-DISTNAME=	ntop-1.0
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.unipi.it/pub/local/ntop/source/
-EXTRACT_SUFX=	.src.tar.gz
+DISTNAME=		ntop-1.0
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.unipi.it/pub/local/ntop/source/
+EXTRACT_SUFX=		.src.tar.gz
 
-MAINTAINER=	kim@tac.nyc.ny.us
+MAINTAINER=		kim@tac.nyc.ny.us
 
-BUILD_DEPENDS+=	autoconf:../../devel/autoconf
-DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+BUILD_DEPENDS=		autoconf:../../devel/autoconf
+DEPENDS=		ncurses-1.9.9g:../../devel/ncurses
 
-HOMEPAGE=	http://www-serra.unipi.it/~ntop/
+HOMEPAGE=		http://www-serra.unipi.it/~ntop/
 
-NOT_FOR_ARCHS=	alpha mips # elf problems WRT libcurses
+NOT_FOR_PLATFORM=	*-*-{alpha,mips}	# elf problems WRT libcurses
 
-HAS_CONFIGURE=	yes
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=		yes
+GNU_CONFIGURE=		yes
 
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib
+CFLAGS+=		-I${PREFIX}/include
+LDFLAGS+=		-L${PREFIX}/lib
 
-CONFIGURE_ENV+=	CPPFLAGS=-I${PREFIX}/include
-CONFIGURE_ENV+=	CFLAGS=-I${PREFIX}/include
-CONFIGURE_ENV+=	LDFLAGS=-L${PREFIX}/lib
+CONFIGURE_ENV+=		CPPFLAGS=-I${PREFIX}/include
+CONFIGURE_ENV+=		CFLAGS=-I${PREFIX}/include
+CONFIGURE_ENV+=		LDFLAGS=-L${PREFIX}/lib
 
 pre-configure:
 	(cd ${WRKSRC}; autoconf)
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 0a3085de57f..02a2f9e7fe4 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 1999/03/08 10:53:57 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/05/24 20:39:47 tv Exp $
 #
 
-DISTNAME=	sniffit.0.3.5
-PKGNAME=	sniffit-0.3.5
-CATEGORIES=	net security
-MASTER_SITES=	http://reptile.rug.ac.be/~coder/sniffit/files/
+DISTNAME=		sniffit.0.3.5
+PKGNAME=		sniffit-0.3.5
+CATEGORIES=		net security
+MASTER_SITES=		http://reptile.rug.ac.be/~coder/sniffit/files/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://reptile.rug.ac.be/~coder/sniffit/sniffit.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://reptile.rug.ac.be/~coder/sniffit/sniffit.html
 
-NOT_FOR_ARCHS=	alpha	# severe LP64 loss
+NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 loss
 
 do-build:
 	cd ${WRKSRC} ; ./configure ; ${MAKE}
diff --git a/plan9/9term/Makefile b/plan9/9term/Makefile
index 06a58208c74..d788159364d 100644
--- a/plan9/9term/Makefile
+++ b/plan9/9term/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.17 1999/03/22 09:38:26 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/05/24 20:39:47 tv Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
-DISTNAME=       9term.1.6.3
-PKGNAME=	9term-1.6.3
-CATEGORIES=	plan9
-MASTER_SITES=   ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
+DISTNAME=		9term.1.6.3
+PKGNAME=		9term-1.6.3
+CATEGORIES=		plan9
+MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.psrg.cs.usyd.edu.au/~matty/9term/index.html
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.psrg.cs.usyd.edu.au/~matty/9term/index.html
 
 # needs library and private header, but not during runtime
-BUILD_DEPENDS=	${BUILD_ROOT}/plan9/sam/${WRKDIR:T}/libframe/libframe.a:../../plan9/sam
+BUILD_DEPENDS=		${BUILD_ROOT}/plan9/sam/${WRKDIR:T}/libframe/libframe.a:../../plan9/sam
 
-NOT_FOR_ARCHS=	alpha	#LP64 Problems
+NOT_FOR_PLATFORM=	*-*-alpha	#LP64 Problems
 
-MANCOMPRESSED=	yes
-NO_WRKSUBDIR=	yes
-MAKE_ENV+=	WRKDIR=${WRKDIR} PKGSRCDIR=${BUILD_ROOT}
+MANCOMPRESSED=		yes
+NO_WRKSUBDIR=		yes
+MAKE_ENV+=		WRKDIR=${WRKDIR} PKGSRCDIR=${BUILD_ROOT}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 614909f592a..c4fd2ffcdda 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,26 +1,23 @@
-# $NetBSD: Makefile,v 1.17 1999/05/09 14:06:38 frueauf Exp $
+# $NetBSD: Makefile,v 1.18 1999/05/24 20:39:47 tv Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
 #
 
-DISTNAME=	lyx-1.0.2
-CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
-		ftp://la1ad.uio.no/pub/lyx/
+DISTNAME=		lyx-1.0.2
+CATEGORIES=		print
+MASTER_SITES=		ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
+			ftp://la1ad.uio.no/pub/lyx/
 
-MAINTAINER=	frueauf@netbsd.org
-HOMEPAGE=	http://la1ad.uio.no/lyx/
+MAINTAINER=		frueauf@netbsd.org
+HOMEPAGE=		http://la1ad.uio.no/lyx/
 
-DEPENDS+=	ispell-3.1.20:../../textproc/ispell
-DEPENDS+=	teTeX-0.4p8:../../print/teTeX
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=	xforms-0.88:../../x11/xforms
+DEPENDS=		ispell-3.1.20:../../textproc/ispell \
+			teTeX-0.4p8:../../print/teTeX \
+			xpm-3.4k:../../graphics/xpm \
+			xforms-0.88:../../x11/xforms
 
-# restrictions from xforms
-ONLY_FOR_ARCHS=	arm32 i386 m68k sparc ns32k
-
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib \
-		--with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
+USE_PERL5=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS= 	--with-extra-lib=${X11BASE}/lib \
+			--with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 97e49fc6068..2c048ce9306 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/05/23 21:15:20 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/05/24 20:39:48 tv Exp $
 #
 
 DISTNAME=		openssl-0.9.2b
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.openssl.org/source/
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		openssl-0.9.2b-rsaoaep.patch
 
-MAINTAINER=		packages@NetBSD.ORG
+MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.openssl.org/
 
 CONFLICTS=		SSLeay-* ssleay-*
@@ -18,8 +18,7 @@ USE_PERL5=		yes
 RESTRICTED=		"Crypto; export-controlled"
 MIRROR_DISTFILE=	no
 # matches what's in `Configure' (except sparc64)
-ONLY_FOR_ARCHS=		alpha arm32 i386 m68k mips mipse[bl] ns32k powerpc \
-			sparc vax
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,arm32,i386,m68k,mips,mipse[bl],ns32k,powerpc,sparc,vax}
 
 CONFIGURE_ARGS=		-fPIC -DPIC ${LDFLAGS}
 #CONFIGURE_ENV=		PREFIX=${PREFIX}
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index 3fac0406884..296deadd698 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/24 16:52:18 agc Exp $
+# $NetBSD: Makefile,v 1.2 1999/05/24 20:39:48 tv Exp $
 #
 
 DISTNAME=		rc5-mlg-004
@@ -9,7 +9,7 @@ MASTER_SITES=		http://www.flame.org/netbsd-rc5/
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://rc5.distributed.net/
 
-ONLY_FOR_ARCHS=		alpha arm32 i386
+ONLY_FOR_PLATFORM=	NetBSD-*-{alpha,arm32,i386}
 
 RESTRICTED=		"Crypto; export-controlled"
 MIRROR_DISTFILE=	no
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index 71dceb21d2c..94387dd667a 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.9 1998/09/22 06:11:40 garbled Exp $
+# $NetBSD: Makefile,v 1.10 1999/05/24 20:39:48 tv Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp 
 #
 
-DISTNAME=	scsh-0.5.1
-CATEGORIES=	shells lang
-MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
+DISTNAME=		scsh-0.5.1
+CATEGORIES=		shells lang
+MASTER_SITES=		ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/
 
-NOT_FOR_ARCHS=	alpha	# Needs scheme
+NOT_FOR_PLATFORM=	*-*-alpha	# Needs scheme
 
-MAINTAINER= 	packages@netbsd.org
-HOMEPAGE=	http://www-swiss.ai.mit.edu/scsh/
+MAINTAINER= 		packages@netbsd.org
+HOMEPAGE=		http://www-swiss.ai.mit.edu/scsh/
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
-ALL_TARGET=	enough
-MAKE_ENV+=	INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
-		INSTALL_SCRIPT='${INSTALL_SCRIPT}' \
-		INSTALL_DATA='${INSTALL_DATA}'
+ALL_TARGET=		enough
+MAKE_ENV=		INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
+			INSTALL_SCRIPT='${INSTALL_SCRIPT}' \
+			INSTALL_DATA='${INSTALL_DATA}'
 
 post-configure:
 	cd ${WRKSRC}; ${SED} -e '/LIBGEN/d' sysdep.h >xx ; ${MV} xx sysdep.h
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 85baecb4091..da61ab142e2 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.3 1999/04/12 17:39:46 jlam Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/24 20:39:48 tv Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
-DISTNAME=	asapm-2.6
-CATEGORIES=	sysutils x11
-MASTER_SITES=	http://www.tigr.net/afterstep/as-apps/download/asapm/ \
-		ftp://ftp.afterstep.org/apps/asapm/ \
-		ftp://fuf.sh.cvut.cz/pub/AfterStep/apps/asapm/
+DISTNAME=		asapm-2.6
+CATEGORIES=		sysutils x11
+MASTER_SITES=		http://www.tigr.net/afterstep/as-apps/download/asapm/ \
+			ftp://ftp.afterstep.org/apps/asapm/ \
+			ftp://fuf.sh.cvut.cz/pub/AfterStep/apps/asapm/
 
-MAINTAINER=	lamj@stat.cmu.edu
-HOMEPAGE=	http://www.tigr.net/afterstep/as-apps/applet-list.html
+MAINTAINER=		lamj@stat.cmu.edu
+HOMEPAGE=		http://www.tigr.net/afterstep/as-apps/applet-list.html
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
+DEPENDS=		xpm-3.4k:../../graphics/xpm
 
-ONLY_FOR_ARCHS=	i386		# needs apm support
+ONLY_FOR_PLATFORM=	*-*-i386	# needs apm support
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 84a559d2a0c..fa442e4422c 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.9 1998/11/19 15:40:47 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/05/24 20:39:48 tv Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/04/27 00:11:48 asami Exp
 #
 
-DISTNAME=	unroff-1.0
-PKGNAME=	unroff-1.0.2
-CATEGORIES=	textproc
-MASTER_SITES=	${UNROFF_SITE}/dist/ \
-		${UNROFF_SITE}/contrib/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PATCH1} ${PATCH2}
+DISTNAME=		unroff-1.0
+PKGNAME=		unroff-1.0.2
+CATEGORIES=		textproc
+MASTER_SITES=		${UNROFF_SITE}/dist/ \
+			${UNROFF_SITE}/contrib/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${PATCH1} ${PATCH2}
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www-rn.informatik.uni-bremen.de/software/unroff/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www-rn.informatik.uni-bremen.de/software/unroff/
 
-DEPENDS+=	elk-3.0.2:../../lang/elk
+DEPENDS=		elk-3.0.2:../../lang/elk
 
-NOT_FOR_ARCHS=	alpha	#needs elk
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=		unroff
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR=	unroff
-
-UNROFF_SITE=	http://www-rn.informatik.uni-bremen.de/software/unroff
-PATCH1=		me-misc-patch
-PATCH2=		misc-patch-2
+UNROFF_SITE=		http://www-rn.informatik.uni-bremen.de/software/unroff
+PATCH1=			me-misc-patch
+PATCH2=			misc-patch-2
 
 pre-patch:
 	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME}"
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index f463bade70e..e8ab1458372 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.11 1999/05/23 07:50:05 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/05/24 20:39:49 tv Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
 #
 
-DISTNAME=       Mosaic-src-2.7b5
-PKGNAME=        mosaic-2.7b5
-WRKSRC=		${WRKDIR}/Mosaic-src
-CATEGORIES=     www
-MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
+DISTNAME=		Mosaic-src-2.7b5
+PKGNAME=		mosaic-2.7b5
+WRKSRC=			${WRKDIR}/Mosaic-src
+CATEGORIES=		www
+MASTER_SITES=		ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/
+MAINTAINER=		tv@netbsd.org
+HOMEPAGE=		http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/
 
-DEPENDS=	jpeg-6b:../../graphics/jpeg \
-		png-1.0.3:../../graphics/png \
-		xpm-3.4k:../../graphics/xpm
+DEPENDS=		jpeg-6b:../../graphics/jpeg \
+			png-1.0.3:../../graphics/png \
+			xpm-3.4k:../../graphics/xpm
 
-NOT_FOR_ARCHS=	alpha	#LP64 problems
+NOT_FOR_PLATFORM=	*-*-alpha	#LP64 problems
 
-USE_X11BASE=	yes
-USE_MOTIF=	yes
+USE_X11BASE=		yes
+USE_MOTIF=		yes
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
-LDFLAGS+=	-L${X11BASE}/lib
+LDFLAGS+=		-L${X11BASE}/lib
 
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -Dunix"
-CONFIGURE_ARGS=	--with-zdir=/usr --with-jpegdir=${LOCALBASE} --with-pngdir=${LOCALBASE}
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -Dunix"
+CONFIGURE_ARGS=		--with-zdir=/usr --with-jpegdir=${LOCALBASE} --with-pngdir=${LOCALBASE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/Mosaic ${PREFIX}/bin
diff --git a/www/arena/Makefile b/www/arena/Makefile
index ca23ea1f48c..9b11c12e5e3 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,32 +1,32 @@
-# $NetBSD: Makefile,v 1.12 1999/03/20 00:48:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 1999/05/24 20:39:49 tv Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
 #
 
-DISTNAME=	arena-0.3.61
-WRKSRC=		${WRKDIR}/Arena-0.3.61
-CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/web/arena/
+DISTNAME=		arena-0.3.61
+WRKSRC=			${WRKDIR}/Arena-0.3.61
+CATEGORIES=		www
+MASTER_SITES=		ftp://ftp.yggdrasil.com/pub/dist/web/arena/
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://www.yggdrasil.com/Products/Arena/
+MAINTAINER=		tv@netbsd.org
+HOMEPAGE=		http://www.yggdrasil.com/Products/Arena/
 
-DEPENDS=	libwww-5.1m1:../../www/libwww \
-		jpeg-6b:../../graphics/jpeg \
-		png-1.0.3:../../graphics/png \
-		xpm-3.4k:../../graphics/xpm
+DEPENDS=		libwww-5.1m1:../../www/libwww \
+			jpeg-6b:../../graphics/jpeg \
+			png-1.0.3:../../graphics/png \
+			xpm-3.4k:../../graphics/xpm
 
-NOT_FOR_ARCHS=	alpha	#Runs, displays black screen
+NOT_FOR_PLATFORM=	*-*-alpha	#Runs, displays black screen
 
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
-USE_GMAKE=	yes
-MAKEFILE=	makefile
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
+LDFLAGS+=		-L${LOCALBASE}/lib -L${X11BASE}/lib
+USE_GMAKE=		yes
+MAKEFILE=		makefile
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--with-libwww-include=${LOCALBASE}/include/w3c-libwww
 CONFIGURE_ARGS+=	--with-libwww-libdir=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-libwww-config-h-dir=${LOCALBASE}/include/w3c-libwww
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${WRKDIR}"
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -I${WRKDIR}"
 
 # Arena requires libwww's "config.h" header - it is installed as "wwwconf.h",
 # so make a symlink in ${WRKDIR} and add it to the -I list.
diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index de9d4777de8..e2a0d116c3a 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/04/23 12:33:20 kleink Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/24 20:39:49 tv Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -24,7 +24,7 @@ MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/4.51/${SUB}/ \
 		ftp://sunsite.utk.edu/pub/netscape/communicator/4.51/${SUB}/ \
 		ftp://ftp-uk.netscape.com/pub/communicator/4.51/${SUB}/ \
 		ftp.informatik.rwth-aachen.de:/pub/mirror/ftp.netscape.com/pub/communicator/4.51/${SUB}/
-ONLY_FOR_ARCHS=	i386 sparc
+ONLY_FOR_PLATFORM=	*-*-{i386,sparc}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://home.netscape.com/browsers/index.html
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index df8ce56cbc3..011cb1df37f 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.4 1998/11/13 01:50:22 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:49 tv Exp $
 #
 
-DISTNAME=	${PKGNAME}-source
-PKGNAME=	htmldoc-1.4
-WRKSRC=		${WRKDIR}/${PKGNAME}
-CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.easysw.com/pub/htmldoc/
+DISTNAME=		${PKGNAME}-source
+PKGNAME=		htmldoc-1.4
+WRKSRC=			${WRKDIR}/${PKGNAME}
+CATEGORIES=		www
+MASTER_SITES=		ftp://ftp.easysw.com/pub/htmldoc/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.easysw.com/~mike/htmldoc/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.easysw.com/~mike/htmldoc/
 
-NOT_FOR_ARCHS=	alpha	#ps-pdf.cpp:3229: Internal compiler error.
+NOT_FOR_PLATFORM=	*-*-alpha	#ps-pdf.cpp:3229: Internal compiler error.
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-x
-MAKE_ENV+=	BINDIR=${PREFIX}/bin \
-		MANDIR=${PREFIX}/man
+MAKE_ENV+=		BINDIR=${PREFIX}/bin \
+			MANDIR=${PREFIX}/man
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/htmldoc ${PREFIX}/bin
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index e03a402e3a9..9fd393f7ec3 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/04/23 12:33:20 kleink Exp $
+# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:49 tv Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -23,7 +23,7 @@ SUB=		english/unix/unsupported/${UNAME_SHORT}/navigator_standalone
 MASTER_SITES=	ftp://ftp.netscape.org/pub/communicator/4.51/${SUB}/ \
 		ftp://sunsite.utk.edu/pub/netscape/communicator/4.51/${SUB}/ \
 		ftp://ftp-uk.netscape.com/pub/communicator/${SUB}/
-ONLY_FOR_ARCHS=	i386 sparc
+ONLY_FOR_PLATFORM=	*-*-{i386,sparc}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://home.netscape.com/browsers/index.html
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 8ba159f860b..30248c73a6c 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.7 1999/04/27 20:33:57 tron Exp $
+# $NetBSD: Makefile,v 1.8 1999/05/24 20:39:49 tv Exp $
 
-DISTNAME=	XF86Setup-3.3.3.1a
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	.tar.bz2
-ONLY_FOR_ARCHS=	i386
+DISTNAME=		XF86Setup-3.3.3.1a
+CATEGORIES=		x11
+MASTER_SITES=		${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=		.tar.bz2
+ONLY_FOR_PLATFORM=	*-*-i386
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.xfree86.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.xfree86.org/
 
-BUILD_DEPENDS+= ${TCLLIB}:../../lang/tcl80 \
-		${TKLIB}:../../x11/tk80
+BUILD_DEPENDS= 		${TCLLIB}:../../lang/tcl80 \
+			${TKLIB}:../../x11/tk80
 
-TCLLIB=		${LOCALBASE}/lib/libtcl80.a
-TKLIB=		${LOCALBASE}/lib/libtk80.a
+TCLLIB=			${LOCALBASE}/lib/libtcl80.a
+TKLIB=			${LOCALBASE}/lib/libtk80.a
 
-MIRROR_DISTFILE= no
-WRKSRC=		${WRKDIR}/hw/xfree86/XF86Setup
-USE_IMAKE=	yes
+MIRROR_DISTFILE=	no
+WRKSRC=			${WRKDIR}/hw/xfree86/XF86Setup
+USE_IMAKE=		yes
 
 pre-configure:
 	@touch ${WRKSRC}/res_cpp_symbol
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 89420541163..7a9a1d1b83a 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.6 1999/05/02 15:15:49 rh Exp $
+# $NetBSD: Makefile,v 1.7 1999/05/24 20:39:50 tv Exp $
 #
 
-DISTNAME=	control-center-1.0.5
-CATEGORIES=	x11 gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ \
-		ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/control-center/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+DISTNAME=		control-center-1.0.5
+CATEGORIES=		x11 gnome
+MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
+			ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ \
+			ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/control-center/ \
+			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	gnome-core-1.0.5:../../x11/gnome-core
-DEPENDS+=	xscreensaver-3.10:../../x11/xscreensaver
+DEPENDS=		gnome-core-1.0.5:../../x11/gnome-core \
+			xscreensaver-3.10:../../x11/xscreensaver
 
-NOT_FOR_ARCHS=	alpha	# problems with gtk
+GNU_CONFIGURE=		yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-
-LOCALSTATEDIR=	/var/gnome
+LOCALSTATEDIR=		/var/gnome
 
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index d73ee00b66d..654551a5702 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,28 +1,28 @@
-# $NetBSD: Makefile,v 1.18 1999/05/20 20:09:53 tron Exp $
+# $NetBSD: Makefile,v 1.19 1999/05/24 20:39:50 tv Exp $
 #
 
-DISTNAME=	gnome-core-1.0.5
-CATEGORIES=	x11 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=		gnome-core-1.0.5
+CATEGORIES=		x11 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=	tron@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	esound-0.2.8:../../audio/esound
-DEPENDS+=	gnome-libs-1.0.9:../../x11/gnome-libs
+DEPENDS+=		esound-0.2.8:../../audio/esound
+DEPENDS+=		gnome-libs-1.0.9:../../x11/gnome-libs
 # "libgtop" packages is broken at the moment.
-#DEPENDS+=	libgtop-1.0.1:../../devel/libgtop
+#DEPENDS+=		libgtop-1.0.1:../../devel/libgtop
 
-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=		yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 
-LOCALSTATEDIR=	/var/gnome
+LOCALSTATEDIR=		/var/gnome
 
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 716545145c6..f6c7207d19a 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.24 1999/05/20 20:09:52 tron Exp $
+# $NetBSD: Makefile,v 1.25 1999/05/24 20:39:50 tv Exp $
 #
 
-DISTNAME=	gnome-libs-1.0.9
-CATEGORIES=	x11 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=		gnome-libs-1.0.9
+CATEGORIES=		x11 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=	tron@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	ORBit-0.4.3:../../corba/ORBit
-DEPENDS+=	imlib-1.9.4:../../graphics/imlib
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
+DEPENDS+=		ORBit-0.4.3:../../corba/ORBit
+DEPENDS+=		imlib-1.9.4:../../graphics/imlib
+DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-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=		yes
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 LDFLAGS+=       	"-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
@@ -27,9 +27,9 @@ CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE}
 
-LOCALSTATEDIR=	/var/gnome
+LOCALSTATEDIR=		/var/gnome
 
-PLIST_SRC=	${WRKDIR}/PLIST
+PLIST_SRC=		${WRKDIR}/PLIST
 
 pre-build:
 	(cd ${WRKSRC}/support; ${GMAKE} gnomesupport.h)
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index c43d75849f6..49abf61d6da 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/04/15 20:39:50 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/05/24 20:39:50 tv Exp $
 #
 
 DISTNAME=	bxform-088
@@ -20,7 +20,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lamj@stat.cmu.edu
 HOMEPAGE=	http://bragg.phys.uwm.edu/xforms/
 
-ONLY_FOR_ARCHS=	arm32 i386 m68k sparc ns32k
+ONLY_FOR_PLATFORM=	*-*-{arm32,i386,m68k,sparc,ns32k}
 
 DIST_SUBDIR=	xforms/${ARCH_SUBDIR}