Update to 20090104. Install to default TTF font path instead of

own separate directory. Use pkgsrc font handling support.

Changes:
Nearly four years of changes, not detailed here; read the included
ChangeLog file. (many more and better glyphs)

3 files changed, 25 insertions, 28 deletions

diff --git a/fonts/freefont-ttf/Makefile b/fonts/freefont-ttf/Makefile
index 4bf8e5ade9d..4040ad33859 100644
--- a/fonts/freefont-ttf/Makefile
+++ b/fonts/freefont-ttf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:18 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/01/08 09:12:00 wiz Exp $
 #
 
-DISTNAME=		freefont-ttf
-PKGNAME=		${DISTNAME}-20050407
+DISTNAME=		freefont-ttf-20090104
 CATEGORIES=		fonts
 MASTER_SITES=		http://savannah.nongnu.org/download/freefont/
 
@@ -10,16 +9,16 @@ MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://www.nongnu.org/freefont/
 COMMENT=		Free UCS Outline Fonts: FreeMono, FreeSans, and FreeSerif
 
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-ttf//}
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 USE_LANGUAGES=		# empty
 USE_TOOLS+=		pax
-INSTALLATION_DIRS=	share/fonts/freefont share/doc/freefont
+INSTALLATION_DIRS=	share/doc/freefont ${FONTS_DIRS.ttf}
+
+FONTS_DIRS.ttf=		lib/X11/fonts/TTF
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/README \
@@ -28,7 +27,7 @@ do-install:
 		${DESTDIR}${PREFIX}/share/doc/freefont/
 	${INSTALL_DATA} ${WRKSRC}/CREDITS \
 		${DESTDIR}${PREFIX}/share/doc/freefont/
-	cd ${WRKSRC}/sfd && \
-		pax -rw Free*.ttf ${DESTDIR}${PREFIX}/share/fonts/freefont/
+	cd ${WRKSRC} && \
+		pax -rw Free*.ttf ${DESTDIR}${PREFIX}/${FONTS_DIRS.ttf}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/freefont-ttf/PLIST b/fonts/freefont-ttf/PLIST
index 75ed7fefea3..ef8a374f621 100644
--- a/fonts/freefont-ttf/PLIST
+++ b/fonts/freefont-ttf/PLIST
@@ -1,19 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/20 00:59:45 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/08 09:12:00 wiz Exp $
+lib/X11/fonts/TTF/FreeMono.ttf
+lib/X11/fonts/TTF/FreeMonoBold.ttf
+lib/X11/fonts/TTF/FreeMonoBoldOblique.ttf
+lib/X11/fonts/TTF/FreeMonoOblique.ttf
+lib/X11/fonts/TTF/FreeSans.ttf
+lib/X11/fonts/TTF/FreeSansBold.ttf
+lib/X11/fonts/TTF/FreeSansBoldOblique.ttf
+lib/X11/fonts/TTF/FreeSansOblique.ttf
+lib/X11/fonts/TTF/FreeSerif.ttf
+lib/X11/fonts/TTF/FreeSerifBold.ttf
+lib/X11/fonts/TTF/FreeSerifBoldItalic.ttf
+lib/X11/fonts/TTF/FreeSerifItalic.ttf
 share/doc/freefont/AUTHORS
 share/doc/freefont/CREDITS
 share/doc/freefont/README
-share/fonts/freefont/FreeMono.ttf
-share/fonts/freefont/FreeMonoBold.ttf
-share/fonts/freefont/FreeMonoBoldOblique.ttf
-share/fonts/freefont/FreeMonoOblique.ttf
-share/fonts/freefont/FreeSans.ttf
-share/fonts/freefont/FreeSansBold.ttf
-share/fonts/freefont/FreeSansBoldOblique.ttf
-share/fonts/freefont/FreeSansOblique.ttf
-share/fonts/freefont/FreeSerif.ttf
-share/fonts/freefont/FreeSerifBold.ttf
-share/fonts/freefont/FreeSerifBoldItalic.ttf
-share/fonts/freefont/FreeSerifItalic.ttf
-@dirrm share/fonts/freefont
-@unexec ${RMDIR} %D/share/fonts 2> /dev/null || ${TRUE}
 @dirrm share/doc/freefont
diff --git a/fonts/freefont-ttf/distinfo b/fonts/freefont-ttf/distinfo
index 4c35ce4ca47..2dd46326e76 100644
--- a/fonts/freefont-ttf/distinfo
+++ b/fonts/freefont-ttf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/07/20 00:59:45 reed Exp $
+$NetBSD: distinfo,v 1.2 2009/01/08 09:12:00 wiz Exp $
 
-SHA1 (freefont-ttf-20050407/freefont-ttf.tar.gz) = bace5fc544871a646b63f94d4902be0fceca0b3e
-RMD160 (freefont-ttf-20050407/freefont-ttf.tar.gz) = 68711d7a351c88c328e8b587ea1699f0dba3cf04
-Size (freefont-ttf-20050407/freefont-ttf.tar.gz) = 1189011 bytes
+SHA1 (freefont-ttf-20090104.tar.gz) = 776393e70028e74062754d48c74fe6829271d182
+RMD160 (freefont-ttf-20090104.tar.gz) = de1a1b2d53c1f2a47c42860bb110599f7e21d255
+Size (freefont-ttf-20090104.tar.gz) = 2935330 bytes