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

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

10 files changed, 16 insertions, 22 deletions

diff --git a/www/ap2-wsgi/Makefile b/www/ap2-wsgi/Makefile
index d1d0594c5bc..6d9981e2aa7 100644
--- a/www/ap2-wsgi/Makefile
+++ b/www/ap2-wsgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/04/29 23:18:58 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/19 08:59:37 wiz Exp $
 #
 
 DISTNAME=	mod_wsgi-${VERSION}
@@ -9,7 +9,6 @@ MASTER_SITES=	http://modwsgi.googlecode.com/files/
 MAINTAINER=	jan.m.danielsson@gmail.com
 HOMEPAGE=	http://modwsgi.googlecode.com/
 COMMENT=	WSGI module for apache
-
 LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index bf627ec3f88..e6f3306bc7e 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2008/04/09 08:39:24 tron Exp $
+# $NetBSD: Makefile.common,v 1.23 2009/05/19 08:59:37 wiz Exp $
 
 DISTNAME=		install_flash_player_9_${DISTUNAME}
 PKGNAME=		${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
@@ -7,16 +7,16 @@ MASTER_SITES=		http://fpdownload.macromedia.com/get/flashplayer/current/
 
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.flash.com/
-
-DIST_SUBDIR=		flash/${FLASH_VERS}
-
 LICENSE=		flash-license
+
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+DIST_SUBDIR=		flash/${FLASH_VERS}
+
 EMUL_PLATFORMS=		linux-i386
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index a4e37f0b99a..4e59728a4d2 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/05/18 13:40:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2009/05/19 08:59:37 wiz Exp $
 #
 # PKGNAME derives from the supported API (still from
 # release 3.14). See also PLIST.
@@ -13,7 +13,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering/printing/editing engine
-
 #LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/ja-trac/Makefile b/www/ja-trac/Makefile
index c7b1d46b548..b1c0f66a1a4 100644
--- a/www/ja-trac/Makefile
+++ b/www/ja-trac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/07 11:29:52 obache Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:37 wiz Exp $
 #
 
 DISTNAME=	Trac-0.11.4.ja1
@@ -10,7 +10,6 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.i-act.co.jp/project/products/products.html
 COMMENT=	Trac issue tracking system with Japanese localization
-
 LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 9628dc3e52f..7c0a28971af 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.90 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile.common,v 1.91 2009/05/19 08:59:37 wiz Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -6,8 +6,8 @@ CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	http://www.netscape.com/browsers/index.html
-
 LICENSE=	generic-nonlicense
+
 RESTRICTED=	No re-distribution without agreement from Netscape
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 5f2d75099cb..26240a801c9 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2009/05/17 13:46:00 obache Exp $
+# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:37 wiz Exp $
 
 DISTNAME=		opera-${OPERA_PKG_VERSION:S/u/pl/}
 CATEGORIES=		www
@@ -13,7 +13,6 @@ DISTFILES=		opera-${OPERA_DIST_VERSION}${OPERA_ARCH}${EXTRACT_SUFX}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.opera.com/
 COMMENT=		Small, fast and customizable WWW client
-
 LICENSE=		opera-850-license
 
 EMUL_PLATFORMS=		freebsd-i386
diff --git a/www/py-genshi/Makefile b/www/py-genshi/Makefile
index 2ea44f5f00a..e330c8ff39e 100644
--- a/www/py-genshi/Makefile
+++ b/www/py-genshi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/12 13:27:55 obache Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/19 08:59:37 wiz Exp $
 #
 
 DISTNAME=	Genshi-0.5.1
@@ -9,7 +9,6 @@ MASTER_SITES=	http://ftp.edgewall.com/pub/genshi/
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://genshi.edgewall.org/
 COMMENT=	Python toolkit for generation of output for the web
-
 LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 46ad5da9673..7e612cd07ee 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/05/08 13:39:09 taca Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:37 wiz Exp $
 
 DISTNAME=	squid-3.0.STABLE15
 PKGNAME=	${DISTNAME:S/STABLE//}
@@ -9,8 +9,8 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
+LICENSE=	gnu-gpl-v2
 
-LICENSE=		gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 3782d1f3ef0..d2187708628 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/17 14:17:42 tron Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:38 wiz Exp $
 
 DISTNAME=	squid-3.1.0.7
 PKGNAME=	${DISTNAME}	# Necessary for "pkgsrc/www/squid/options.mk"
@@ -10,8 +10,8 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
+LICENSE=	gnu-gpl-v2
 
-LICENSE=		gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl gmake
 GNU_CONFIGURE=		yes
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index edbbd69c178..af60a7d05f3 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/11 19:03:53 spz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:38 wiz Exp $
 #
 
 DISTNAME=	varnish-2.0.4
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=varnish/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://varnish-cache.org/
 COMMENT=	High-performace HTTP accelerator
-
 LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir