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

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

5 files changed, 9 insertions, 12 deletions

diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index f8d1f620a22..2b49488355b 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/02/15 09:48:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:06 wiz Exp $
 
 DISTNAME=		convmv-1.14
 CATEGORIES=		converters
@@ -7,6 +7,7 @@ MASTER_SITES=		http://www.j3e.de/linux/convmv/
 MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://j3e.de/linux/convmv/
 COMMENT=		Converts filenames from one encoding to another
+#LICENSE=		gnu-gplv2 OR gnu-gplv3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -14,8 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LANGUAGES=		# empty
 USE_TOOLS+=		pax perl:run
 
-#LICENSE=		gnu-gplv2 or gnu-gplv3
-
 MANCOMPRESSED=		yes
 NO_BUILD=		yes
 
diff --git a/converters/dvi2tty/Makefile b/converters/dvi2tty/Makefile
index 0b90fc7d281..fb10b006ba6 100644
--- a/converters/dvi2tty/Makefile
+++ b/converters/dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:06 wiz Exp $
 #
 
 DISTNAME=	dvi2tty
@@ -9,7 +9,6 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Program for previewing DVI files
-
 LICENSE=	no-commercial-use
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/converters/ja-dvi2tty/Makefile b/converters/ja-dvi2tty/Makefile
index b769585dec6..af3cef4b888 100644
--- a/converters/ja-dvi2tty/Makefile
+++ b/converters/ja-dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/03/03 05:51:08 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:06 wiz Exp $
 
 DISTNAME=	dvi2tty5.0
 PKGNAME=	ja-dvi2tty-5.0
@@ -14,6 +14,7 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Program for previewing DVI files (ASCII Japanese TeX)
+LICENSE=	no-commercial-use
 
 DEPENDS+=	ja-less>=358:../../misc/ja-less
 
@@ -21,8 +22,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=	ja-dvi2tty
 
-LICENSE=	no-commercial-use
-
 MAKE_FLAGS+=	CFLAGS="${CFLAGS} -DDEFPAGER='\"${PREFIX}/bin/jless\"'"
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 2c6dd2981a7..208e73270e4 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/05/26 02:13:16 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2009/05/19 08:59:06 wiz Exp $
 
 DISTNAME=	libiconv-1.12
 PKGREVISION=	1
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/libiconv/
 COMMENT=	Character set conversion library
+#LICENSE=		gnu-gplv3 gnu-lgplv2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -16,7 +17,6 @@ USE_LANGUAGES+=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=	pax
 GNU_CONFIGURE=		yes
-#LICENSE=		gnu-gplv3 gnu-lgplv2
 
 # Explicitly disable NLS since libiconv is a dependency for gettext-lib
 # and we don't want libiconv to pick up any NLS functions from libc
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index ff1832c57d7..f15082e5481 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/10/19 19:17:42 he Exp $
+# $NetBSD: Makefile,v 1.39 2009/05/19 08:59:06 wiz Exp $
 #
 
 VERS=			3.07
@@ -12,7 +12,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=MIME/}
 MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/MIME-Base64/
 COMMENT=		Perl5 module for Base64 and Quoted-Printable encodings
-#LICENSE=		gnu-gpl-v2
+LICENSE=		gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir