* The distfile was rerolled (only HTML formatting changes) so correct

  checksum
* Do not depend on ttmkfdir, but instead package the fonts.dir with the
  port [1]

Suggested by:	nectar [1]

3 files changed, 55 insertions, 22 deletions

diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index a9692995678a..69c58973fd26 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -15,11 +15,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@freebsd.org
 COMMENT=	Bitstream Vera collection of 10 TrueType fonts
 
-BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+NO_BUILD=	yes
 
 NO_CDROM=	"Restrictive license - may not distribute"
 NO_PACKAGE=	"Restrictive license - may not distribute"
@@ -35,10 +35,6 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-TTFONTSDIR?=	${X11BASE}/lib/X11/fonts/TrueType
-
-TTMKFDIR_CMD?=	${X11BASE}/bin/ttmkfdir
-SORT?=	sort
 
 .SILENT:
 
@@ -50,20 +46,6 @@ post-patch:
 	${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
 #
-# Build
-#
-
-do-build: make-fonts.scale make-fonts.dir
-
-make-fonts.scale:
-	${TTMKFDIR_CMD} -c -d ${WRKSRC} | ${CAT} -n | ${SED} -e ' \
-		s,^     1,100000,; \
-	' | ${SORT} -r | ${CUT} -c 8- > ${WRKSRC}/fonts.scale
-
-make-fonts.dir:
-	${CP} ${WRKSRC}/fonts.scale ${WRKSRC}/fonts.dir
-
-#
 # Install
 #
 
@@ -72,7 +54,7 @@ do-install: install-fonts install-conf install-docs
 install-fonts:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${FONTSDIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${FONTSDIR}
 
 install-conf:
diff --git a/x11-fonts/bitstream-vera/distinfo b/x11-fonts/bitstream-vera/distinfo
index f806b6273d71..880346d34bab 100644
--- a/x11-fonts/bitstream-vera/distinfo
+++ b/x11-fonts/bitstream-vera/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bitstream-vera-1.0.tar.bz2) = 8abe72641df2a2409199f7323c92115f
+MD5 (gnome2/bitstream-vera-1.0.tar.bz2) = 8f0490b1d1aab2afe3acfb8588a6e755
diff --git a/x11-fonts/bitstream-vera/files/fonts.dir b/x11-fonts/bitstream-vera/files/fonts.dir
new file mode 100644
index 000000000000..8f595d8b0462
--- /dev/null
+++ b/x11-fonts/bitstream-vera/files/fonts.dir
@@ -0,0 +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