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

pattern match format.  Minor pkglint along the way.

3 files changed, 60 insertions, 67 deletions

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