Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages.

Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.

36 files changed, 88 insertions, 75 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index b99c3d648f6..6f0b3b5dd87 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/02 01:20:01 jschauma Exp $
 #
 
 DISTNAME=	BasiliskII_src_31052001
@@ -8,7 +8,7 @@ WRKSRC=		${WRKDIR}/BasiliskII-0.9/src/Unix
 CATEGORIES=	emulators
 MASTER_SITES=	http://iphcip1.physik.uni-mainz.de/~cbauer/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.uni-mainz.de/~bauec002/B2Main.html
 COMMENT=	Open Source 68k Macintosh emulator
 
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index e735fd7c470..383c8e76aef 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/03/14 19:37:37 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/06/02 01:20:01 jschauma Exp $
 #
 
 DISTNAME=	atari800-1.2.5
@@ -7,7 +7,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atari800/}
 DISTFILES=	atari800-1.2.5.tar.gz xf25.zip
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://atari800.atari.org
 COMMENT=	Atari 8-bit computer, 5200 console emulator
 
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 7b952d915aa..70fe6ea729c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2003/02/07 04:00:33 fredb Exp $
+# $NetBSD: Makefile,v 1.27 2003/06/02 01:20:01 jschauma Exp $
 
 DISTNAME=		bochs-2.0.2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://bochs.sourceforge.net/
 COMMENT=		i386 machine emulator capable of running DOS/Windows
 
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index 491bad2b6b7..dde7c8d8c7d 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/17 18:38:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/02 01:20:00 jschauma Exp $
 #
 
 DISTNAME=		compat12-${MACHINE_ARCH}
@@ -6,7 +6,7 @@ PKGNAME=		compat12-1.2.1
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.2/index.html
 COMMENT=		Shared libraries for NetBSD 1.2 (and earlier) compatibility
 
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index cbb0281707d..956a19ee132 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/05/24 11:47:53 taca Exp $
+# $NetBSD: Makefile,v 1.13 2003/06/02 01:20:00 jschauma Exp $
 #
 
 DISTNAME=		compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -6,7 +6,7 @@ PKGNAME=		compat13-1.3.3${PKGMINOR}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.3/index.html
 COMMENT=		Shared libraries for NetBSD 1.3 (and earlier) compatibility
 
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
index 222c75a777f..b350337da13 100644
--- a/emulators/compat14-crypto/Makefile
+++ b/emulators/compat14-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/13 03:15:24 jdarrow Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/02 01:20:00 jschauma Exp $
 #
 
 DISTNAME=		compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -6,7 +6,7 @@ PKGNAME=		compat14-crypto-${VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.4/index.html
 COMMENT=		Shared libraries for NetBSD 1.4 (and earlier) compatibility
 
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 18712526ff2..899eb353f93 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/13 02:53:26 jdarrow Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:59 jschauma Exp $
 #
 
 DISTNAME=		compat14-${MACHINE_ARCH}-${VERSION}
@@ -6,7 +6,7 @@ PKGNAME=		compat14-${VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.4/index.html
 COMMENT=		Shared libraries for NetBSD 1.4 (and earlier) compatibility
 
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index 17985e71150..5e80667a7ea 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/02 01:19:59 jschauma Exp $
 #
 
 DISTNAME=		doscmd-19960502-2
@@ -7,7 +7,7 @@ WRKSRC=			${WRKDIR}/doscmd
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/arch/i386/doscmd/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 COMMENT=		MS-DOS emulator (NetBSD/i386 only)
 
 # mmap() portability (no MAP_FIXED), and objcopy problems on NetBSD-1.6-i386 and later
diff --git a/emulators/freebsd_lib/Makefile b/emulators/freebsd_lib/Makefile
index cd130f4e37e..07c1f7b836c 100644
--- a/emulators/freebsd_lib/Makefile
+++ b/emulators/freebsd_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/05/05 17:41:32 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/06/02 01:19:59 jschauma Exp $
 #
 
 DISTNAME=		freebsd_lib-2.2.7
@@ -7,7 +7,7 @@ WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.flame.org/NetBSD/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 COMMENT=		libraries necessary for FreeBSD compatibility, including XFree86
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 01b0395bc37..c2b5b3086e4 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/05/02 11:54:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/02 01:19:59 jschauma Exp $
 #
 
 DISTNAME=	generator-0.34
@@ -6,7 +6,7 @@ PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.squish.net/generator/files/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.sqish.net/generator/
 COMMENT=	Sega Mega drive genesis emulator
 
diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile
index 53b9ccf00d6..036fd7c377d 100644
--- a/emulators/hercules-images/Makefile
+++ b/emulators/hercules-images/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/04/10 20:10:16 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/02 01:19:58 jschauma Exp $
 
 DISTNAME=		mftr33
 PKGNAME=		hercules-images-20010222
@@ -6,7 +6,7 @@ WRKSRC=			${WRKDIR}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.conmicro.cx/hercules/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.conmicro.cx/hercules/
 COMMENT=		Images to IPL the Hercules emulator
 
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 60a23a65807..9687c78fe3e 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2002/02/06 16:58:14 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/02 01:19:58 jschauma Exp $
 
 DISTNAME=		hercules-2.11
 PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.conmicro.cx/hercules/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.conmicro.cx/hercules/
 COMMENT=		s370 emulator
 
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 336f6e2e216..d90fe2d563b 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/20 11:33:52 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:58 jschauma Exp $
 
 DISTNAME=		ia64sim
 PKGNAME=		ia64sim-0.3
@@ -6,7 +6,7 @@ CATEGORIES=		emulators
 MASTER_SITES=		http://www.glue.umd.edu/~jasonp/
 EXTRACT_SUFX=		.zip
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.glue.umd.edu/~jasonp/
 COMMENT=		IA64 simulator (Intel(R) Architecture 64)
 
diff --git a/emulators/mmix/Makefile b/emulators/mmix/Makefile
index 6bd01540136..889a8d4a6dc 100644
--- a/emulators/mmix/Makefile
+++ b/emulators/mmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/06/02 01:19:58 jschauma Exp $
 
 DISTNAME=	mmix
 PKGNAME=	mmix-20020615
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators devel lang
 MASTER_SITES=	http://www-cs-faculty.stanford.edu/~knuth/programs/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www-cs-faculty.stanford.edu/~knuth/mmix.html
 COMMENT=	Simulators for Knuth's MMIX RISC architecture
 
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index b9bdaa67b11..83b842475f8 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/13 03:06:10 jdarrow Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:57 jschauma Exp $
 #
 
 DISTNAME=		compat14-${MACHINE32_ARCH}-${VERSION}
@@ -6,7 +6,7 @@ PKGNAME=		netbsd32_compat14-${VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.4/index.html
 COMMENT=		32-bit shared libraries for NetBSD 1.4 (and earlier) compatibility
 
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index 36a758adad8..6e5f84fb317 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/11/08 16:43:34 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/02 01:19:57 jschauma Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -12,7 +12,7 @@ PKGNAME=		netbsd32_compat15-1.0
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.5/index.html
 COMMENT=		32-bit shared libraries for NetBSD 1.5 (and earlier) compatibility
 
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index 4040788f6a8..0a79639f2e7 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/05/05 17:48:33 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/02 01:19:56 jschauma Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -13,7 +13,7 @@ CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.6/index.html
 COMMENT=		32-bit shared libraries for NetBSD 1.6 (and earlier) compatibility
 
diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile
index 194c007ca7a..b2e7ae6c001 100644
--- a/emulators/p11/Makefile
+++ b/emulators/p11/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/16 16:09:22 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/02 01:19:56 jschauma Exp $
 #
 
 DISTNAME=	p11-2.10a
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/cats/usr/harti/p11/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 #HOMEPAGE=	
 COMMENT=	PDP11 emulator
 
diff --git a/emulators/rewind/Makefile b/emulators/rewind/Makefile
index a0670bfb1ee..64119c9f7f0 100644
--- a/emulators/rewind/Makefile
+++ b/emulators/rewind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/03/09 19:12:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:56 jschauma Exp $
 
 DISTNAME=		rewind-20020420
 PKGREVISION=		2
@@ -6,7 +6,7 @@ CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://rewind.sourceforge.net/
 COMMENT=		BSD/X11 licenced fork of Wine (Windows on Unix)
 
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 4762dda5e49..baf9a4a8f02 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/05/31 16:10:52 thorpej Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/02 01:19:56 jschauma Exp $
 #
 
 DISTNAME=	simhv210-4
@@ -10,7 +10,7 @@ MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://simh.trailing-edge.com/
 COMMENT=	Bob Supnik's historical computer simulator
 
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 59b41fcdae2..6d2afe0226d 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/05/05 17:54:35 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/02 01:19:55 jschauma Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
@@ -6,7 +6,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME}/src/build
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://stella.atari.org/
 COMMENT=	Multi-platform Atari 2600 VCS emulator
 
diff --git a/emulators/suse64_audio/Makefile b/emulators/suse64_audio/Makefile
index 02725161c40..cdf6c1ce250 100644
--- a/emulators/suse64_audio/Makefile
+++ b/emulators/suse64_audio/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/02 01:19:55 jschauma Exp $
 
 DISTNAME=		suse_audio-${SUSE_VERSION}
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=snd1/}
 DISTFILES=		${RPMFILES}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for audio libraries
 
diff --git a/emulators/suse64_devel/Makefile b/emulators/suse64_devel/Makefile
index 2085e97cc3f..5fe510507be 100644
--- a/emulators/suse64_devel/Makefile
+++ b/emulators/suse64_devel/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/03/26 04:05:50 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/02 01:19:55 jschauma Exp $
 
 DISTNAME=		suse_devel-${SUSE_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=d1/} \
 			${MASTER_SITE_SUSE:=d2/}
 DISTFILES=		${RPMFILES}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package - development tools
 
diff --git a/emulators/suse64_glx/Makefile b/emulators/suse64_glx/Makefile
index 5631adc3475..65de769f8af 100644
--- a/emulators/suse64_glx/Makefile
+++ b/emulators/suse64_glx/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2003/03/28 04:24:10 atatat Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/02 01:19:54 jschauma Exp $
 
 DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.suse.com/pub/suse/discontinued/i386/update/${SUSE_VERSION}/x3d1/
 DISTFILES=		${RPMFILES}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for GLX binaries
 
@@ -21,4 +21,12 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 RPMFILES=		glx-000229-53.i386.rpm
 
 .include "../suse64_linux/Makefile.common"
+<<<<<<< Makefile
+<<<<<<< Makefile
 .include "../../mk/bsd.pkg.mk"
+=======
+.include "../../mk.bsd.pkg.mk"
+>>>>>>> 1.4
+=======
+.include "../../mk/bsd.pkg.mk"
+>>>>>>> 1.5
diff --git a/emulators/suse64_gtk/Makefile b/emulators/suse64_gtk/Makefile
index 3cc0f16fc37..34ec00bbacd 100644
--- a/emulators/suse64_gtk/Makefile
+++ b/emulators/suse64_gtk/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:50 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/02 01:19:54 jschauma Exp $
 
 DISTNAME=		suse_gtk-${SUSE_VERSION}
+PKGREVISION=		1
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=gra1/}
 DISTFILES=		${RPMFILES}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for GTK binaries
 
diff --git a/emulators/suse64_libc5/Makefile b/emulators/suse64_libc5/Makefile
index afb3d3b49c9..b5c221f1809 100644
--- a/emulators/suse64_libc5/Makefile
+++ b/emulators/suse64_libc5/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:50 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/02 01:19:53 jschauma Exp $
 
 DISTNAME=		shlibs5
+PKGREVISION=		1
 PKGNAME=		suse_libc5-${SUSE_VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=a1/}
 EXTRACT_SUFX=		.rpm
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for libc5 binaries
 
diff --git a/emulators/suse64_linux/Makefile b/emulators/suse64_linux/Makefile
index 01da67e954d..094e6d176a8 100644
--- a/emulators/suse64_linux/Makefile
+++ b/emulators/suse64_linux/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/04 10:07:58 tron Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/02 01:19:53 jschauma Exp $
 
 DISTNAME=		suse_linux-6.4
 CATEGORIES=		emulators
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package collection
 
diff --git a/emulators/suse64_x11/Makefile b/emulators/suse64_x11/Makefile
index 61a9c00b4f3..45af1f9bbe2 100644
--- a/emulators/suse64_x11/Makefile
+++ b/emulators/suse64_x11/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2003/03/26 04:05:49 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:53 jschauma Exp $
 
 DISTNAME=		suse_x11-${SUSE_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.suse.com/pub/suse/discontinued/i386/update/${SUSE_VERSION}/x1/ \
 			${MASTER_SITE_SUSE:=x1/}
 DISTFILES=		${RPMFILES}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for X11 binaries
 
diff --git a/emulators/suse64_xforms/Makefile b/emulators/suse64_xforms/Makefile
index 93a0f8d6d6e..4dfa824b5df 100644
--- a/emulators/suse64_xforms/Makefile
+++ b/emulators/suse64_xforms/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2003/03/26 04:05:49 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/02 01:19:52 jschauma Exp $
 
 DISTNAME=		xforms
+PKGREVISION=		1
 PKGNAME=		suse_xforms-${SUSE_VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=pay1/}
 EXTRACT_SUFX=		.rpm
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for xforms binaries
 
diff --git a/emulators/suse_freetype2/Makefile b/emulators/suse_freetype2/Makefile
index f1747b9be07..a507092b892 100644
--- a/emulators/suse_freetype2/Makefile
+++ b/emulators/suse_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/05/30 15:40:47 taca Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/02 01:19:52 jschauma Exp $
 
 DISTNAME=		freetype2
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -8,7 +8,7 @@ MASTER_SITES=		${MASTER_SITE_SUSE:=gra1/} \
                         ${MASTER_SITE_SUSE_UPD:=gra1/}
 DISTFILES=		${RPMFILES}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for the FreeType2 library
 
diff --git a/emulators/suse_libtiff/Makefile b/emulators/suse_libtiff/Makefile
index 14bb86f5966..900874d3626 100644
--- a/emulators/suse_libtiff/Makefile
+++ b/emulators/suse_libtiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/19 07:12:18 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/02 01:19:52 jschauma Exp $
 
 DISTNAME=		libtiff
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -6,7 +6,7 @@ CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=gra1/}
 EXTRACT_SUFX=		.rpm
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for the TIFF library
 
diff --git a/emulators/suse_slang/Makefile b/emulators/suse_slang/Makefile
index b87011f72cf..c703446a08f 100644
--- a/emulators/suse_slang/Makefile
+++ b/emulators/suse_slang/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2003/03/26 04:05:46 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/02 01:19:52 jschauma Exp $
 
 DISTNAME=		slang
+PKGREVISION=		1
 PKGNAME=		suse_slang-${SUSE_VERSION}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE:=d1/}
 EXTRACT_SUFX=		.rpm
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.suse.com/
 COMMENT=		Linux compatibility package for slang library
 
diff --git a/emulators/vmware-module3/Makefile b/emulators/vmware-module3/Makefile
index e03f36c703e..6b4ebaaa4ed 100644
--- a/emulators/vmware-module3/Makefile
+++ b/emulators/vmware-module3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/05/05 17:57:35 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/02 01:19:51 jschauma Exp $
 
 DISTNAME=	vmware-netbsd-3.2.2
 PKGNAME=	vmware-module-3.2.2
@@ -7,7 +7,7 @@ CATEGORIES=	emulators
 MASTER_SITES=   ftp://ftp.netbsd.org/pub/NetBSD/misc/vmware/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.wasabisystems.com/
 COMMENT=	Kernel modules for the VMware 3.x emulator
 
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index fa7b46c520b..8b965f16d14 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/05/05 18:07:42 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:51 jschauma Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2237
 PKGNAME=	vmware-3.2.1
@@ -13,7 +13,7 @@ MASTER_SITES=   http://www4.vmware.com/software/ \
 		ftp://vmware.wespe.de/pub/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.vmware.com/
 COMMENT=	VMware emulator 3.x
 
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index a00d437be1d..05f1b64f834 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/05/05 18:24:11 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:51 jschauma Exp $
 #
 
 DISTNAME=	x48_041
@@ -7,7 +7,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	emulators
 MASTER_SITES=	http://home.earthlink.net/~rmmlgetz/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://home.earthlink.net/~rmmlgetz/
 COMMENT=	HP48 emulator
 
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index a88960ab641..c62fb89a7ac 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/05/05 19:05:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/06/02 01:19:51 jschauma Exp $
 #
 
 DISTNAME=		zsnes136src
@@ -8,7 +8,7 @@ WRKSRC=			${WRKDIR}/zsnes-1.36/src
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zsnes/}
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.zsnes.com/sourceforge.php
 COMMENT=		Super NES emulator