Update tex-pst-pdf{,-doc} to 1.2a

  Adjust to tex-graphics-def

3 files changed, 38 insertions, 30 deletions

diff --git a/graphics/tex-pst-pdf/Makefile b/graphics/tex-pst-pdf/Makefile
index e257fa1c3db..a5f45a42319 100644
--- a/graphics/tex-pst-pdf/Makefile
+++ b/graphics/tex-pst-pdf/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:05:53 markd Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/07 10:38:00 markd Exp $
 
 DISTNAME=	pst-pdf
-PKGNAME=	tex-${DISTNAME}-1.1v
-TEXLIVE_REV=	15878
-PKGREVISION=	2
+PKGNAME=	tex-${DISTNAME}-1.2a
+TEXLIVE_REV=	41710
 
 MAINTAINER=	minskim@NetBSD.org
+HOMEPAGE=	http://ctan.org/pkg/pst-pdf
 COMMENT=	Make PDF versions of graphics by processing between runs
 LICENSE=	lppl-1.3c
 
@@ -13,9 +13,9 @@ CONFLICTS=	texlive-pdftools<2011
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 DEPENDS+=	tex-environ-[0-9]*:../../print/tex-environ
 DEPENDS+=	tex-graphics-[0-9]*:../../print/tex-graphics
+DEPENDS+=	tex-graphics-def-[0-9]*:../../print/tex-graphics-def
 DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=	tex-pdfcrop-[0-9]*:../../graphics/tex-pdfcrop
-DEPENDS+=	tex-pdftex-def-[0-9]*:../../print/tex-pdftex-def
 DEPENDS+=	tex-preview-[0-9]*:../../print/tex-preview
 DEPENDS+=	tex-pstricks-[0-9]*:../../graphics/tex-pstricks
 
@@ -38,12 +38,12 @@ SUBST_SED.paths+=	-e 's,@SED@,${TOOLS_PATH.sed},g'
 
 INSTALLATION_DIRS+=	bin
 
-TEXLIVE_IGNORE_PATTERNS=	scripts/pst-pdf/ps4pdf.bat*
+TEXLIVE_IGNORE_PATTERNS=	texmf-dist/scripts/pst-pdf/ps4pdf.bat*
 
 .include "../../print/texlive/package.mk"
 
 post-extract:
 	${MKDIR} ${WRKSRC}/bin
-	${MV} ${WRKSRC}/scripts/pst-pdf/ps4pdf ${WRKSRC}/bin/
+	${MV} ${WRKSRC}/texmf-dist/scripts/pst-pdf/ps4pdf ${WRKSRC}/bin/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tex-pst-pdf/distinfo b/graphics/tex-pst-pdf/distinfo
index c4f26dcc3c9..e2135964b27 100644
--- a/graphics/tex-pst-pdf/distinfo
+++ b/graphics/tex-pst-pdf/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 21:34:30 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/08/07 10:38:00 markd Exp $
 
-SHA1 (tex-pst-pdf-15878/pst-pdf.tar.xz) = 8448ff53ef5a4d2fd03f011b0e4bbea9183054dd
-RMD160 (tex-pst-pdf-15878/pst-pdf.tar.xz) = e24702d1604374ca29c8533735408b6d8b655105
-SHA512 (tex-pst-pdf-15878/pst-pdf.tar.xz) = afbe48a5e62197a5bd8ece59b0aef0c05db7e79b92a001f8119f44f72867a33bd0a2dd06db6808c56aada35a432208c435e00ad8b4fd212542e8a2a5ba4f823e
-Size (tex-pst-pdf-15878/pst-pdf.tar.xz) = 7036 bytes
-SHA1 (patch-bin_ps4pdf) = eaac6f08c2f29005a5076b3873407a7b180563cd
+SHA1 (tex-pst-pdf-41710/pst-pdf.tar.xz) = d3caf2ec905b1b1018e928d0efd64d6ec0626896
+RMD160 (tex-pst-pdf-41710/pst-pdf.tar.xz) = 4a6641cb27ddbafcdad1f8414c73b84cb0d4597e
+SHA512 (tex-pst-pdf-41710/pst-pdf.tar.xz) = 57a94ea0e18b02bfed98d75e031da554156cd1d6b422fba67ebac1f54c34d26c2700c8d8c6ccbc54af498285368faf0f80edb2d4942e11f768dd7b6d0e2555ff
+Size (tex-pst-pdf-41710/pst-pdf.tar.xz) = 7288 bytes
+SHA1 (patch-bin_ps4pdf) = e27eb9cce0e9fbf45f332a7ef20f1fbfbc4ac5e9
diff --git a/graphics/tex-pst-pdf/patches/patch-bin_ps4pdf b/graphics/tex-pst-pdf/patches/patch-bin_ps4pdf
index ff0038ec5e1..abbe068742a 100644
--- a/graphics/tex-pst-pdf/patches/patch-bin_ps4pdf
+++ b/graphics/tex-pst-pdf/patches/patch-bin_ps4pdf
@@ -1,8 +1,24 @@
-$NetBSD: patch-bin_ps4pdf,v 1.1.1.1 2011/10/27 18:24:57 minskim Exp $
+$NetBSD: patch-bin_ps4pdf,v 1.2 2016/08/07 10:38:00 markd Exp $
 
---- bin/ps4pdf.orig	2008-08-08 14:55:48.000000000 -0700
-+++ bin/ps4pdf	2011-10-27 11:15:07.000000000 -0700
-@@ -115,19 +115,19 @@
+--- bin/ps4pdf.orig	2016-07-15 23:20:24.000000000 +0000
++++ bin/ps4pdf
+@@ -88,11 +88,11 @@ log=$tmpdir/log
+ version="1.0"
+ 
+ ## the defaults
+-ENGINE1=latex
++ENGINE1=@LATEX@
+ OPTIONS=
+-ENGINE2=pdflatex
+-DVIPS=dvips
+-PS2PDF=ps2pdf
++ENGINE2=@PDFLATEX@
++DVIPS=@DVIPS@
++PS2PDF=@PS2PDF@
+ FILE=$1
+ 
+ # look for optional things first
+@@ -134,7 +134,7 @@ fi
  
  # jobname von TeX: Verzeichnisse entfernen, evtl. vorhandene Extension
  # entfernen.
@@ -10,21 +26,13 @@ $NetBSD: patch-bin_ps4pdf,v 1.1.1.1 2011/10/27 18:24:57 minskim Exp $
 +job=`echo "x$1" | @SED@ 's@x@@; s@.*/@@; s@\.[^.]*$@@'`
  
  setupTmpDir
--myexec latex \
-+myexec @LATEX@ \
-     "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}"
--test -f "$job.dvi" && myexec dvips -o "$job-pics.ps" "$job.dvi"
--test -f "$job-pics.ps" && myexec ps2pdf \
-+test -f "$job.dvi" && myexec @DVIPS@ -o "$job-pics.ps" "$job.dvi"
-+test -f "$job-pics.ps" && myexec @PS2PDF@ \
-   "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf"
+ myexec ${ENGINE1} ${OPTIONS} "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$FILE}"
+@@ -148,7 +148,7 @@ fi
+ test -f "$job-pics.ps" && myexec ${PS2PDF} "$ps2pdf_opts" "$job-pics.ps" "$job-pics.pdf"
+ 
  if $crop; then
 -  myexec pdfcrop "$job-pics.pdf" "$job-pics-crop.pdf" 
 +  myexec @PDFCROP@ "$job-pics.pdf" "$job-pics-crop.pdf" 
    mv "$job-pics-crop.pdf" "$job-pics.pdf"
  fi
--myexec pdflatex \
-+myexec @PDFLATEX@ \
-     "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$file}"
- true
- cleanup
+ myexec ${ENGINE2} "\AtBeginDocument{\RequirePackage{pst-pdf}} \input{$FILE}"