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

pattern match format.  Minor pkglint along the way.

5 files changed, 68 insertions, 70 deletions

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}