From c690df8911bd64c4d3055e0d3ea992d86d6a0d43 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 16 Dec 2010 15:25:40 +0000 Subject: cleanup psutils and ps2eps PATCHES git-svn-id: svn://tug.org/texlive/trunk@20764 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/utils/psutils/psutils-1.17-PATCHES/ChangeLog | 4 ++-- .../utils/psutils/psutils-1.17-PATCHES/patch-02-PERL | 11 +++++++---- .../psutils/psutils-1.17-PATCHES/patch-07-fixmacps | 17 ----------------- 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-fixmacps (limited to 'Build/source/utils/psutils') diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog b/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog index b8ea380e2d5..e901e5c181a 100644 --- a/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog +++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog @@ -1,6 +1,6 @@ -2010-12-13 Peter Breitenlohner +2010-12-16 Peter Breitenlohner - * patch-07-fixmacps (new): Adapt to new kpsewhich semantics and + * patch-02-PERL: Adapt to new kpsewhich semantics and texmf layout. Change basename => dirname and add 'use File::Basename'. diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL index e595d1e3348..241b9602465 100644 --- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL +++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL @@ -12,14 +12,17 @@ diff -ur psutils-1.17.orig/fixmacps.man psutils-1.17/fixmacps.man Copyright (C) Angus J. C. Duggan 1991-1995 diff -ur psutils-1.17.orig/fixmacps.pl psutils-1.17/fixmacps.pl --- psutils-1.17.orig/fixmacps.pl 1997-03-11 23:52:54.000000000 +0100 -+++ psutils-1.17/fixmacps.pl 2006-01-17 22:16:42.000000000 +0100 -@@ -5,7 +5,8 @@ ++++ psutils-1.17/fixmacps.pl 2010-12-13 15:04:50.000000000 +0100 +@@ -4,8 +4,11 @@ + # Copyright (C) Angus J. C. Duggan 1991-1995 # See file LICENSE for details. ++use File::Basename; ++ $line = 0; # keep line count -$dir = "@INCLUDE@"; -+$predir = `kpsewhich -progname=psutils md71_0.ps`; -+$dir=`basename $predir`; ++$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`; ++$dir=`dirname $predir`; $prefix = "md"; $default = "md71_0.ps"; diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-fixmacps b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-fixmacps deleted file mode 100644 index 177e3e8c1f1..00000000000 --- a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-07-fixmacps +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur psutils-1.17.orig/fixmacps.pl psutils-1.17/fixmacps.pl ---- psutils-1.17.orig/fixmacps.pl 2006-01-17 22:16:42.000000000 +0100 -+++ psutils-1.17/fixmacps.pl 2010-12-13 15:04:50.973928757 +0100 -@@ -4,9 +4,11 @@ - # Copyright (C) Angus J. C. Duggan 1991-1995 - # See file LICENSE for details. - -+use File::Basename; -+ - $line = 0; # keep line count --$predir = `kpsewhich -progname=psutils md71_0.ps`; --$dir=`basename $predir`; -+$predir = `kpsewhich -progname=dvips -format="other text files" md71_0.ps`; -+$dir=`dirname $predir`; - $prefix = "md"; - $default = "md71_0.ps"; - -- cgit v1.2.3