[pkgsrc/trunk]: pkgsrc/print/dvipdfmx Update to dvipdfmx 20140525

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f372689ccb2
branches:  trunk
changeset: 650655:2f372689ccb2
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Apr 25 13:07:05 2015 +0000

description:
Update to dvipdfmx 20140525

now incorporates xdvipdfmx.

diffstat:

 print/dvipdfmx/Makefile                  |  20 +++++++++++++-------
 print/dvipdfmx/PLIST                     |   5 ++++-
 print/dvipdfmx/distinfo                  |  12 ++++++------
 print/dvipdfmx/patches/patch-Makefile.in |  14 ++++++++++++++
 print/dvipdfmx/patches/patch-ab          |  14 --------------
 print/dvipdfmx/patches/patch-ac          |   6 +++---
 6 files changed, 40 insertions(+), 31 deletions(-)

diffs (144 lines):

diff -r 325f5885f982 -r 2f372689ccb2 print/dvipdfmx/Makefile
--- a/print/dvipdfmx/Makefile   Sat Apr 25 12:14:16 2015 +0000
+++ b/print/dvipdfmx/Makefile   Sat Apr 25 13:07:05 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2015/02/24 21:44:35 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2015/04/25 13:07:05 markd Exp $
 
-DISTNAME=      texlive-20130530-source
-PKGNAME=       dvipdfmx-20130405
+DISTNAME=      texlive-20140525-source
+PKGNAME=       dvipdfmx-20140525
 CATEGORIES=    print converters
-MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
+MASTER_SITES=  ftp://tug.org/historic/systems/texlive/2014/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    minskim%NetBSD.org@localhost
@@ -17,15 +17,18 @@
 DEPENDS+=      tex-texlive-scripts-[0-9]*:../../print/tex-texlive-scripts
 
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
-                       ${DISTNAME}/texk/dvipdfmx
+                       ${DISTNAME}/texk/dvipdfm-x
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    pkg-config
-WRKSRC=                ${WRKDIR}/${DISTNAME}/texk/dvipdfmx
+WRKSRC=                ${WRKDIR}/${DISTNAME}/texk/dvipdfm-x
 
 CONFIG_GUESS_OVERRIDE+=        ${WRKDIR}/${DISTNAME}/build-aux/config.guess
 CONFIG_SUB_OVERRIDE+=  ${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
+CONFIGURE_ARGS+=       --with-system-freetype2 \
+               --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2 \
+               --with-freetype2-libdir=${BUILDLINK_PREFIX.freetype2}/lib
 CONFIGURE_ARGS+=       --with-system-kpathsea \
                --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
                --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
@@ -33,7 +36,9 @@
                --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
                --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
 CONFIGURE_ARGS+=       --with-system-libpng
-CONFIGURE_ARGS+=       --with-paper=${BUILDLINK_PREFIX.libpaper}
+CONFIGURE_ARGS+=       --with-system-libpaper \
+               --with-libpaper-includes=${BUILDLINK_PREFIX.libpaper}/include \
+               --with-libpaper-libdir=${BUILDLINK_PREFIX.libpaper}/lib
 
 PKG_SYSCONFSUBDIR=     texmf
 
@@ -53,6 +58,7 @@
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
 .include "../../print/libpaper/buildlink3.mk"
diff -r 325f5885f982 -r 2f372689ccb2 print/dvipdfmx/PLIST
--- a/print/dvipdfmx/PLIST      Sat Apr 25 12:14:16 2015 +0000
+++ b/print/dvipdfmx/PLIST      Sat Apr 25 13:07:05 2015 +0000
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.15 2013/11/17 17:29:18 minskim Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/04/25 13:07:05 markd Exp $
 bin/dvipdfm
 bin/dvipdfmx
 bin/dvipdft
 bin/ebb
 bin/extractbb
+bin/xdvipdfmx
 man/man1/dvipdfm.1
+man/man1/dvipdfmx.1
 man/man1/dvipdft.1
 man/man1/ebb.1
 man/man1/extractbb.1
+man/man1/xdvipdfmx.1
 share/texmf-dist/dvipdfmx/dvipdfmx.cfg
diff -r 325f5885f982 -r 2f372689ccb2 print/dvipdfmx/distinfo
--- a/print/dvipdfmx/distinfo   Sat Apr 25 12:14:16 2015 +0000
+++ b/print/dvipdfmx/distinfo   Sat Apr 25 13:07:05 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2013/11/17 17:29:18 minskim Exp $
+$NetBSD: distinfo,v 1.12 2015/04/25 13:07:05 markd Exp $
 
-SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61
-RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18
-Size (texlive-20130530-source.tar.xz) = 179963948 bytes
-SHA1 (patch-ab) = 69c25aeffb695bd16bd7e7b83f583921428dd7bd
-SHA1 (patch-ac) = 3f6ff6cb655bfefb1525d576ffda5751415e7857
+SHA1 (texlive-20140525-source.tar.xz) = 8cb283ad26b1fe18e1089820cf64ecc63d8224e8
+RMD160 (texlive-20140525-source.tar.xz) = c9fb954e63e700d06aa0cf40c37cdb40eaac84a2
+Size (texlive-20140525-source.tar.xz) = 41657688 bytes
+SHA1 (patch-Makefile.in) = 526a2eab50395bcc9c0f2aa11a0d20034f93a02b
+SHA1 (patch-ac) = 2bbaa28a6cf16c8a14b0f190387d6443c6b260d9
 SHA1 (patch-ad) = 2ad3326e8a06b2bfccbd8ae20cde70748944a02f
diff -r 325f5885f982 -r 2f372689ccb2 print/dvipdfmx/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/dvipdfmx/patches/patch-Makefile.in  Sat Apr 25 13:07:05 2015 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/04/25 13:07:05 markd Exp $
+
+--- Makefile.in.orig   2015-04-25 12:22:13.000000000 +0000
++++ Makefile.in
+@@ -2137,8 +2137,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-dist_cmapdataDATA install-dist_configdataDATA \
+-      install-dist_glyphlistdataDATA install-dist_mapdataDATA \
++install-data-am: install-dist_configdataDATA \
+       install-man
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff -r 325f5885f982 -r 2f372689ccb2 print/dvipdfmx/patches/patch-ab
--- a/print/dvipdfmx/patches/patch-ab   Sat Apr 25 12:14:16 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2013/11/17 17:29:18 minskim Exp $
-
---- data/Makefile.in.orig      2013-02-08 12:05:33.000000000 +0000
-+++ data/Makefile.in
-@@ -480,8 +480,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-dist_cmapdataDATA install-dist_configdataDATA \
--      install-dist_glyphlistdataDATA install-dist_mapdataDATA
-+install-data-am: install-dist_configdataDATA
- 
- install-dvi: install-dvi-am
- 
diff -r 325f5885f982 -r 2f372689ccb2 print/dvipdfmx/patches/patch-ac
--- a/print/dvipdfmx/patches/patch-ac   Sat Apr 25 12:14:16 2015 +0000
+++ b/print/dvipdfmx/patches/patch-ac   Sat Apr 25 13:07:05 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2010/01/16 03:52:41 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2015/04/25 13:07:05 markd Exp $
 
---- src/dvipdft.orig   2009-06-03 15:54:21.000000000 -0700
-+++ src/dvipdft
+--- dvipdft.orig       2009-06-03 15:54:21.000000000 -0700
++++ dvipdft
 @@ -98,8 +98,8 @@ dvipdfm ${1+"$@"} -z0 "$dvifile"
  
  # run gs