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

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

13 files changed, 25 insertions, 37 deletions

diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index c1abf325ef2..651d7af117c 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2009/05/18 10:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2009/05/19 08:59:38 wiz Exp $
 #
 
 DISTNAME=		gnome-mag-0.15.6
@@ -9,7 +9,6 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME screen magnifier
-
 LICENSE=		gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 4de2b420c5b..eda7fa7d1eb 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/05/18 12:23:34 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:38 wiz Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.26.1
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.26/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/GnomeScreensaver/
 COMMENT=	Screen saver and locker for the GNOME desktop
-
 #LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index f351b3007c7..b8216084733 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2009/05/18 12:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2009/05/19 08:59:38 wiz Exp $
 #
 
 DISTNAME=		gnome-themes-2.26.1
@@ -9,7 +9,6 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Collection of themes and icons for GNOME 2
-
 LICENSE=		gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 7a386ab2a17..298633f09f9 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2009/04/13 12:21:37 rh Exp $
+# $NetBSD: Makefile,v 1.46 2009/05/19 08:59:38 wiz Exp $
 
 DISTNAME=	gnustep-back-0.16.0
 CATEGORIES=	x11 gnustep
@@ -7,11 +7,10 @@ MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	X11 AppKit backend for GNUstep
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-LICENSE=		gnu-gpl-v3
-
 USE_LANGUAGES=		objc
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index ad69c034b79..8a9408b9a52 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/04/13 12:19:14 rh Exp $
+# $NetBSD: Makefile,v 1.42 2009/05/19 08:59:38 wiz Exp $
 
 DISTNAME=	gnustep-gui-0.16.0
 CATEGORIES=	x11 gnustep
@@ -7,11 +7,10 @@ MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	GNUstep AppKit Implementation
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-LICENSE=		gnu-gpl-v3
-
 USE_LANGUAGES=		objc
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index c65debaf856..d0138997d3b 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/04/19 09:21:24 rh Exp $
+# $NetBSD: Makefile,v 1.35 2009/05/19 08:59:38 wiz Exp $
 
 DISTNAME=	Preferences-1.2.0
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
@@ -10,11 +10,10 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://prefsapp.sourceforge.net/
 COMMENT=	Application for setting preferences for the GNUstep system
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-LICENSE=	gnu-gpl-v2
-
 USE_LANGUAGES=	objc
 
 NO_CONFIGURE=	YES
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 7e1b7d13c47..c592196c513 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/05/13 12:32:08 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:38 wiz Exp $
 #
 
 DISTNAME=	libxklavier-3.9
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://freedesktop.org/Software/LibXklavier
 COMMENT=	High-level API for the X Keyboard Extension (XKB)
-
 LICENSE=	gnu-lgpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index c4472857efe..b752033e8ac 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2008/11/10 17:21:38 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2009/05/19 08:59:38 wiz Exp $
 
 PKGVER=		2.3.1
 DISTNAME=	openmotif-${PKGVER}
@@ -11,13 +11,10 @@ MASTER_SITES+=	ftp://ftp.ics.com/openmotif/2.3/2.3.1/
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://www.opengroup.org/openmotif/
 COMMENT=		The Open Group Motif toolkit for the X Window System
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
+LICENSE=		openmotif-license
 
 .include "../../mk/bsd.prefs.mk"
 
-LICENSE=		openmotif-license
 RESTRICTED=		Only for Open Source OS; complex terms for commercial distribution.
 
 # License grants permission to reproduce distfile for use on Open
@@ -37,6 +34,9 @@ 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
+
 CONFLICTS+=		lesstif-[0-9]*
 
 USE_LIBTOOL=		yes
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index 8275c5978cb..63f096c4854 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:26 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:39 wiz Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
@@ -10,8 +10,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://java.sun.com/products/jfc/
 COMMENT=	Sun's Java Foundation Classes (the Swing UI toolkit), version 1.1.1
-
-DOWNLOAD=	http://java.sun.com/products/jfc/download.archive.html
+LICENSE=	sun-swing-license
 
 RESTRICTED=	Read license before redistributing the Java(tm) Foundation Classes
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -19,7 +18,7 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-LICENSE=	sun-swing-license
+DOWNLOAD=	http://java.sun.com/products/jfc/download.archive.html
 
 WRKSRC=		${WRKDIR}/swing-1.1.1fcs
 USE_JAVA=	run
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile
index 1aacd19ee89..699b8264e9f 100644
--- a/x11/x11vnc/Makefile
+++ b/x11/x11vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/05/07 14:03:26 obache Exp $
+# $NetBSD: Makefile,v 1.20 2009/05/19 08:59:39 wiz Exp $
 #
 
 DISTNAME=	x11vnc-0.9.7
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.karlrunge.com/x11vnc/
 COMMENT=	VNC server for real X displays
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 4a486379682..5a449227ab2 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/08/19 13:33:09 obache Exp $
+# $NetBSD: Makefile,v 1.14 2009/05/19 08:59:39 wiz Exp $
 #
 
 DISTNAME=	xclip-0.11
@@ -8,8 +8,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xclip/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/xclip/
 COMMENT=	Command line interface to the X windows clipboard
-
-#LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/xcruise/Makefile b/x11/xcruise/Makefile
index 6128e081054..e1691e9cccb 100644
--- a/x11/xcruise/Makefile
+++ b/x11/xcruise/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:34 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/05/19 08:59:39 wiz Exp $
 #
 
 DISTNAME=	xcruise-0.24
@@ -9,8 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xcruiser/}
 MAINTAINER=	minoura@NetBSD.org
 HOMEPAGE=	http://xcruiser.sourceforge.net/
 COMMENT=	Navigate through a three-dimensional view of a file system
-
-# LICENSE=	GPL
+#LICENSE=	GPL
 
 USE_IMAKE=	yes
 
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 7ce62701c78..58257df3544 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/05/30 17:04:04 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2009/05/19 08:59:39 wiz Exp $
 
 DISTNAME=	xephem-3.7.3
 CATEGORIES=	x11
@@ -7,8 +7,7 @@ MASTER_SITES=	http://www.clearskyinstitute.com/xephem/
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.clearskyinstitute.com/xephem/
 COMMENT=	Interactive astronomical ephemeris program
-
-LICENSE=		xephem-license
+LICENSE=	xephem-license
 
 # Pending adjustment of license wording to clarify the copyright
 # holder's intent, permission has been granted to distribute the