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

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

30 files changed, 62 insertions, 88 deletions

diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 6ecb138b73e..a31872a06d2 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/04/19 08:19:37 rh Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:01 wiz Exp $
 #
 
 DISTNAME=	cddb.bundle-0.2
@@ -10,7 +10,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gsburn.sourceforge.net/
 COMMENT=	CDDB client bundle
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index 1d8d15485e0..bdf85dce4fe 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/19 11:43:16 rh Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:01 wiz Exp $
 #
 
 DISTNAME=	cdplayer-0.5
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gsburn.sourceforge.net/
 COMMENT=	GNUstep CD player with CDDB support
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 31a3b55650f..35e25695cfd 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/25 21:42:20 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:01 wiz Exp $
 #
 
 DISTNAME=	eawpats12_full
@@ -9,11 +9,11 @@ MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
 
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Eric A. Welsh' patches (audio samples) for TiMidity
+LICENSE=	generic-nonlicense
 
 RESTRICTED=	Some patches are copyrighted, some marked no-commercial-use
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
-LICENSE=		generic-nonlicense
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index f008b0c433d..dd0b2e47db8 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/06/16 13:13:44 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/19 08:59:01 wiz Exp $
 #
 
 DISTNAME=	espeak-1.31-source
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://espeak.sourceforge.net/
 COMMENT=	Speech synthesizer
+#LICENSE=	GPLv3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,8 +18,6 @@ USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 WRKSRC=		${WRKDIR}/espeak-1.31-source/src
 
-#LICENSE=	GPLv3
-
 INSTALLATION_DIRS=	bin include lib share
 
 do-install:
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 0328403f958..0122dd5506e 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
@@ -9,11 +9,11 @@ MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	Oxford Advanced Learner's pronunciation dictionary for Festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
-USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
+USE_TOOLS+=	pax
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index c492bfc404d..fe833bfac2a 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
@@ -9,14 +9,13 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Composite pronunciation dictionary from ogi.edu for festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index 80c81e0e985..e155bdbc94f 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/05 18:58:59 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	OGIspanish-2.0.1
 PKGNAME=	festogi-spanish-2.0.1
@@ -9,13 +9,12 @@ MASTER_SITES=	# ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Festival Spanish (Mexican) language support routines (in scheme)
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index 937e7986412..d95150f6c7e 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.24 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
@@ -9,13 +9,12 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Mexican Spanish male voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
 DEPENDS+=	festogi-spanish>=2.0:../../audio/festogi-spanish
 
-LICENSE=	no-commercial-use
-
 USE_TOOLS+=	pax
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index f7de91ce1a6..ce6a862a1fb 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/05/05 19:02:17 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
@@ -9,14 +9,13 @@ MASTER_SITES=	# ftp://cslu.cse.ogi.edu/pub/tts/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English male voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=	${PKGNAME_NOREV}nb1
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 4f3986e28db..78c787cba32 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
@@ -9,13 +9,12 @@ MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	Castilian Spanish male voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.1:../../audio/festival
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index a214970b68e..58630fd80da 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based British English male voice for festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+=	mbrolavox-en1-980910{,nb[0-9]*}:../../audio/mbrolavox-en1
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index d1e45c90ab5..f36d3b65e8d 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	Mexican Spanish female voice for the festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
@@ -16,8 +17,6 @@ DEPENDS+=	festogi-spanish>=2.0:../../audio/festogi-spanish
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 79271db37a5..52a807630a4 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
@@ -9,14 +9,13 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English male voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index fa0c5819386..2152d41ca98 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:39:59 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:02 wiz Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
@@ -9,14 +9,13 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English male voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index dcb24e01e3b..2ca66a02b69 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:40:00 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
@@ -9,14 +9,13 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	British English male voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 44886fdba22..f7b5e1569c9 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/07/27 08:40:00 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
@@ -9,14 +9,13 @@ MASTER_SITES=	http://www.cslu.ogi.edu/tts/download/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts/
 COMMENT=	American English female voice for the festival speech synthesis system
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-ogi>=2.0:../../audio/festlex-ogi
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index f7835ae557e..99935b3ab82 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based American English female voice for festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+=	mbrolavox-us1-980512{,nb[0-9]*}:../../audio/mbrolavox-us1
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index c93d0177e63..3c7c43a39a9 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:15 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based Americal English male voice for festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+=	mbrolavox-us2-980812{,nb[0-9]*}:../../audio/mbrolavox-us2
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index e3be39d8e08..40daae071ad 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:16 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -9,6 +9,7 @@ MASTER_SITES=	http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based American English male voice for festival
+LICENSE=	no-commercial-use
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
@@ -18,8 +19,6 @@ DEPENDS+=	mbrolavox-us3-990208{,nb[0-9]*}:../../audio/mbrolavox-us3
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/festival
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index e0e8f5e9e46..3a16fbf7bdb 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/05/13 22:08:21 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	fluidsynth-1.0.9
 CATEGORIES=	audio
@@ -7,7 +7,6 @@ MASTER_SITES=	http://savannah.nongnu.org/download/fluid/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/fluid/
 COMMENT=	Software synthesizer based on SoundFont2
-
 LICENSE=	gnu-lgpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 155044f76c8..51b5d191504 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/09/10 00:28:43 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/19 08:59:03 wiz Exp $
 #
 
 DISTNAME=		gogo239b
@@ -11,6 +11,13 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://homepage1.nifty.com/herumi/gogo_e.html
 COMMENT=		Very fast lame-based mp3 encoder, i386 only
+LICENSE=		unclear-patent-claims
+
+RESTRICTED=		Source based on patent protected Fraunhofer code
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
@@ -20,13 +27,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 
-LICENSE=		unclear-patent-claims
-RESTRICTED=		Source based on patent protected Fraunhofer code
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OBJECT_FMT} == "a.out")
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 8612387b04a..4dd766d0e5c 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2009/01/27 22:03:12 sketch Exp $
+# $NetBSD: Makefile,v 1.62 2009/05/19 08:59:03 wiz Exp $
 #
 
 DISTNAME=	lame-398-2
@@ -10,7 +10,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/} \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://lame.sourceforge.net/
 COMMENT=	Fast, high quality MP3 encoder
-
 LICENSE=	lame-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index 6bbe7c8ffef..c2326c9ac15 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/02 06:10:33 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=		mbr301h
 PKGNAME=		mbrola-301h
@@ -10,7 +10,6 @@ EXTRACT_SUFX=		.zip
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=		MBROLA diphone synthesizer executable
-
 LICENSE=		no-commercial-use
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index 1d3ce12e7fc..fb07d397d87 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/05/02 12:41:52 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/19 08:59:03 wiz Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
@@ -10,13 +10,12 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	British English male voice for MBROLA
+LICENSE=	no-commercial-use
 
 DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index 94be07c2adc..69d6db61f4f 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/05/02 12:54:42 zafer Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:04 wiz Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
@@ -10,13 +10,12 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	American English female voice for MBROLA
+LICENSE=	no-commercial-use
 
 DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index 5eb6d1effd4..7ddcbb46ba3 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/02 12:55:57 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:04 wiz Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -10,13 +10,12 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	American English male voice for MBROLA
+LICENSE=	no-commercial-use
 
 DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index 1b2221c46f3..aeaac269300 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/05/02 12:57:01 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2009/05/19 08:59:04 wiz Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -10,13 +10,12 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola/
 COMMENT=	American English male voice for MBROLA
+LICENSE=	no-commercial-use
 
 DEPENDS+=	mbrola-301h{,nb[0-9]*}:../../audio/mbrola
 
 USE_TOOLS+=	pax
 
-LICENSE=	no-commercial-use
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index 4c6a9f42743..1f522cc43ac 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2008/04/29 11:02:13 tron Exp $
+# $NetBSD: Makefile.common,v 1.31 2009/05/19 08:59:04 wiz Exp $
 
 DISTNAME=	mpg123-0.59r
 MPG123_VERSION=	0.59.18
@@ -11,13 +11,13 @@ PATCHFILES=	mpg123-059r-v6-20000713b.diff.gz
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mpg123.de/
+LICENSE=	mpg123-license
+
 DIST_SUBDIR=	mpg123
 PATCHDIR=	${.CURDIR}/../../audio/mpg123/patches
 FILESDIR=	${.CURDIR}/../../audio/mpg123/files
 DISTINFO_FILE=	${.CURDIR}/../../audio/mpg123/distinfo
 
-LICENSE=	mpg123-license
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index 6eb46e72680..b880f7ff092 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:04 wiz Exp $
 #
 
 DISTNAME=	shntool-2.0.3
@@ -9,11 +9,10 @@ MASTER_SITES=	http://www.etree.org/shnutils/shntool/source/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.etree.org/shnutils/shntool/
 COMMENT=	Lossless audio compressor wrapper tool
+LICENSE=	no-commercial-use
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-LICENSE=	no-commercial-use
-
 GNU_CONFIGURE=	YES
 
 # could also support: "WV" (is this not wav?), OFR, LPAC and APE.
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 92840fad5c3..c248ae1f2ea 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/08 03:07:45 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:04 wiz Exp $
 #
 
 DISTNAME=	shorten-3.6.1
@@ -8,7 +8,6 @@ MASTER_SITES=	http://www.etree.org/shnutils/shorten/dist/src/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.etree.org/shnutils/shorten/
 COMMENT=	Lossless audio compressor
-
 LICENSE=	shorten-license
 
 GNU_CONFIGURE=	YES