Some more pkglint stuff.

5 files changed, 15 insertions, 11 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index af20cde1a09..cf359a117f0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:16:53 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1998/11/12 23:20:09 frueauf Exp $
 
 DISTNAME=		Wine-980614
 PKGNAME=		wine-980614
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -10,14 +11,13 @@ ONLY_FOR_ARCHS=		i386
 MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.winehq.com/
 
-CONFLICTS=	wine-980215
-
 DEPENDS+=       xpm-3.4k:../../graphics/xpm
 
+CONFLICTS=	wine-980215
+
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --enable-dll
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.example
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index ea705df6738..fe94da7fbe0 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1998/11/04 14:06:03 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 1998/11/12 23:20:09 frueauf Exp $
 #
 
 DISTNAME=		xmame-0.34b5.2
@@ -6,8 +6,6 @@ CATEGORIES=		emulators games x11
 MASTER_SITES=		ftp://drake.dit.upm.es/xmame/ftpsite/
 EXTRACT_SUFX=		.tgz
 
-NOT_FOR_ARCHS=		alpha	#gcc lossage
-
 MAINTAINER=		mycroft@NetBSD.ORG
 HOMEPAGE=		http://drake.dit.upm.es/~mame/
 
@@ -17,6 +15,8 @@ DEPENDS+=		xpm-3.4k:../../graphics/xpm
 CONFLICTS=		xmame-0.30.1 xmame-0.33b6.1 xmame-0.34b1.1 \
 			xmame-0.34b2.1 xmame-0.34b2.2
 
+NOT_FOR_ARCHS=		alpha	#gcc lossage
+
 USE_X11=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 01b502236e0..36910ec7451 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.16 1998/11/12 23:20:10 frueauf Exp $
+
 --- makefile.unix.orig	Wed Oct 21 08:20:43 1998
 +++ makefile.unix	Sun Oct 25 04:03:24 1998
 @@ -39,7 +39,7 @@
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 86854ee7ae3..e4239a8840a 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/09/22 06:11:37 garbled Exp $
+# $NetBSD: Makefile,v 1.6 1998/11/12 23:20:10 frueauf Exp $
 #
 
 DISTNAME=		unix02b4
@@ -7,8 +7,6 @@ CATEGORIES=		emulators games x11
 MASTER_SITES=		http://internetter.com/titan/mess/
 EXTRACT_SUFX=		.tgz
 
-NOT_FOR_ARCHS=		alpha	#gcc lossage
-
 MAINTAINER=		mycroft@NetBSD.ORG
 HOMEPAGE=		http://internetter.com/titan/mess/
 
@@ -17,6 +15,8 @@ DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 CONFLICTS=		xmess-0.1
 
+NOT_FOR_ARCHS=		alpha	#gcc lossage
+
 USE_X11=		yes
 USE_GMAKE=		yes
 MAKE_ENV+=		OPSYS=${OPSYS} ARCH=${ARCH} DESTDIR=${DESTDIR} \
@@ -32,7 +32,7 @@ WRKSRC=			${WRKDIR}/xmess-0.2b4.1
 
 MESSDIR=		${PREFIX}/share/xmess
 .if exists(/usr/include/machine/joystick.h)
-NETBSD_JOYSTICK=	yes 
+NETBSD_JOYSTICK=	yes
 .else
 NETBSD_JOYSTICK=	no
 .endif
diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa
index e7ebaa4ea45..729b826bc74 100644
--- a/emulators/xmess/patches/patch-aa
+++ b/emulators/xmess/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.10 1998/11/12 23:20:10 frueauf Exp $
+
 --- makefile.unix.orig	Wed Aug 26 18:40:21 1998
 +++ makefile.unix	Mon Aug 31 04:06:42 1998
 @@ -39,7 +39,7 @@