Update to the release version, 1.10.

6 files changed, 77 insertions, 78 deletions

diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index c758da0df1b1..53b99d61c940 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	bitstream-vera
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.10
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
+DISTNAME=	ttf-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@freebsd.org
-COMMENT=	Bitstream Vera collection of 10 TrueType fonts
+COMMENT=	Bitstream Vera TrueType font collection
 
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
@@ -23,9 +23,6 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
-NO_CDROM=	"Restrictive license - may not distribute"
-NO_PACKAGE=	"Restrictive license - may not distribute"
-
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
 MSG_FILE=	${PKGDIR}/pkg-message
@@ -66,12 +63,13 @@ install-conf:
 install-docs:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Bitstream_Vera_Fonts_README.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASENOTES.TXT ${DOCSDIR}
 .endif
 
 post-install:
 	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v
+	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/bitstream-vera/distinfo b/x11-fonts/bitstream-vera/distinfo
index f601f4a90552..d6f834a90f42 100644
--- a/x11-fonts/bitstream-vera/distinfo
+++ b/x11-fonts/bitstream-vera/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bitstream-vera-1.0.tar.bz2) = 5f70842107991d85ad205e6cbe50d90e
+MD5 (gnome2/ttf-bitstream-vera-1.10.tar.bz2) = bb22bd5b4675f5dbe17c6963d8c00ed6
diff --git a/x11-fonts/bitstream-vera/files/fonts.dir b/x11-fonts/bitstream-vera/files/fonts.dir
index 8f595d8b0462..fd16ab5539da 100644
--- a/x11-fonts/bitstream-vera/files/fonts.dir
+++ b/x11-fonts/bitstream-vera/files/fonts.dir
@@ -1,51 +1,51 @@
 50
-tt2001gn.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9
-tt2001gn.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15
-tt2001gn.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-tt2001gn.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
-tt2001gn.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0
-tt2002gn.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9
-tt2002gn.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15
-tt2002gn.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-tt2002gn.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1
-tt2002gn.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-0
-tt2003gn.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9
-tt2003gn.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15
-tt2003gn.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-tt2003gn.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
-tt2003gn.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0
-tt2004gn.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9
-tt2004gn.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15
-tt2004gn.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15
-tt2004gn.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
-tt2004gn.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
-tt2005gn.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9
-tt2005gn.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15
-tt2005gn.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-tt2005gn.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
-tt2005gn.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-ascii-0
-tt2007gn.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
-tt2007gn.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
-tt2007gn.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-tt2007gn.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
-tt2007gn.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-ascii-0
-tt2009gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-p-0-iso8859-9
-tt2009gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-p-0-iso8859-15
-tt2009gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-tt2009gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-p-0-iso8859-1
-tt2009gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-p-0-ascii-0
-tt2010gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-p-0-iso8859-9
-tt2010gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-p-0-iso8859-15
-tt2010gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-tt2010gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-p-0-iso8859-1
-tt2010gn.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-p-0-ascii-0
-tt2011gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-p-0-iso8859-9
-tt2011gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-p-0-iso8859-15
-tt2011gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-tt2011gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-p-0-iso8859-1
-tt2011gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-p-0-ascii-0
-tt2012gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-p-0-iso8859-9
-tt2012gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-p-0-iso8859-15
-tt2012gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-p-0-fcd8859-15
-tt2012gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-p-0-iso8859-1
-tt2012gn.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-p-0-ascii-0
+Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9
+Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15
+Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-fcd8859-15
+Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
+Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0
+VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9
+VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15
+VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15
+VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
+VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
+VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9
+VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15
+VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-fcd8859-15
+VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
+VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0
+VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9
+VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15
+VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-fcd8859-15
+VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1
+VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-0
+VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-9
+VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-15
+VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-fcd8859-15
+VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-1
+VeraMoBI.ttf -Bitstream-Bitstream Vera Sans Mono-bold-i-normal--0-0-0-0-m-0-ascii-0
+VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-9
+VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-15
+VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-fcd8859-15
+VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-1
+VeraMoBd.ttf -Bitstream-Bitstream Vera Sans Mono-bold-r-normal--0-0-0-0-m-0-ascii-0
+VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-9
+VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-15
+VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-fcd8859-15
+VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-1
+VeraMoIt.ttf -Bitstream-Bitstream Vera Sans Mono-medium-i-normal--0-0-0-0-m-0-ascii-0
+VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-9
+VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-15
+VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-fcd8859-15
+VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
+VeraMono.ttf -Bitstream-Bitstream Vera Sans Mono-medium-r-normal--0-0-0-0-m-0-ascii-0
+VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9
+VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15
+VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-fcd8859-15
+VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
+VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-ascii-0
+VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
+VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
+VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-fcd8859-15
+VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
+VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-ascii-0
diff --git a/x11-fonts/bitstream-vera/pkg-descr b/x11-fonts/bitstream-vera/pkg-descr
index a15e6b0d6a6d..9aae6ac7582b 100644
--- a/x11-fonts/bitstream-vera/pkg-descr
+++ b/x11-fonts/bitstream-vera/pkg-descr
@@ -1,4 +1,4 @@
-These are preliminary versions of the "Bitstream Vera" font family.  They
-consist of 10 high-quality TrueType fonts for use with X.  The final version
-of this package is expected to be released in March 2003, and will have a
-more generous copyright.
+This is the final version of the "Bitstream Vera" font family.  It 
+consist of 10 high-quality TrueType fonts for use with X11.
+
+WWW: http://www.gnome.org/fonts/
diff --git a/x11-fonts/bitstream-vera/pkg-message b/x11-fonts/bitstream-vera/pkg-message
index 06d66e44e07e..618b0bb1904e 100644
--- a/x11-fonts/bitstream-vera/pkg-message
+++ b/x11-fonts/bitstream-vera/pkg-message
@@ -1,6 +1,6 @@
 IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
-before using.  The copyright can be found at %%FONTSDIR%%/LICENSE.  To use
-these fonts, follow the instructions below.
+before using.  The copyright can be found at %%FONTSDIR%%/COPYRIGHT.TXT.  To 
+use these fonts, follow the instructions below.
 
 Make sure that the freetype module is loaded.  If it is not, add the following
 line to the "Modules" section of XF86Config:
diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist
index 8d7e5e77e391..da031112bd6c 100644
--- a/x11-fonts/bitstream-vera/pkg-plist
+++ b/x11-fonts/bitstream-vera/pkg-plist
@@ -3,18 +3,19 @@ etc/fonts/local.conf-vera
 @exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
 %%FONTSDIR%%/COPYRIGHT.TXT
 %%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/tt2001gn.ttf
-%%FONTSDIR%%/tt2002gn.ttf
-%%FONTSDIR%%/tt2003gn.ttf
-%%FONTSDIR%%/tt2004gn.ttf
-%%FONTSDIR%%/tt2005gn.ttf
-%%FONTSDIR%%/tt2007gn.ttf
-%%FONTSDIR%%/tt2009gn.ttf
-%%FONTSDIR%%/tt2010gn.ttf
-%%FONTSDIR%%/tt2011gn.ttf
-%%FONTSDIR%%/tt2012gn.ttf
-%%PORTDOCS%%share/doc/bitstream-vera/Bitstream_Vera_Fonts_README.html
+%%FONTSDIR%%/Vera.ttf
+%%FONTSDIR%%/VeraBI.ttf
+%%FONTSDIR%%/VeraBd.ttf
+%%FONTSDIR%%/VeraIt.ttf
+%%FONTSDIR%%/VeraMoBI.ttf
+%%FONTSDIR%%/VeraMoBd.ttf
+%%FONTSDIR%%/VeraMoIt.ttf
+%%FONTSDIR%%/VeraMono.ttf
+%%FONTSDIR%%/VeraSe.ttf
+%%FONTSDIR%%/VeraSeBd.ttf
+%%PORTDOCS%%share/doc/bitstream-vera/README.TXT
+%%PORTDOCS%%share/doc/bitstream-vera/RELEASENOTES.TXT
 %%PORTDOCS%%@dirrm share/doc/bitstream-vera
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v || /usr/bin/true
+@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true