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

pattern match format.  Minor pkglint along the way.

5 files changed, 52 insertions, 52 deletions

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