Update to texlive 2015.

pdfTEX: Support JPEG Exif as well as JFIF; do not even emit a warning if
 \pdfinclusionerrorlevel is negative; sync with xpdf 3.04.
LuaTEX: New library newtokenlib for scanning tokens; bug fixes in the normal
 random number generator and other places.
XeTEX: Image handling fixes; xdvipdfmx binary looked for first as a sibling
 to xetex; internal XDV opcodes changed.
MetaPost: New numbersystem binary; new Japanese-enabled upmpost and
 updvitomp programs, analogous to up*tex.
Infrastructure: The fmtutil script has been reimplemented to read
 fmtutil.cnf on a per-tree basis, analogous to updmap. Web2C mktex* scripts
 (including mktexlsr, mktextfm, mktexpk) now prefer programs in their own
 directory, instead of always using the existing PATH.

4 files changed, 20 insertions, 18 deletions

diff --git a/print/ptexenc/Makefile b/print/ptexenc/Makefile
index e55f63e603c..d0786fcd7ea 100644
--- a/print/ptexenc/Makefile
+++ b/print/ptexenc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 09:36:43 markd Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/14 12:50:00 markd Exp $
 
-DISTNAME=	texlive-20140525-source
-PKGNAME=	ptexenc-1.3.2
+DISTNAME=	texlive-20150521-source
+PKGNAME=	ptexenc-1.3.3
 CATEGORIES=	print
-MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
+MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
@@ -16,13 +16,14 @@ EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/ptexenc
 CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
 CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
+PKGCONFIG_OVERRIDE=	ptexenc.pc.in
 
-CONFIGURE_ARGS+=	--with-system-kpathsea \
-		--with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
-		--with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
+CONFIGURE_ARGS+=	--with-system-kpathsea
 
+BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ptexenc/PLIST b/print/ptexenc/PLIST
index 469bb0e424a..92e28b6cbfd 100644
--- a/print/ptexenc/PLIST
+++ b/print/ptexenc/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2015/04/25 09:53:16 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/06/14 12:50:00 markd Exp $
 include/ptexenc/ptexenc.h
 include/ptexenc/unicode.h
 include/ptexenc/unicode-jp.h
 lib/libptexenc.la
+lib/pkgconfig/ptexenc.pc
diff --git a/print/ptexenc/distinfo b/print/ptexenc/distinfo
index 05d9d0b6f83..3155cb6fbea 100644
--- a/print/ptexenc/distinfo
+++ b/print/ptexenc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/04/25 09:53:16 markd Exp $
+$NetBSD: distinfo,v 1.7 2015/06/14 12:50:00 markd Exp $
 
-SHA1 (texlive-20140525-source.tar.xz) = 8cb283ad26b1fe18e1089820cf64ecc63d8224e8
-RMD160 (texlive-20140525-source.tar.xz) = c9fb954e63e700d06aa0cf40c37cdb40eaac84a2
-Size (texlive-20140525-source.tar.xz) = 41657688 bytes
-SHA1 (patch-texk_ptexenc_Makefile.in) = 6b787bb289a75b372df7b94b8ba0eb43064487d9
+SHA1 (texlive-20150521-source.tar.xz) = a32df8d5d6b61f87f7dab907e864fb51b14f4143
+RMD160 (texlive-20150521-source.tar.xz) = fced0e58a7bd15d19e11d72baed23ac14fd2be13
+Size (texlive-20150521-source.tar.xz) = 45459552 bytes
+SHA1 (patch-texk_ptexenc_Makefile.in) = 2d110e53d604c405140abf05646a79aecb393ede
diff --git a/print/ptexenc/patches/patch-texk_ptexenc_Makefile.in b/print/ptexenc/patches/patch-texk_ptexenc_Makefile.in
index 382d6b5290f..f2f1b7de584 100644
--- a/print/ptexenc/patches/patch-texk_ptexenc_Makefile.in
+++ b/print/ptexenc/patches/patch-texk_ptexenc_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-texk_ptexenc_Makefile.in,v 1.1 2015/04/25 09:53:16 markd Exp $
+$NetBSD: patch-texk_ptexenc_Makefile.in,v 1.2 2015/06/14 12:50:00 markd Exp $
 
---- Makefile.in.orig	2013-12-25 15:37:50.000000000 +0000
+--- Makefile.in.orig	2015-03-12 14:42:02.000000000 +0000
 +++ Makefile.in
-@@ -381,7 +381,8 @@ libptexenc_la_SOURCES = \
+@@ -396,7 +396,8 @@ libptexenc_la_SOURCES = \
  libptexenc_la_LIBADD = $(KPATHSEA_LIBS)
  nobase_include_HEADERS = \
  	ptexenc/ptexenc.h \
@@ -10,5 +10,5 @@ $NetBSD: patch-texk_ptexenc_Makefile.in,v 1.1 2015/04/25 09:53:16 markd Exp $
 +	ptexenc/unicode.h \
 +	ptexenc/unicode-jp.h
  
- EXTRA_DIST = COPYRIGHT ChangeLog.jp
- 
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = ptexenc.pc