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

pattern match format.  Minor pkglint along the way.

9 files changed, 85 insertions, 89 deletions

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"