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

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

20 files changed, 49 insertions, 64 deletions

diff --git a/sysutils/bcmfw/Makefile b/sysutils/bcmfw/Makefile
index cd4be2eb3bf..01152986b26 100644
--- a/sysutils/bcmfw/Makefile
+++ b/sysutils/bcmfw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/07/28 20:07:41 plunky Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:33 wiz Exp $
 
 DISTNAME=		bcmfw-1.0
 CATEGORIES=		sysutils
@@ -10,15 +10,14 @@ SITES.bluez-firmware-1.2.tar.gz= \
 
 MAINTAINER=		plunky@rya-online.net
 COMMENT=		Broadcom 2033 Bluetooth Firmware Loader
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		bcmfw-license
 
 RESTRICTED=		No clear permission redistribute firmware
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 ONLY_FOR_PLATFORM=	NetBSD-[4-9].*-*
 
 RCD_SCRIPTS+=		bcmfw
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index c25a28400af..348c36cb5de 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/04/25 12:07:04 rh Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:33 wiz Exp $
 #
 
 DISTNAME=	burn-0.4.1
@@ -8,14 +8,13 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gsburn.sourceforge.net/
 COMMENT=	GNUstep based CD burning program
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	cdparanoia>=3.0.9.8:../../audio/cdparanoia
 DEPENDS+=	cdrtools>=1.10:../../sysutils/cdrtools
 DEPENDS+=	cdrdao>=1.1.5:../../sysutils/cdrdao
 DEPENDS+=	gworkspace-[0-9]*:../../sysutils/gworkspace
 
-LICENSE=	gnu-gpl-v2
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	YES
diff --git a/sysutils/checkperms/Makefile b/sysutils/checkperms/Makefile
index 9de41c19844..e35f21dc60d 100644
--- a/sysutils/checkperms/Makefile
+++ b/sysutils/checkperms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/02/28 11:58:49 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:33 wiz Exp $
 #
 
 DISTNAME=	checkperms-1.10
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.schlechte-software.de/checkperms/
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	http://www.schlechte-software.de/checkperms/
 COMMENT=	Check and correct file permissions
-#LICENSE=	modified-bsd
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 AUTO_MKDIRS=			yes
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 75c8771b35c..c4fdec6a6bc 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/02/16 18:46:42 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:33 wiz Exp $
 
 DISTNAME=		daemontools-0.76
 PKGREVISION=		1
@@ -9,7 +9,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://cr.yp.to/daemontools.html
 COMMENT=		Service monitoring and logging utilities by djb
-#LICENSE=		public-domain
+LICENSE=		public-domain
 
 MANPAGES=		${DISTNAME}-man-20020131.tar.gz
 SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
diff --git a/sysutils/ddrescue/Makefile b/sysutils/ddrescue/Makefile
index ff6dbf5b81c..3eb11dc79d7 100644
--- a/sysutils/ddrescue/Makefile
+++ b/sysutils/ddrescue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/28 14:08:07 obache Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:34 wiz Exp $
 
 DISTNAME=	ddrescue-1.8
 CATEGORIES=	sysutils
@@ -8,8 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	ef@math.uni-bonn.de
 HOMEPAGE=	http://www.gnu.org/software/ddrescue/ddrescue.html
 COMMENT=	GNU ddrescue is a data recovery tool
-
-#LICENSE=	gnu-gpl-v3
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/sysutils/fs-kit/Makefile b/sysutils/fs-kit/Makefile
index 40f0e4f6477..e2de6826b11 100644
--- a/sysutils/fs-kit/Makefile
+++ b/sysutils/fs-kit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/06/14 18:39:05 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:34 wiz Exp $
 
 DISTNAME=	fs-kit-0.4
 CATEGORIES=	sysutils
@@ -8,8 +8,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nobius.org/~dbg/
 COMMENT=	User-level filesystem testing kit
-
 LICENSE=	fs-kit-license
+
 RESTRICTED=		No commercial use.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/sysutils/gnome-nds-thumbnailer/Makefile b/sysutils/gnome-nds-thumbnailer/Makefile
index e20b825e8d8..b34e7977cb3 100644
--- a/sysutils/gnome-nds-thumbnailer/Makefile
+++ b/sysutils/gnome-nds-thumbnailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/13 21:48:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:34 wiz Exp $
 #
 
 DISTNAME=	gnome-nds-thumbnailer-1.2.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://download.gnome.org/sources/gnome-nds-thumbnailer/1.2/
 COMMENT=	Thumbnailer for GNOME for Nintendo DS ROMs
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index 85491a86535..a2e7ad4a4f5 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/04/18 23:54:02 rh Exp $
+# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:34 wiz Exp $
 #
 
 DISTNAME=	gworkspace-0.8.6
@@ -9,7 +9,6 @@ MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/	\
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnustep.it/enrico/gworkspace/
 COMMENT=	GNUstep Workspace manager
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index a81c64f76d4..bbe59818e5a 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/20 11:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:34 wiz Exp $
 #
 
 DISTNAME=		hal-info-20090414
@@ -8,7 +8,6 @@ MASTER_SITES=		http://hal.freedesktop.org/releases/
 MAINTAINER=		netbsd-desktop@NetBSD.org
 HOMEPAGE=		http://hal.freedesktop.org/
 COMMENT=		FreeDesktop hardware abstraction layer (info subpackage)
-
 #LICENSE=		Academic-Free-License-v2.1 OR gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/ipw-firmware/Makefile b/sysutils/ipw-firmware/Makefile
index 633c3cd2bcc..6f86e2067e2 100644
--- a/sysutils/ipw-firmware/Makefile
+++ b/sysutils/ipw-firmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/10 00:42:02 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:34 wiz Exp $
 
 DISTNAME=	ipw2100-fw-1.2
 PKGNAME=	ipw-firmware-1.0
@@ -9,19 +9,18 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	Damien.Bergamini@Free.FR
 HOMEPAGE=	http://damien.bergamini.free.fr/ipw/
 COMMENT=	Firmware binary images for ipw(4) driver
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=	intel-ipw-license
 
-WRKSRC=		${WRKDIR}
-
 RESTRICTED=		Intel Licensed Software: see http://ipw2100.sourceforge.net/firmware.php?fid=3
 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}
+
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/sysutils/iwi-firmware/Makefile b/sysutils/iwi-firmware/Makefile
index 01e89bb2df5..5acb1cf6f3d 100644
--- a/sysutils/iwi-firmware/Makefile
+++ b/sysutils/iwi-firmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/12/20 17:40:53 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:34 wiz Exp $
 #
 
 DISTNAME=		ipw2200-fw-2.3
@@ -11,11 +11,6 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		Damien.Bergamini@Free.FR
 HOMEPAGE=		http://damien.bergamini.free.fr/ipw/
 COMMENT=		Firmware binary images for iwi(4) driver
-
-CONFLICTS+=		iwi-firmware3-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		intel-ipw-license
 
 RESTRICTED=		Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=5
@@ -24,6 +19,10 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+CONFLICTS+=		iwi-firmware3-[0-9]*
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}
 
 NO_CONFIGURE=		yes
diff --git a/sysutils/iwi-firmware3/Makefile b/sysutils/iwi-firmware3/Makefile
index bf1f44c4efc..24517b715ca 100644
--- a/sysutils/iwi-firmware3/Makefile
+++ b/sysutils/iwi-firmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/20 17:32:31 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:34 wiz Exp $
 #
 
 DISTNAME=		ipw2200-fw-3.0
@@ -10,11 +10,6 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		Damien.Bergamini@Free.FR
 HOMEPAGE=		http://damien.bergamini.free.fr/ipw/
 COMMENT=		Firmware binary images for iwi(4) driver
-
-CONFLICTS+=		iwi-firmware-[0-9]*
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		intel-ipw-license
 
 RESTRICTED=		Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=7
@@ -23,6 +18,10 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+CONFLICTS+=		iwi-firmware-[0-9]*
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index b1c3cff6dc4..625a1d501fd 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/01/18 05:09:44 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:34 wiz Exp $
 #
 
 DISTNAME=		monit-4.10.1
@@ -9,8 +9,7 @@ MASTER_SITES=		http://www.tildeslash.com/monit/dist/
 MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://www.tildeslash.com/monit/
 COMMENT=		Utility for monitoring processes, files, directories and devices
-
-#LICENSE=		gnu-gpl-v3
+LICENSE=		gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile
index f1fe213891b..326720bb464 100644
--- a/sysutils/nvnet/Makefile
+++ b/sysutils/nvnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/03/22 04:53:40 manu Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:34 wiz Exp $
 #
 
 PKGNAME=		nvnet-20050620nb1
@@ -13,9 +13,6 @@ EXTRACT_SUFX=
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.morgart.com/NetBSD/nVidia/nvnet/
 COMMENT=		Driver for nVidia ethernet
-
-BROKEN_IN=		pkgsrc-2006Q1 pkgsrc-2006Q4
-
 LICENSE=		nvidia-license
 
 RESTRICTED=		nVidia Licensed Software: http://www.nvidia.com/object/nv_swlicense.html
@@ -24,6 +21,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+BROKEN_IN=		pkgsrc-2006Q1 pkgsrc-2006Q4
 
 WRKSRC=		${WRKDIR}/nvnet
 
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 72e382054b3..14b4d8d1170 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:35 wiz Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -10,10 +10,8 @@ EXTRACT_SUFX=		.rpm
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://opensource.adaptec.com/
 COMMENT=		Adaptec Storage Management software
-
-USE_TOOLS+=	pax
-
 LICENSE=		generic-nonlicense
+
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -22,6 +20,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 BUILD_DEPENDS+=		rpm>=2.5.4:../../misc/rpm
 
+USE_TOOLS+=	pax
+
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	compat x11
 
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index e056ac255d3..498a55cd56f 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/09/12 11:51:35 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:35 wiz Exp $
 #
 
 DISTNAME=		su2-1.3
@@ -8,8 +8,8 @@ MASTER_SITES=		ftp://ftp.ccs.neu.edu/pub/sysadmin/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		ftp://ftp.ccs.neu.edu/pub/sysadmin/
 COMMENT=		Enhanced su, users su with own password + more
-
 LICENSE=		su2-license
+
 RESTRICTED=		may not be sold for profit
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index c48364d3e00..0ac1ea27944 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/05/16 08:10:03 obache Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:35 wiz Exp $
 #
 
 DISTNAME=	swapd-1.0.3
@@ -9,7 +9,6 @@ MASTER_SITES=	http://www.rkeene.org/files/oss/swapd/source/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rkeene.org/oss/swapd/
 COMMENT=	Swap daemon for POSIX-compliant operating systems
-
 LICENSE=	gnu-gpl-v2
 
 ONLY_FOR_PLATFORM=	NetBSD-*-* SunOS-*-* Linux-*-*
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index a440e879385..e7dd68e9003 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/09/12 11:58:50 gdt Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:35 wiz Exp $
 #
 
 DISTNAME=		sysinfo-3.5.1
@@ -8,8 +8,8 @@ MASTER_SITES=		ftp://ftp.rge.com/pub/admin/sysinfo/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.magnicomp.com/
 COMMENT=		Displays system hardware and software information and configuration
-
 LICENSE=		sysinfo-license
+
 RESTRICTED=		May not be sold for profit or used for commercial gain.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
index 0c06f083ffd..34ae595616d 100644
--- a/sysutils/tdir/Makefile
+++ b/sysutils/tdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/02/16 18:47:43 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:35 wiz Exp $
 #
 
 DISTNAME=	tdir-1.58
@@ -8,11 +8,10 @@ MASTER_SITES=	http://www.tundraware.com/Software/tdir/
 
 MAINTAINER=	zuntum@NetBSD.org
 COMMENT=	Display directories with files ordered by ending "extension"
+LICENSE=	tdir-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-LICENSE=	tdir-license
-
 NOT_FOR_BULK_PLATFORM=	HPUX-*-*
 
 USE_TOOLS+=		gunzip
diff --git a/sysutils/xraidadmin/Makefile b/sysutils/xraidadmin/Makefile
index cecb4f118e7..3f0702dd0c3 100644
--- a/sysutils/xraidadmin/Makefile
+++ b/sysutils/xraidadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/02/16 13:40:11 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:35 wiz Exp $
 #
 
 DISTNAME=		RAIDAdmin1.3.1archive
@@ -10,9 +10,6 @@ MASTER_SITES=		http://download.info.apple.com/Mac_OS_X/061-1325.20040706.bNhy4/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.apple.com/downloads/macosx/apple/xserveraidadmintools.html
 COMMENT=		Tool to administer Apple's Xserve RAID
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		apple-admin-license
 
 RESTRICTED=		Redistribution not permitted
@@ -21,6 +18,8 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/RAID\ Admin\ 1.3.1
 
 NO_BUILD=		yes