From 1e0cc1e3dd09fdad460647c0812b8d7200f38f94 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 23 Mar 2014 21:31:08 +0000
Subject: [PATCH] - Update to 3.005. - The port has a dedicated website now,
 switch MASTER_SITES and pkg-descr to   it. - Use FONTDIR in pkg-plist to
 avoid some needless repetition.

This is based on ports/187695 by bsam@, which update the port to 3.003 and
contained some other differences I have decided not to incorporate.

PR:		ports/187695
Submitted by:	bsam@
---
 x11-fonts/vollkorn-ttf/Makefile  | 13 +++++++------
 x11-fonts/vollkorn-ttf/distinfo  |  4 ++--
 x11-fonts/vollkorn-ttf/pkg-descr |  2 +-
 x11-fonts/vollkorn-ttf/pkg-plist | 14 +++++++++-----
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/x11-fonts/vollkorn-ttf/Makefile b/x11-fonts/vollkorn-ttf/Makefile
index 86e43a28d548..09c71cba7e9a 100644
--- a/x11-fonts/vollkorn-ttf/Makefile
+++ b/x11-fonts/vollkorn-ttf/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	vollkorn-ttf
-PORTVERSION=	2.1
+PORTVERSION=	3.005
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://friedrichalthausen.de/
-DISTNAME=	Vollkorn-${PORTVERSION}
+MASTER_SITES=	http://vollkorn-typeface.com/download/
+DISTNAME=	vollkorn-${PORTVERSION:S|.|-|}
 
 MAINTAINER=	rakuco@FreeBSD.org
 COMMENT=	Free and healthy typeface for bread and butter use
@@ -15,14 +15,15 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USES=		zip
 
-FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTDIR}
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} Vollkorn-*.ttf ${FONTDIR}
+		${INSTALL_DATA} TTF/Vollkorn-*.ttf ${STAGEDIR}${FONTDIR}
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
diff --git a/x11-fonts/vollkorn-ttf/distinfo b/x11-fonts/vollkorn-ttf/distinfo
index 16dc9a88d674..abc3b4591dd3 100644
--- a/x11-fonts/vollkorn-ttf/distinfo
+++ b/x11-fonts/vollkorn-ttf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Vollkorn-2.1.zip) = 2eaa427dbe42e37bfdc182c1e3446abdc889806fe0b6c9a14e0fc0c3acc997f5
-SIZE (Vollkorn-2.1.zip) = 139737
+SHA256 (vollkorn-3-005.zip) = 2ba29d185bcf943f844a88546fbc4ec668d53f2564d8aa1c5837ffb9a45f4fab
+SIZE (vollkorn-3-005.zip) = 1741200
diff --git a/x11-fonts/vollkorn-ttf/pkg-descr b/x11-fonts/vollkorn-ttf/pkg-descr
index 10e873ebcfb3..da21a961bb39 100644
--- a/x11-fonts/vollkorn-ttf/pkg-descr
+++ b/x11-fonts/vollkorn-ttf/pkg-descr
@@ -6,4 +6,4 @@ butter use. Unlike its examples in the book faces from the renaissance until
 today, it has dark and meaty serifs and a bouncing and healthy look. It might
 be used as body type as well as for headlines or titles.
 
-WWW: http://friedrichalthausen.de/vollkorn/
+WWW: http://vollkorn-typeface.com/
diff --git a/x11-fonts/vollkorn-ttf/pkg-plist b/x11-fonts/vollkorn-ttf/pkg-plist
index d2ba228a54b7..2cb6f7dc6bf9 100644
--- a/x11-fonts/vollkorn-ttf/pkg-plist
+++ b/x11-fonts/vollkorn-ttf/pkg-plist
@@ -1,8 +1,12 @@
-lib/X11/fonts/vollkorn-ttf/Vollkorn-Bold.ttf
-lib/X11/fonts/vollkorn-ttf/Vollkorn-BoldItalic.ttf
-lib/X11/fonts/vollkorn-ttf/Vollkorn-Italic.ttf
-lib/X11/fonts/vollkorn-ttf/Vollkorn-Regular.ttf
-@dirrm lib/X11/fonts/vollkorn-ttf
+%%FONTDIR%%/Vollkorn-Bold.ttf
+%%FONTDIR%%/Vollkorn-BoldItalic.ttf
+%%FONTDIR%%/Vollkorn-Italic.ttf
+%%FONTDIR%%/Vollkorn-Medium.ttf
+%%FONTDIR%%/Vollkorn-MediumItalic.ttf
+%%FONTDIR%%/Vollkorn-Regular.ttf
+%%FONTDIR%%/Vollkorn-Semibold.ttf
+%%FONTDIR%%/Vollkorn-SemiboldItalic.ttf
+@dirrm %%FONTDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/Fontlog.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%