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

pattern match format.  Minor pkglint along the way.

8 files changed, 137 insertions, 135 deletions

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}