From nobody@FreeBSD.org  Tue Mar 18 11:41:13 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id D228BF2E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 18 Mar 2014 11:41:13 +0000 (UTC)
Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id BE88025D
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 18 Mar 2014 11:41:13 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2IBfC5b094314
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 18 Mar 2014 11:41:12 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2IBfCOj094310;
	Tue, 18 Mar 2014 11:41:12 GMT
	(envelope-from nobody)
Message-Id: <201403181141.s2IBfCOj094310@cgiserv.freebsd.org>
Date: Tue, 18 Mar 2014 11:41:12 GMT
From: Boris Samorodov <bsam@passap.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] x11-fonts/vollkorn-ttf: update to version 3.003
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         187695
>Category:       ports
>Synopsis:       [patch] x11-fonts/vollkorn-ttf: update to version 3.003
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rakuco
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 18 11:50:00 UTC 2014
>Closed-Date:    Sun Mar 23 21:31:22 UTC 2014
>Last-Modified:  Sun Mar 23 21:40:00 UTC 2014
>Originator:     Boris Samorodov
>Release:        FreeBSD 10-amd64
>Organization:
BSDprint
>Environment:
FreeBSD srv.bb.tel.ru 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
A new version is available:
http://vollkorn-typeface.com/
>How-To-Repeat:

>Fix:
. update to version 3.003;
. incorporate pkg-message using;
. use FONTSDIR variable at pkg-plist.

A note to the maintainer: there are more then only ttf fonts at the distribution now.

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 348523)
+++ Makefile	(working copy)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	vollkorn-ttf
-PORTVERSION=	2.1
+PORTVERSION=	3.003
 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,16 +15,19 @@
 NO_WRKSUBDIR=	yes
 USES=		zip
 
-FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
+FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
+SUB_LIST=	FONTSDIR=${FONTSDIR}
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} Vollkorn-*.ttf ${FONTDIR}
+		${INSTALL_DATA} TTF/Vollkorn-*.ttf ${STAGEDIR}${FONTSDIR}
 
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} Fontlog.txt OFL-FAQ.txt ${STAGEDIR}${DOCSDIR}
 
Index: distinfo
===================================================================
--- distinfo	(revision 348523)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (Vollkorn-2.1.zip) = 2eaa427dbe42e37bfdc182c1e3446abdc889806fe0b6c9a14e0fc0c3acc997f5
-SIZE (Vollkorn-2.1.zip) = 139737
+SHA256 (vollkorn-3-003.zip) = dcf7913f1f29f044950984276e1119ef64e8a158f48e3ae159b2e152ce2b3e5f
+SIZE (vollkorn-3-003.zip) = 1715770
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 0)
+++ files/pkg-message.in	(working copy)
@@ -0,0 +1,8 @@
+Make sure that the freetype module is loaded.  If it is not, add the following
+line to the "Modules" section of your X Windows configuration file:
+
+        Load "freetype"
+
+Add the following line to the "Files" section of X Windows configuration file:
+
+        FontPath "%%FONTSDIR%%/"

Property changes on: files/pkg-message.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 348523)
+++ pkg-plist	(working copy)
@@ -1,7 +1,11 @@
-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
+%%FONTSDIR%%/Vollkorn-Bold.ttf
+%%FONTSDIR%%/Vollkorn-BoldItalic.ttf
+%%FONTSDIR%%/Vollkorn-Italic.ttf
+%%FONTSDIR%%/Vollkorn-Medium.ttf
+%%FONTSDIR%%/Vollkorn-MediumItalic.ttf
+%%FONTSDIR%%/Vollkorn-Regular.ttf
+%%FONTSDIR%%/Vollkorn-Semibold.ttf
+%%FONTSDIR%%/Vollkorn-SemiboldItalic.ttf
 @dirrm lib/X11/fonts/vollkorn-ttf
 %%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/Fontlog.txt


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rakuco 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Mar 18 11:50:05 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187695 

From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc: bsam@FreeBSD.org
Subject: Re: ports/187695: [patch] x11-fonts/vollkorn-ttf: update to version 3.003
Date: Sun, 23 Mar 2014 23:28:50 +0200

 Hi Boris,
 
 Thanks for the patch, I hadn't noticed Vollkorn had a website of its own
 now. I'm going to commit a patch based on yours with the following
 differences:
 
 * It updates the port to 3.005, which was released after you sent your
   PR.
 * It doesn't change the ${MKDIR} calls to @${MKDIR} -- I prefer to keep
   those calls explicit as much as possible.
 * I'm not including the new pkg-message. At this point, I belive it's
   presence in fonts ports is mostly cargo-cult: most of the time there
   isn't even a need for xorg.conf to exist, and freetype+fontconfig take
   care of detecting the new fonts automatically.
State-Changed-From-To: open->closed 
State-Changed-By: rakuco 
State-Changed-When: Sun Mar 23 21:31:20 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=187695 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187695: commit references a PR
Date: Sun, 23 Mar 2014 21:31:13 +0000 (UTC)

 Author: rakuco
 Date: Sun Mar 23 21:31:08 2014
 New Revision: 348891
 URL: http://svnweb.freebsd.org/changeset/ports/348891
 QAT: https://qat.redports.org/buildarchive/r348891/
 
 Log:
   - 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@
 
 Modified:
   head/x11-fonts/vollkorn-ttf/Makefile
   head/x11-fonts/vollkorn-ttf/distinfo
   head/x11-fonts/vollkorn-ttf/pkg-descr
   head/x11-fonts/vollkorn-ttf/pkg-plist
 
 Modified: head/x11-fonts/vollkorn-ttf/Makefile
 ==============================================================================
 --- head/x11-fonts/vollkorn-ttf/Makefile	Sun Mar 23 21:27:02 2014	(r348890)
 +++ head/x11-fonts/vollkorn-ttf/Makefile	Sun Mar 23 21:31:08 2014	(r348891)
 @@ -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} && \
 
 Modified: head/x11-fonts/vollkorn-ttf/distinfo
 ==============================================================================
 --- head/x11-fonts/vollkorn-ttf/distinfo	Sun Mar 23 21:27:02 2014	(r348890)
 +++ head/x11-fonts/vollkorn-ttf/distinfo	Sun Mar 23 21:31:08 2014	(r348891)
 @@ -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
 
 Modified: head/x11-fonts/vollkorn-ttf/pkg-descr
 ==============================================================================
 --- head/x11-fonts/vollkorn-ttf/pkg-descr	Sun Mar 23 21:27:02 2014	(r348890)
 +++ head/x11-fonts/vollkorn-ttf/pkg-descr	Sun Mar 23 21:31:08 2014	(r348891)
 @@ -6,4 +6,4 @@ butter use. Unlike its examples in the b
  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/
 
 Modified: head/x11-fonts/vollkorn-ttf/pkg-plist
 ==============================================================================
 --- head/x11-fonts/vollkorn-ttf/pkg-plist	Sun Mar 23 21:27:02 2014	(r348890)
 +++ head/x11-fonts/vollkorn-ttf/pkg-plist	Sun Mar 23 21:31:08 2014	(r348891)
 @@ -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%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
