svn commit: r354253 - head/x11-fonts/dina

[Raphael Kubo da Costa]

Author: rakuco
Date: Fri May 16 18:46:00 2014
New Revision: 354253
URL: http://svnweb.freebsd.org/changeset/ports/354253
QAT: https://qat.redports.org/buildarchive/r354253/

Log:
  Update to 2.92.
  
  Packaging changes include:
  - Staging support.
  - Switch LICENSE to MIT following what upstream has done.
  - My repackaged tarball now contains the source BDF files, and the PCF files
    are generated as part of the build process to follow what upstream does
    more closely.
    To be clear, the only reason for me to keep a repackaged tarball is the
    fact that upstream just hosts a "dina.zip" with no version information and
    which can change at any moment.

Modified:
  head/x11-fonts/dina/Makefile
  head/x11-fonts/dina/distinfo
  head/x11-fonts/dina/pkg-plist

Modified: head/x11-fonts/dina/Makefile
==============================================================================
--- head/x11-fonts/dina/Makefile	Fri May 16 18:21:33 2014	(r354252)
+++ head/x11-fonts/dina/Makefile	Fri May 16 18:46:00 2014	(r354253)
@@ -1,35 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	dina
-PORTVERSION=	2.89
+PORTVERSION=	2.92
 CATEGORIES=	x11-fonts
 MASTER_SITES=	LOCAL/rakuco
 
 MAINTAINER=	rakuco at FreeBSD.org
 COMMENT=	A monospace bitmap font, primarily aimed at programmers
 
-# IANAL, but the license looks close enough to a standard BSD license that
-# auto-accept and all the other permissions look like reasonable defaults here.
-LICENSE=	custom
-LICENSE_NAME=	Custom License
-LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE=	MIT
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
 
 FONTDIR=	lib/X11/fonts/${PORTNAME}
-NO_BUILD=	yes
-PLIST_SUB+=	FONTDIR=${FONTDIR}
+PLIST_SUB=	FONTDIR=${FONTDIR}
 
-NO_STAGE=	yes
-do-install:
-	@${MKDIR} ${PREFIX}/${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${PREFIX}/${FONTDIR}
+BDFLIST=	Dina_i400-10.bdf Dina_i400-8.bdf Dina_i400-9.bdf \
+		Dina_i700-10.bdf Dina_i700-8.bdf Dina_i700-9.bdf \
+		Dina_r400-10.bdf Dina_r400-6.bdf Dina_r400-8.bdf \
+		Dina_r400-9.bdf Dina_r700-10.bdf Dina_r700-8.bdf \
+		Dina_r700-9.bdf
+
+do-build:
+.for BDF in ${BDFLIST}
+	cd ${WRKSRC}/BDF && bdftopcf -t -o ${BDF:S/.bdf/.pcf/} ${BDF}
+.endfor
+	${GZIP_CMD} ${WRKSRC}/BDF/*.pcf
 
-post-install:
-	@cd ${PREFIX}/${FONTDIR} && mkfontdir
-	@${CP} ${PREFIX}/${FONTDIR}/fonts.dir ${PREFIX}/${FONTDIR}/fonts.scale
-	@command fc-cache -f -v ${PREFIX}/${FONTDIR}
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/BDF/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/dina/distinfo
==============================================================================
--- head/x11-fonts/dina/distinfo	Fri May 16 18:21:33 2014	(r354252)
+++ head/x11-fonts/dina/distinfo	Fri May 16 18:46:00 2014	(r354253)
@@ -1,2 +1,2 @@
-SHA256 (dina-2.89.tar.gz) = eaa67fe2a8fc69944bd3010cbf6d946177f0e2204dcb0ce70ebd0637d816f43a
-SIZE (dina-2.89.tar.gz) = 52559
+SHA256 (dina-2.92.tar.gz) = 8a40d6bc6e9dcc49b660f849084d40399cac8124a7314569dfaea4359d10f9a4
+SIZE (dina-2.92.tar.gz) = 69175

Modified: head/x11-fonts/dina/pkg-plist
==============================================================================
--- head/x11-fonts/dina/pkg-plist	Fri May 16 18:21:33 2014	(r354252)
+++ head/x11-fonts/dina/pkg-plist	Fri May 16 18:46:00 2014	(r354253)
@@ -1,15 +1,14 @@
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-%%FONTDIR%%/DinaBold10.pcf.gz
-%%FONTDIR%%/DinaBold8.pcf.gz
-%%FONTDIR%%/DinaBold9.pcf.gz
-%%FONTDIR%%/DinaBoldItalic10.pcf.gz
-%%FONTDIR%%/DinaBoldItalic8.pcf.gz
-%%FONTDIR%%/DinaBoldItalic9.pcf.gz
-%%FONTDIR%%/DinaItalic10.pcf.gz
-%%FONTDIR%%/DinaItalic8.pcf.gz
-%%FONTDIR%%/DinaItalic9.pcf.gz
-%%FONTDIR%%/DinaMedium10.pcf.gz
-%%FONTDIR%%/DinaMedium8.pcf.gz
-%%FONTDIR%%/DinaMedium9.pcf.gz
+%%FONTDIR%%/Dina_i400-10.pcf.gz
+%%FONTDIR%%/Dina_i400-8.pcf.gz
+%%FONTDIR%%/Dina_i400-9.pcf.gz
+%%FONTDIR%%/Dina_i700-10.pcf.gz
+%%FONTDIR%%/Dina_i700-8.pcf.gz
+%%FONTDIR%%/Dina_i700-9.pcf.gz
+%%FONTDIR%%/Dina_r400-10.pcf.gz
+%%FONTDIR%%/Dina_r400-6.pcf.gz
+%%FONTDIR%%/Dina_r400-8.pcf.gz
+%%FONTDIR%%/Dina_r400-9.pcf.gz
+%%FONTDIR%%/Dina_r700-10.pcf.gz
+%%FONTDIR%%/Dina_r700-8.pcf.gz
+%%FONTDIR%%/Dina_r700-9.pcf.gz
 @dirrm %%FONTDIR%%