10 files changed, 25 insertions, 29 deletions
diff --git a/fonts/acroread5-font-share/Makefile.common b/fonts/acroread5-font-share/Makefile.common
index 95d68cd6f34..0189fcfa843 100644
--- a/fonts/acroread5-font-share/Makefile.common
+++ b/fonts/acroread5-font-share/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.7 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2009/05/19 08:59:14 wiz Exp $
 #
 
 PKGNAME=	acroread5-${DISTNAME}-5.0
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/5.x/
 
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
+LICENSE=	adobe-acrobat-license
 
 DEPENDS+=	acroread5-5.*:../../print/acroread5
 
 DIST_SUBDIR=	acrobat5-fonts
-LICENSE=	adobe-acrobat-license
 
 RESTRICTED=	Redistribution not permitted
 NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/fonts/acroread7-font-share/Makefile.common b/fonts/acroread7-font-share/Makefile.common
index a231e3709fb..d83b30207fb 100644
--- a/fonts/acroread7-font-share/Makefile.common
+++ b/fonts/acroread7-font-share/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.3 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2009/05/19 08:59:14 wiz Exp $
 #
 
 PKGNAME=	acroread7-${DISTNAME}-7.0
 MASTER_SITES=	ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/misc/
 
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
+LICENSE=	adobe-acrobat-license
 
 DEPENDS+=	acroread7-7.*:../../print/acroread7
 
 DIST_SUBDIR=	acrobat7-fonts
-LICENSE=	adobe-acrobat-license
 
 RESTRICTED=	Redistribution not permitted
 NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/fonts/bakoma-fonts/Makefile b/fonts/bakoma-fonts/Makefile
index 86633a567b8..eeb012151d3 100644
--- a/fonts/bakoma-fonts/Makefile
+++ b/fonts/bakoma-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/19 08:59:14 wiz Exp $
 #
 
 DISTNAME=	bakoma-20010719
@@ -11,8 +11,8 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/
 COMMENT=	BaKoMa Fonts for TeX
-
 LICENSE+=		no-commercial-use
+
 NO_SRC_ON_CDROM=	#defined
 NO_BIN_ON_CDROM=	#defined
 
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index 7f304537d69..caf7e2ba73f 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2008/03/03 20:17:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/05/19 08:59:14 wiz Exp $
 #
 
 DISTNAME=	# empty
@@ -8,16 +8,16 @@ DISTFILES=	${FONT_FILE} ReadMe.htm
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.bitstream.com/
-
-BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
-
 LICENSE=	cyberbit-ttf-license
+
 RESTRICTED=	Redistribution not permitted; single user license only.
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
+BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=	cyberbit-ttf
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index bb2d277f7a0..52dff0ae7f0 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:14 wiz Exp $
 #
 
 DISTNAME=	dbz
@@ -11,14 +11,14 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://fonts.tom7.com/
 COMMENT=	Divide By Zero TrueType fonts created by Tom Murphy 7
-
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
 LICENSE=	dbz-ttf-license
+
 RESTRICTED=	Resale prohibited.
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+DIST_SUBDIR=	${PKGNAME_NOREV}
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_X11=	YES
diff --git a/fonts/inconsolata-ttf/Makefile b/fonts/inconsolata-ttf/Makefile
index 5b52bee3146..9616c564897 100644
--- a/fonts/inconsolata-ttf/Makefile
+++ b/fonts/inconsolata-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/07 19:49:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:14 wiz Exp $
 #
 
 DISTNAME=	Inconsolata.otf
@@ -10,7 +10,6 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	smb@NetBSD.org
 HOMEPAGE=	http://www.levien.com/type/myfonts/inconsolata.html
 COMMENT=	Inconsolata TrueType font
-
 #LICENSE=	sil-open-font-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index e3be99caa63..a806bf830a5 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:14 wiz Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
@@ -9,6 +9,7 @@ MASTER_SITES=		http://www.tea.forus.or.jp/toshi/exhibition/
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		${MASTER_SITES}/elisat10.html
 COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
+LICENSE=		no-commercial-use
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,8 +20,6 @@ FONTDIR=		${PREFIX}/lib/X11/fonts/local
 FONTS_DIRS.x11=		${FONTDIR}
 USE_TOOLS+=		bdftopcf gzip
 
-LICENSE=		no-commercial-use
-
 do-build:
 	cd ${WRKSRC}; \
 	for i in *.bdf; do \
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 37aa442d94f..639dbda86db 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2009/05/19 08:59:14 wiz Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -12,6 +12,7 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} clR5x8.bdf
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://www.wheel.gr.jp/~dai/software/#elisau10
 COMMENT=		10x8 dots X11 bitmap font for JIS X 0208
+LICENSE=		no-commercial-use
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 SITES.elisau10${EXTRACT_SUFX}=	\
@@ -28,8 +29,6 @@ FONTDIR=		${PREFIX}/lib/X11/fonts/local
 FONTS_DIRS.x11=		${FONTDIR}
 DISTPATCH=		${WRKSRC}/clR5x8-s5x8.diff
 
-LICENSE=		no-commercial-use
-
 post-extract:
 	${CP} ${DISTDIR}/clR5x8.bdf ${WRKDIR}; \
 	cd ${WRKSRC}; \
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index 06709a35b5d..2e2be464195 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/19 08:59:14 wiz Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
@@ -8,6 +8,7 @@ MASTER_SITES=		${MASTER_SITE_LOCAL} # original site was closed.
 
 MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
+#LICENSE=		no-commercial-use
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,8 +19,6 @@ DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 FONTS_DIRS.x11=		${FONTDIR}
 
-#LICENSE=		no-commercial-use
-
 do-build:
 	cd ${WRKSRC}; \
 	for i in *.bdf; do \
diff --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index 5d1a18d7a3c..2fedfe1222a 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/05/16 07:22:03 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2009/05/19 08:59:14 wiz Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ms-ttf-20020306
@@ -12,13 +12,13 @@ DISTFILES=	andale32.exe webdin32.exe trebuc32.exe georgi32.exe \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://corefonts.sourceforge.net/
 COMMENT=	TrueType fonts from Microsoft
+LICENSE=	ms-ttf-license
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+RESTRICTED=	No redistribution in altered form
 
 BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
 
-LICENSE=	ms-ttf-license
-RESTRICTED=	No redistribution in altered form
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}