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

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

6 files changed, 24 insertions, 26 deletions

diff --git a/multimedia/adobe-flash-plugin/Makefile b/multimedia/adobe-flash-plugin/Makefile
index 52942a87988..b37d4794a02 100644
--- a/multimedia/adobe-flash-plugin/Makefile
+++ b/multimedia/adobe-flash-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/19 19:51:39 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
 
 CATEGORIES=	multimedia www
 MASTER_SITES=	http://download.macromedia.com/pub/labs/flashplayer10/
@@ -6,8 +6,8 @@ MASTER_SITES=	http://download.macromedia.com/pub/labs/flashplayer10/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.adobe.com/
 COMMENT=		Adobe Flash Player Browser plugin
-
 LICENSE=		flash-license
+
 RESTRICTED=		Redistribution not permitted
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 81827dbadb0..ae8272510aa 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/05/08 11:12:20 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
 #
 
 DISTNAME=	clutter-gst-0.8.0
@@ -8,7 +8,6 @@ MASTER_SITES=	http://www.clutter-project.org/sources/clutter-gst/0.8/
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://www.clutter-project.org/
 COMMENT=	Clutter GStreamer integration
-
 LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 97bc30410e5..77d858932e0 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/09/14 13:54:45 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:25 wiz Exp $
 #
 # In order to ensure compliance with U.S. and international law, please
 # do not modify this file to provide pointers to the source or homepage
@@ -13,18 +13,18 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	${LIBDVDCSS_HOMEPAGE}
 COMMENT=	Simple library designed for accessing DVDs
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-PKGCONFIG_OVERRIDE=	src/libdvdcss.pc.in
-
 # XXX missing
 LICENSE=	libdvdcss-license
+
 RESTRICTED=	Legal problems due to CSS code
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+PKGCONFIG_OVERRIDE=	src/libdvdcss.pc.in
+
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index 48965c38094..30a503b205d 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/03/06 19:10:52 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:25 wiz Exp $
 
 CATEGORIES=		multimedia www
 MASTER_SITES=		http://download.macromedia.com/pub/flashplayer/installers/current/9/
@@ -6,18 +6,18 @@ MASTER_SITES=		http://download.macromedia.com/pub/flashplayer/installers/current
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.flash.com/
 COMMENT=		MacroMedia Flash Player Netscape plugin
-
-# Must update communicator/navigator to at least 4.76nb1
-CONFLICTS+=		communicator<=4.76nb1
-CONFLICTS+=		navigator<=4.76nb1
-
 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}
 
+# Must update communicator/navigator to at least 4.76nb1
+CONFLICTS+=		communicator<=4.76nb1
+CONFLICTS+=		navigator<=4.76nb1
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${WRKNAME}
diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index be1a9efae6e..bc1574193ef 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/04/30 06:40:06 tron Exp $
+# $NetBSD: Makefile,v 1.32 2009/05/19 08:59:25 wiz Exp $
 
 DISTNAME=	windows-all-20071007
 PKGNAME=	win32-codecs-071007
@@ -15,6 +15,13 @@ DISTFILES+=	rp9codecs-win32-20050115.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mplayerhq.hu/MPlayer/releases/codecs/
 COMMENT=	Huge compilation of Win32 binary codecs
+LICENSE=	mplayer-codec-license
+
+RESTRICTED=	Unsure of codec's license
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_FTP=	${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -25,13 +32,6 @@ ONLY_FOR_PLATFORM=	*-*-i386
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
-LICENSE=	mplayer-codec-license
-RESTRICTED=	Unsure of codec's license
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/win32
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/* ${DESTDIR}${PREFIX}/lib/win32
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index e5002e0aa68..1fb578f26f3 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/03 13:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:25 wiz Exp $
 
 DISTNAME=	xanim2920
 PKGNAME=	xanim-2.92.0
@@ -13,13 +13,12 @@ DISTFILES=	${EXTRACT_ONLY} ${CODEC_FILES}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Play a variety of simple animation formats and show pictures
 HOMEPAGE=	http://xanim.polter.net/
+LICENSE=	xanim-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-LICENSE=	xanim-license
-
 .include "Makefile.codecs"
 
 USE_IMAKE=	YES