install linked perl scripts

git-svn-id: svn://tug.org/texlive/trunk@21006 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 216 insertions, 29 deletions

diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog
index f28c1a495da..57be815b953 100644
--- a/Build/source/utils/ps2eps/ChangeLog
+++ b/Build/source/utils/ps2eps/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac: Install linked perl script.
+
 2010-12-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import ps2eps-1.68.
diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am
index e0c4a4ce3fe..55e463af293 100644
--- a/Build/source/utils/ps2eps/Makefile.am
+++ b/Build/source/utils/ps2eps/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory utils/ps2eps/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -21,10 +21,52 @@ bin_PROGRAMS = bbox
 bbox_SOURCES = \
 	$(PS2EPS_TREE)/src/C/bbox.c
 
-bin_SCRIPTS = \
-	$(PS2EPS_TREE)/bin/ps2eps
-
 man1_MANS = \
 	$(PS2EPS_TREE)/doc/man/man1/bbox.1 \
 	$(PS2EPS_TREE)/doc/man/man1/ps2eps.1
 
+perl_scripts = ps2eps
+
+scriptsdir = texmf/scripts/ps2eps
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
+
+if WIN32
+if WIN32_WRAP
+## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
+nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
+runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+$(nodist_bin_SCRIPTS): $(runscript)
+	$(LN_S) $(runscript) $@
+endif WIN32_WRAP
+endif WIN32
+
+install-data-hook:
+if !WIN32
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+	     exit 1;; \
+	esac
+endif !WIN32
+
+.PHONY: install-links
+install-links:
+	@cd $(DESTDIR)$(bindir) && \
+	  for f in $(perl_scripts); do \
+	    rm -f $$f; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
+	  done  
+
+uninstall-hook:
+if !WIN32
+	@for f in $(perl_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+endif !WIN32
+
+CLEANFILES = $(nodist_bin_SCRIPTS)
+
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index 7624ddcf4ea..8f4f4e06ed7 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -55,7 +55,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)"
+	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_bbox_OBJECTS = bbox.$(OBJEXT)
 bbox_OBJECTS = $(am_bbox_OBJECTS)
@@ -81,7 +81,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-SCRIPTS = $(bin_SCRIPTS)
+SCRIPTS = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -133,6 +133,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -200,13 +201,17 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 bbox_SOURCES = \
 	$(PS2EPS_TREE)/src/C/bbox.c
 
-bin_SCRIPTS = \
-	$(PS2EPS_TREE)/bin/ps2eps
-
 man1_MANS = \
 	$(PS2EPS_TREE)/doc/man/man1/bbox.1 \
 	$(PS2EPS_TREE)/doc/man/man1/ps2eps.1
 
+perl_scripts = ps2eps
+scriptsdir = texmf/scripts/ps2eps
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
+@WIN32_TRUE@@WIN32_WRAP_TRUE@nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+CLEANFILES = $(nodist_bin_SCRIPTS)
 all: all-am
 
 .SUFFIXES:
@@ -285,10 +290,10 @@ clean-binPROGRAMS:
 bbox$(EXEEXT): $(bbox_OBJECTS) $(bbox_DEPENDENCIES) 
 	@rm -f bbox$(EXEEXT)
 	$(LINK) $(bbox_OBJECTS) $(bbox_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
+install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -311,14 +316,48 @@ install-binSCRIPTS: $(bin_SCRIPTS)
 	     } \
 	; done
 
-uninstall-binSCRIPTS:
+uninstall-nodist_binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+install-nodist_texmfSCRIPTS: $(nodist_texmf_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(texmfdir)" || $(MKDIR_P) "$(DESTDIR)$(texmfdir)"
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-nodist_texmfSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(texmfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(texmfdir)" && rm -f $$files
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -609,7 +648,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -629,6 +668,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -660,13 +700,14 @@ info: info-am
 
 info-am:
 
-install-data-am: install-man
-
+install-data-am: install-man install-nodist_texmfSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
+install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
 
 install-html: install-html-am
 
@@ -707,11 +748,13 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man
-
+uninstall-am: uninstall-binPROGRAMS uninstall-man \
+	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
@@ -719,21 +762,48 @@ uninstall-man: uninstall-man1
 	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-binSCRIPTS \
-	install-data install-data-am install-dvi install-dvi-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-data-hook install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man1 \
+	install-nodist_binSCRIPTS install-nodist_texmfSCRIPTS \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-man uninstall-man1
+	uninstall-hook uninstall-man uninstall-man1 \
+	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
 
 
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(nodist_bin_SCRIPTS): $(runscript)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
+
+install-data-hook:
+@WIN32_FALSE@	case "$(bindir)" in \
+@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+@WIN32_FALSE@	     exit 1;; \
+@WIN32_FALSE@	esac
+
+.PHONY: install-links
+install-links:
+	@cd $(DESTDIR)$(bindir) && \
+	  for f in $(perl_scripts); do \
+	    rm -f $$f; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
+	  done  
+
+uninstall-hook:
+@WIN32_FALSE@	@for f in $(perl_scripts); do \
+@WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+@WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+@WIN32_FALSE@	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/utils/ps2eps/configure b/Build/source/utils/ps2eps/configure
index 5e3a9c23c9a..ecbd01046bb 100755
--- a/Build/source/utils/ps2eps/configure
+++ b/Build/source/utils/ps2eps/configure
@@ -564,15 +564,18 @@ PACKAGE_STRING='ps2eps for TeX Live 1.68'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="ps2eps-1.68/bin/ps2eps"
+ac_unique_file="ps2eps-1.68/bin/ps2eps.pl"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 PS2EPS_TREE
+WIN32_WRAP_FALSE
+WIN32_WRAP_TRUE
 WIN32_FALSE
 WIN32_TRUE
 WARNING_CFLAGS
+LN_S
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -3286,6 +3289,49 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
 # Check whether --enable-compiler-warnings was given.
 if test "${enable_compiler_warnings+set}" = set; then :
   enableval=$enable_compiler_warnings;
@@ -3408,6 +3454,14 @@ else
   WIN32_FALSE=
 fi
 
+ if test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe; then
+  WIN32_WRAP_TRUE=
+  WIN32_WRAP_FALSE='#'
+else
+  WIN32_WRAP_TRUE='#'
+  WIN32_WRAP_FALSE=
+fi
+
 
 PS2EPS_TREE=ps2eps-1.68
 
@@ -3584,6 +3638,10 @@ if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
   as_fn_error $? "conditional \"WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then
+  as_fn_error $? "conditional \"WIN32_WRAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/Build/source/utils/ps2eps/configure.ac b/Build/source/utils/ps2eps/configure.ac
index 9456d699ffb..24b60952c3f 100644
--- a/Build/source/utils/ps2eps/configure.ac
+++ b/Build/source/utils/ps2eps/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@ dnl
 m4_define([ps2eps_version], [1.68])[]dnl using unmodified ps2eps source tree
 AC_INIT([ps2eps for TeX Live], ps2eps_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([ps2eps-]ps2eps_version[/bin/ps2eps])
+AC_CONFIG_SRCDIR([ps2eps-]ps2eps_version[/bin/ps2eps.pl])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -17,11 +17,16 @@ AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
 
 KPSE_COMPILER_WARNINGS
 
 KPSE_CHECK_WIN32
 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+AM_CONDITIONAL([WIN32_WRAP],
+               [test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe])
 
 AC_SUBST([PS2EPS_TREE], [ps2eps-]ps2eps_version)
 
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog
index 34bb1d5afab..6023ae4f0be 100644
--- a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog
+++ b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Renamed bin/ps2eps => bin/ps2eps.pl.
+	* patch-03-PERL: Adapted.
+
 2010-12-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-04-whitespace:
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/TL-Changes b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/TL-Changes
index 59fffabaabf..4384be0aad6 100644
--- a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/TL-Changes
+++ b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/TL-Changes
@@ -1,6 +1,9 @@
 Changes applied to the ps2eps-1.68 tree as obtained from:
 	http://www.tm.uka.de/~bless/ps2eps-1.68.tar.gz
 
+Rename:
+	bin/ps2eps => bin/ps2eps.pl
+
 Remove:
 	bin/linux/
 	bin/win32/
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-03-PERL b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-03-PERL
index bdefc3f8617..a87d185c1ed 100644
--- a/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-03-PERL
+++ b/Build/source/utils/ps2eps/ps2eps-1.68-PATCHES/patch-03-PERL
@@ -1,6 +1,6 @@
-diff -ur ps2eps-1.68.orig/bin/ps2eps ps2eps-1.68/bin/ps2eps
---- ps2eps-1.68.orig/bin/ps2eps	2010-08-31 10:58:37.000000000 +0200
-+++ ps2eps-1.68/bin/ps2eps	2010-12-15 14:05:24.000000000 +0100
+diff -ur ps2eps-1.68.orig/bin/ps2eps.pl ps2eps-1.68/bin/ps2eps.pl
+--- ps2eps-1.68.orig/bin/ps2eps.pl	2010-08-31 10:58:37.000000000 +0200
++++ ps2eps-1.68/bin/ps2eps.pl	2010-12-15 14:05:24.000000000 +0100
 @@ -1,5 +1,4 @@
 -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' # -*-perl-*-
 -        if 0;
diff --git a/Build/source/utils/ps2eps/ps2eps-1.68/bin/ps2eps b/Build/source/utils/ps2eps/ps2eps-1.68/bin/ps2eps.pl
index 7daa8752bff..7daa8752bff 100755
--- a/Build/source/utils/ps2eps/ps2eps-1.68/bin/ps2eps
+++ b/Build/source/utils/ps2eps/ps2eps-1.68/bin/ps2eps.pl