Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENT

block). Uncomment some commented out LICENSE lines while here.

9 files changed, 26 insertions, 30 deletions

diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index 9588b2ac132..ff01a2b6367 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/05/19 08:59:13 wiz Exp $
 
 DISTNAME=	dn9b0401
 CATEGORIES=	emulators
@@ -6,7 +6,6 @@ MASTER_SITES=	http://www.dridus.com/~nyef/darcnes/download/
 EXTRACT_SUFX=	.tgz
 
 HOMEPAGE=	http://www.dridus.com/~nyef/darcnes/
-
 LICENSE=	no-commercial-use
 
 WRKSRC=		${WRKDIR}/darcnes
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 891d01221cd..739d65f286a 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/09/02 12:06:18 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:13 wiz Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -12,6 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://www.palmos.com/dev/tools/emulator/
 COMMENT=	Palm OS Emulator
+#LICENSE=       GPL
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -22,8 +23,6 @@ DIST_SUBDIR=	${PKGBASE}
 # Source is under sources/ directory, skins are not...
 SITES.emulator-skins-19.tar.gz=	http://www.palmos.com/dev/tools/emulator/
 
-#LICENSE=       GPL
-
 WRKSRC=		${WRKDIR}/Emulator_Src_${POSE_VERSION}
 POSE_BUILD_DIR=	${WRKSRC}/BuildUnix
 POSE_SHARE_DIR=	${PREFIX}/share/palmosemulator
diff --git a/emulators/sdlmame/Makefile.common b/emulators/sdlmame/Makefile.common
index f54787505fb..3ed9d6146a1 100644
--- a/emulators/sdlmame/Makefile.common
+++ b/emulators/sdlmame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2009/01/18 16:02:17 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/05/19 08:59:13 wiz Exp $
 #
 # used by emulators/sdlmess/Makefile
 
@@ -9,16 +9,16 @@ EXTRACT_SUFX=		.zip
 
 MAINTAINER=		dillo@NetBSD.org
 HOMEPAGE=		http://rbelmont.mameworld.info/?page_id=163
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+LICENSE=		mame-license
 
 RESTRICTED=		selling is not allowed
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake pkg-config
 UNLIMIT_RESOURCES+=	datasize
-LICENSE=		mame-license
 
 .if ${MACHINE_ARCH:Mi386}
 MAKE_FLAGS+=	X86_MIPS3_DRC=1
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 53433a47244..7acff4c30d4 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2009/04/28 21:19:00 zafer Exp $
+# $NetBSD: Makefile,v 1.39 2009/05/19 08:59:13 wiz Exp $
 
 DISTNAME=	spim-7.3
 CATEGORIES=	emulators
@@ -7,16 +7,16 @@ MASTER_SITES=	http://pages.cs.wisc.edu/~larus/SPIM/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pages.cs.wisc.edu/~larus/spim.html
 COMMENT=	MIPS R2000 Simulator
+LICENSE=	spim-license
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-LICENSE=		spim-license
 RESTRICTED=		No permission to copy, and prohibited commercially.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 HAS_CONFIGURE=		yes
 CONFIGURE_DIRS=		xspim
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index 2b53a062bbc..b3d4a35323d 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/03 19:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:13 wiz Exp $
 
 DISTNAME=	VMware-2.0.4-1142
 PKGNAME=	vmware-2.0.4
@@ -16,11 +16,10 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.vmware.com/
 COMMENT=	VMware 2.x emulator
+LICENSE=	vmware-license
 
 DEPENDS+=	vmware-module-1.*:../../emulators/vmware-module
 
-LICENSE=	vmware-license
-
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	vmware
 
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 5b2c97496fe..3601a56d77e 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/03 19:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:13 wiz Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
@@ -17,11 +17,10 @@ SITES.${VMWARE_BIN_PATCH}.tar.gz=	ftp://ftp.cvut.cz/vmware/obsolete/
 MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://www.vmware.com/
 COMMENT=	VMware emulator 3.x
+LICENSE=	vmware-license
 
 DEPENDS+=	vmware-module>=3.2.1.8:../../emulators/vmware-module3
 
-LICENSE=	vmware-license
-
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	vmware
 EMUL_REQD=		suse>=6.4nb1
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 07a6c1575d1..7e372d4fe61 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/09/10 00:33:59 gdt Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:13 wiz Exp $
 #
 
 DISTNAME=		xm71010s
@@ -11,19 +11,19 @@ EXTRACT_SUFX=		.lzh
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml
 COMMENT=		X11-based FM-7 emulator
-
-BUILD_DEPENDS+=		nkf>=1.7:../../converters/nkf
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-NOT_FOR_BULK_PLATFORM=	Linux-*-*
-
 LICENSE=		xm7-license
+
 RESTRICTED=		source archive is not redistributable
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+BUILD_DEPENDS+=		nkf>=1.7:../../converters/nkf
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+NOT_FOR_BULK_PLATFORM=	Linux-*-*
+
 EXTRACT_OPTS_LHA=	qt	# convert CRLF to LF
 
 WRKSRC=			${WRKDIR}/vm
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 74c7679c40a..bd46aee646a 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2009/01/18 16:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.154 2009/05/19 08:59:13 wiz Exp $
 #
 
 DISTNAME=		xmame-0.106
@@ -9,8 +9,8 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://x.mame.net/
 COMMENT=		X11 emulator for old arcade machines
-
 LICENSE=		mame-license
+
 RESTRICTED=		selling is not allowed
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 2e460879aa3..0a066693293 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/01/18 16:05:03 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:13 wiz Exp $
 #
 
 DISTNAME=		xmame-0.106
@@ -10,8 +10,8 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://x.mame.net/
 COMMENT=		X11 emulator for old computers and console machines
-
 LICENSE=		mame-license
+
 RESTRICTED=		selling is not allowed
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}