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

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

15 files changed, 54 insertions, 57 deletions

diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index d3c61629325..a98616f2724 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/02/09 23:29:54 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/05/19 08:59:00 wiz Exp $
 #
 
 DISTNAME=		bicom101
@@ -11,8 +11,8 @@ EXTRACT_SUFX=		.zip
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www3.sympatico.ca/mt0000/bicom/bicom.html
 COMMENT=		Data compressor in the PPM family
-
 LICENSE=		bicom-license
+
 RESTRICTED=		No commercial use without prior arrangement, no permission to distribute granted.
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/archivers/fcrackzip/Makefile b/archivers/fcrackzip/Makefile
index 51d6033279f..352b53d641c 100644
--- a/archivers/fcrackzip/Makefile
+++ b/archivers/fcrackzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/13 08:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:00 wiz Exp $
 
 DISTNAME=	fcrackzip-1.0
 MASTER_SITES=	http://home.schmorp.de/marc/data/
@@ -7,7 +7,6 @@ CATEGORIES=	archivers
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://home.schmorp.de/marc/fcrackzip.html
 COMMENT=	Zip password cracker
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 713f40305d5..aa9e4dbfc5f 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/03/02 03:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2009/05/19 08:59:00 wiz Exp $
 
 DISTNAME=	lha-114i
 PKGNAME=	lha-114.9
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www2m.biglobe.ne.jp/~dolphin/lha/prog/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www2m.biglobe.ne.jp/~dolphin/lha/lha-unix.htm
 COMMENT=	Archive files using LZW compression (.lzh files)
-
 LICENSE=	lha-license
+
 RESTRICTED=	Other than for-free distribution of the unmodified source \
 		over a network, redistribution terms are complex.
 NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 3c5e01a9049..44758801eb2 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/02 03:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:00 wiz Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
@@ -8,7 +8,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Decompresses Amiga PowerPacker files
-
 LICENSE=	ppunpack-license
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 6799ce2dc9c..13dcd360ba0 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2009/02/09 23:33:27 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2009/05/19 08:59:00 wiz Exp $
 
 DISTNAME=		rar	# overridden in Makefile.${EMUL_PLATFORM}
 PKGNAME=		rar-2.02 # also overridden
@@ -11,14 +11,14 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.rarsoft.com/
 COMMENT=		RAR file archiver (binary)
-
-EMUL_PLATFORMS=		linux-i386 netbsd-i386
-
 LICENSE=		rar-license
+
 RESTRICTED=		Only unmodified original package can be distributed
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
+EMUL_PLATFORMS=		linux-i386 netbsd-i386
+
 MESSAGE_SRC=		${PKGDIR}/MESSAGE.${EMUL_PLATFORM}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/archivers/sapcar/Makefile b/archivers/sapcar/Makefile
index dd3b9fc92cb..503c0101ccd 100644
--- a/archivers/sapcar/Makefile
+++ b/archivers/sapcar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/09 16:52:05 sno Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/19 08:59:00 wiz Exp $
 
 PKGNAME=		sapcar-7.00
 CATEGORIES=		archivers
@@ -60,8 +60,8 @@ BROKEN=		Plattform ${OPSYS} not supported
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		SAP archiver
-
 LICENSE=		sap-license
+
 RESTRICTED=		Only unmodified original package can be distributed
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile
index 78b3b928bee..dc5c0e80d1d 100644
--- a/archivers/szip/Makefile
+++ b/archivers/szip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/01/16 09:18:30 obache Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:00 wiz Exp $
 
 DISTNAME=	szip-2.1
 PKGREVISION=	1
@@ -8,17 +8,17 @@ MASTER_SITES=	ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hdf.ncsa.uiuc.edu/doc_resource/SZIP/
 COMMENT=	Extended-Rice lossless compression
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		szip-license
+
 RESTRICTED=		No permission to redistribute
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=		${PKGNAME}
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile
index 6bcf653606b..271e49f1037 100644
--- a/archivers/unace-bin/Makefile
+++ b/archivers/unace-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/02/09 23:38:34 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/05/19 08:59:00 wiz Exp $
 #
 
 DISTNAME=	linunace25
@@ -10,14 +10,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives (Linux binary)
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		unace-license
+
 RESTRICTED=		Only original file distribution.
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base compat
 
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 2e9f1bd49c9..6a6b6813294 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:00 wiz Exp $
 #
 
 DISTNAME=	unace-1.2b
@@ -10,15 +10,15 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=utils/compress/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 LICENSE=		unace-source-license
+
 RESTRICTED=		Only original file distribution.
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 
 BUILD_TARGET=	clean unace
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index aa1510a44b5..57c5c4c0a7d 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:01 wiz Exp $
 
 DISTNAME=	unarj-2.65
 PKGREVISION=	1
@@ -8,8 +8,8 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.arjsoftware.com/
 COMMENT=	Allows files to be extracted from ARJ archives
-
 LICENSE=	unarj-license
+
 RESTRICTED=	Do not charge a fee for use, copying, or distribution
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index df687c36676..8fc973521da 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/05/02 12:37:10 zafer Exp $
+# $NetBSD: Makefile,v 1.61 2009/05/19 08:59:01 wiz Exp $
 
 DISTNAME=	unrarsrc-3.8.3
 PKGNAME=	${DISTNAME:S/src//}
@@ -8,18 +8,8 @@ MASTER_SITES=	http://www.rarlab.com/rar/
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.rarlab.com/
 COMMENT=	Extract, view & test RAR archives
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-NO_CONFIGURE=	YES
-USE_LANGUAGES=	c++
-# XXX: makefile.unix has DOS line endings
-USE_TOOLS+=	gmake
-
-MAKE_FILE=	makefile.unix
-
 LICENSE=	unrar-license
+
 RESTRICTED=	Do not charge a fee for redistribution.  Do not use to develop a rar archiver.
 # Reading the license implies NO_BIN_ON_FTP should be set because no
 # permission is granted to distribute derived works (e.g., binaries).
@@ -31,6 +21,16 @@ RESTRICTED=	Do not charge a fee for redistribution.  Do not use to develop a rar
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+NO_CONFIGURE=	YES
+USE_LANGUAGES=	c++
+# XXX: makefile.unix has DOS line endings
+USE_TOOLS+=	gmake
+
+MAKE_FILE=	makefile.unix
+
 WRKSRC=		${WRKDIR}/unrar
 
 INSTALLATION_DIRS=	bin share/doc/unrar
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index 9ef0ea81c47..5660c9fe571 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:01 wiz Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
@@ -9,8 +9,8 @@ DISTFILES=	${DISTNAME}.c ${PRGNAME}.man
 
 MAINTAINER=	rh@NetBSD.org
 COMMENT=	Convert mailable BinHex format into binary
-
 LICENSE=	xbin-license
+
 RESTRICTED=	May not be sold without permission.
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 25f6761211c..66ee2312625 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/24 23:00:18 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:01 wiz Exp $
 
 DISTNAME=		xmill-0.9.1
 PKGREVISION=		3
@@ -8,15 +8,8 @@ MASTER_SITES=		http://www.cs.washington.edu/homes/suciu/XMILL/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Specialized compressor for XML
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_TOOLS+=		gmake
-MAKE_FILE=		makefile
-USE_LANGUAGES=		c c++
-
 LICENSE=		xmill-license
+
 RESTRICTED=		Redistribution not permitted
 # It is not entirely clear that noncommercial redistribution is
 # permitted, but it's too hard to read the license, so it's marked as
@@ -26,6 +19,13 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=		gmake
+MAKE_FILE=		makefile
+USE_LANGUAGES=		c c++
+
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index ec30387f5b2..f2d75fea1da 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2009/05/19 08:59:01 wiz Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -11,8 +11,8 @@ DISTFILES=	zip11.zip zcrypt10.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.info-zip.org/pub/infozip/
 COMMENT=	Create/update ZIP files compatible with pkzip version 1
-
 LICENSE=	generic-nonlicense
+
 RESTRICTED=	Do not modify.  Do not sell for profit.
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 4075c071b46..780596a2253 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/04/25 23:46:47 gdt Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:01 wiz Exp $
 
 DISTNAME=	zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
@@ -8,7 +8,6 @@ MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Manipulate archives of files in compressed form
-
 LICENSE=	zoo-license
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews