utils/psutils build: use orig source from ctan + patches

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

75 files changed, 840 insertions, 197 deletions

diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog
index a3b8a56b3b9..0099cb99dc1 100644
--- a/Build/source/utils/psutils/ChangeLog
+++ b/Build/source/utils/psutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import original psutils-1.17, patches in psutils-1.17-PATCHES.
+	* Makefile.am, configure.ac, ...: Adapted.
+
 2010-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* config.h: Do not #include <win32lib.h> for MinGW32.
diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am
index 27c7f57d06a..e64b1f96a81 100644
--- a/Build/source/utils/psutils/Makefile.am
+++ b/Build/source/utils/psutils/Makefile.am
@@ -1,10 +1,19 @@
 ## Makefile.am for the TeX Live subdirectory utils/psutils/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
+## We want to re-distribute the whole original psutils source tree.
+EXTRA_DIST = $(PSUTILS_TREE)
+## Patches applied to the original source tree
+EXTRA_DIST += $(PSUTILS_TREE)-PATCHES
+
+# in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
+
 OS = UNIX
 PAPER = a4
 
@@ -14,59 +23,55 @@ AM_CFLAGS = $(WARNING_CFLAGS)
 bin_PROGRAMS = epsffit psbook psnup psresize psselect pstops
 
 epsffit_SOURCES = \
-	config.h \
-	epsffit.c \
-	pserror.c \
-	pserror.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/epsffit.c \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h
 
 psbook_SOURCES = \
-	config.h \
-	psbook.c \
-	pserror.c \
-	pserror.h \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/psbook.c \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 psnup_SOURCES = \
-	config.h \
-	pserror.c \
-	pserror.h \
-	psnup.c \
-	psspec.c \
-	psspec.h \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psnup.c \
+	$(PSUTILS_TREE)/psspec.c \
+	$(PSUTILS_TREE)/psspec.h \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 psresize_SOURCES = \
-	config.h \
-	pserror.c \
-	pserror.h \
-	psresize.c \
-	psspec.c \
-	psspec.h \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psresize.c \
+	$(PSUTILS_TREE)/psspec.c \
+	$(PSUTILS_TREE)/psspec.h \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 psselect_SOURCES = \
-	config.h \
-	pserror.c \
-	pserror.h \
-	psselect.c \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psselect.c \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 pstops_SOURCES = \
-	pserror.c \
-	pserror.h \
-	psspec.c \
-	psspec.h \
-	pstops.c \
-	psutil.c \
-	psutil.h
-
-## 
-EXTRA_DIST = \
-	LICENSE
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psspec.c \
+	$(PSUTILS_TREE)/psspec.h \
+	$(PSUTILS_TREE)/pstops.c \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 perl_scripts = extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \
 	fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge
@@ -77,8 +82,8 @@ nodist_bin_SCRIPTS = $(perl_scripts)
 
 install-exec-hook:
 	@for f in $(shell_scripts); do \
-	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
-	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
+	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$(PSUTILS_TREE)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
+	  $(INSTALL_SCRIPT) "$(srcdir)/$(PSUTILS_TREE)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
 uninstall-hook:
@@ -87,56 +92,36 @@ uninstall-hook:
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
-dist_man1_MANS = \
-	fixdlsrps.man \
-	fixfmps.man \
-	fixmacps.man \
-	fixpsditps.man \
-	fixpspps.man \
-	fixscribeps.man \
-	fixtpps.man \
-	fixwfwps.man \
-	fixwpps.man \
-	fixwwps.man \
-	getafm.man \
-	includeres.man \
-	psmerge.man
-
 nodist_man1_MANS = \
 	epsffit.1\
 	extractres.1 \
+	fixdlsrps.1 \
+	fixfmps.1 \
+	fixmacps.1 \
+	fixpsditps.1 \
+	fixpspps.1 \
+	fixscribeps.1 \
+	fixtpps.1 \
+	fixwfwps.1 \
+	fixwpps.1 \
+	fixwwps.1 \
+	getafm.1 \
+	includeres.1 \
 	psbook.1 \
+	psmerge.1 \
 	psnup.1 \
 	psresize.1 \
 	psselect.1 \
 	pstops.1
 
-EXTRA_DIST += $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(nodist_man1_MANS:.1=.man)
-
 CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_man1_MANS)
 
 PERL = /usr/bin/env perl
-MAKETEXT = $(PERL) $(srcdir)/maketext
+MAKETEXT = $(PERL) $(srcdir)/$(PSUTILS_TREE)/maketext
 
-EXTRA_DIST += maketext
-
-%: %.pl
+%: $(PSUTILS_TREE)/%.pl
 	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@
 
-%.1: %.man
-	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@
-
-## Not used
-##
-EXTRA_DIST += \
-	Makefile.bcc \
-	Makefile.msc \
-	Makefile.nt \
-	Makefile.os2 \
-	Makefile.sc \
-	Makefile.unix \
-	Makefile.wat \
-	descrip.mms \
-	md68_0.ps \
-	md71_0.ps
+%.1: $(PSUTILS_TREE)/%.man
+	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(nodist_man1_MANS)" $< >$@
 
diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in
index 73c0edf9783..b27a557ded3 100644
--- a/Build/source/utils/psutils/Makefile.in
+++ b/Build/source/utils/psutils/Makefile.in
@@ -36,16 +36,15 @@ POST_UNINSTALL = :
 bin_PROGRAMS = epsffit$(EXEEXT) psbook$(EXEEXT) psnup$(EXEEXT) \
 	psresize$(EXEEXT) psselect$(EXEEXT) pstops$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
-	$(srcdir)/../../build-aux/depcomp \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/patchlev.h.in \
-	$(top_srcdir)/configure ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/ltmain.sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ChangeLog
+	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+	$(top_srcdir)/psutils-1.17/patchlev.h.in \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/configure.ac
@@ -118,7 +117,7 @@ DIST_SOURCES = $(epsffit_SOURCES) $(psbook_SOURCES) $(psnup_SOURCES) \
 	$(psresize_SOURCES) $(psselect_SOURCES) $(pstops_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
-MANS = $(dist_man1_MANS) $(nodist_man1_MANS)
+MANS = $(nodist_man1_MANS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +169,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PSUTILS_TREE = @PSUTILS_TREE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -218,89 +218,84 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
+EXTRA_DIST = $(PSUTILS_TREE) $(PSUTILS_TREE)-PATCHES
 OS = UNIX
 PAPER = a4
 AM_CPPFLAGS = -DUNIX -DPAPER=\"$(PAPER)\"
 AM_CFLAGS = $(WARNING_CFLAGS)
 epsffit_SOURCES = \
-	config.h \
-	epsffit.c \
-	pserror.c \
-	pserror.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/epsffit.c \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h
 
 psbook_SOURCES = \
-	config.h \
-	psbook.c \
-	pserror.c \
-	pserror.h \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/psbook.c \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 psnup_SOURCES = \
-	config.h \
-	pserror.c \
-	pserror.h \
-	psnup.c \
-	psspec.c \
-	psspec.h \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psnup.c \
+	$(PSUTILS_TREE)/psspec.c \
+	$(PSUTILS_TREE)/psspec.h \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 psresize_SOURCES = \
-	config.h \
-	pserror.c \
-	pserror.h \
-	psresize.c \
-	psspec.c \
-	psspec.h \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psresize.c \
+	$(PSUTILS_TREE)/psspec.c \
+	$(PSUTILS_TREE)/psspec.h \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 psselect_SOURCES = \
-	config.h \
-	pserror.c \
-	pserror.h \
-	psselect.c \
-	psutil.c \
-	psutil.h
+	$(PSUTILS_TREE)/config.h \
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psselect.c \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
 
 pstops_SOURCES = \
-	pserror.c \
-	pserror.h \
-	psspec.c \
-	psspec.h \
-	pstops.c \
-	psutil.c \
-	psutil.h
-
-EXTRA_DIST = LICENSE $(perl_scripts:=.pl) $(shell_scripts:=.sh) \
-	$(nodist_man1_MANS:.1=.man) maketext Makefile.bcc Makefile.msc \
-	Makefile.nt Makefile.os2 Makefile.sc Makefile.unix \
-	Makefile.wat descrip.mms md68_0.ps md71_0.ps
+	$(PSUTILS_TREE)/pserror.c \
+	$(PSUTILS_TREE)/pserror.h \
+	$(PSUTILS_TREE)/psspec.c \
+	$(PSUTILS_TREE)/psspec.h \
+	$(PSUTILS_TREE)/pstops.c \
+	$(PSUTILS_TREE)/psutil.c \
+	$(PSUTILS_TREE)/psutil.h
+
 perl_scripts = extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \
 	fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge
 
 shell_scripts = getafm showchar
 nodist_bin_SCRIPTS = $(perl_scripts)
-dist_man1_MANS = \
-	fixdlsrps.man \
-	fixfmps.man \
-	fixmacps.man \
-	fixpsditps.man \
-	fixpspps.man \
-	fixscribeps.man \
-	fixtpps.man \
-	fixwfwps.man \
-	fixwpps.man \
-	fixwwps.man \
-	getafm.man \
-	includeres.man \
-	psmerge.man
-
 nodist_man1_MANS = \
 	epsffit.1\
 	extractres.1 \
+	fixdlsrps.1 \
+	fixfmps.1 \
+	fixmacps.1 \
+	fixpsditps.1 \
+	fixpspps.1 \
+	fixscribeps.1 \
+	fixtpps.1 \
+	fixwfwps.1 \
+	fixwpps.1 \
+	fixwwps.1 \
+	getafm.1 \
+	includeres.1 \
 	psbook.1 \
+	psmerge.1 \
 	psnup.1 \
 	psresize.1 \
 	psselect.1 \
@@ -308,7 +303,7 @@ nodist_man1_MANS = \
 
 CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_man1_MANS)
 PERL = /usr/bin/env perl
-MAKETEXT = $(PERL) $(srcdir)/maketext
+MAKETEXT = $(PERL) $(srcdir)/$(PSUTILS_TREE)/maketext
 all: all-am
 
 .SUFFIXES:
@@ -347,7 +342,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
-patchlev.h: $(top_builddir)/config.status $(srcdir)/patchlev.h.in
+patchlev.h: $(top_builddir)/config.status $(top_srcdir)/psutils-1.17/patchlev.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -468,10 +463,136 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-install-man1: $(dist_man1_MANS) $(nodist_man1_MANS)
+
+epsffit.o: $(PSUTILS_TREE)/epsffit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT epsffit.o -MD -MP -MF $(DEPDIR)/epsffit.Tpo -c -o epsffit.o `test -f '$(PSUTILS_TREE)/epsffit.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/epsffit.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/epsffit.Tpo $(DEPDIR)/epsffit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/epsffit.c' object='epsffit.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o epsffit.o `test -f '$(PSUTILS_TREE)/epsffit.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/epsffit.c
+
+epsffit.obj: $(PSUTILS_TREE)/epsffit.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT epsffit.obj -MD -MP -MF $(DEPDIR)/epsffit.Tpo -c -o epsffit.obj `if test -f '$(PSUTILS_TREE)/epsffit.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/epsffit.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/epsffit.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/epsffit.Tpo $(DEPDIR)/epsffit.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/epsffit.c' object='epsffit.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o epsffit.obj `if test -f '$(PSUTILS_TREE)/epsffit.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/epsffit.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/epsffit.c'; fi`
+
+pserror.o: $(PSUTILS_TREE)/pserror.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pserror.o -MD -MP -MF $(DEPDIR)/pserror.Tpo -c -o pserror.o `test -f '$(PSUTILS_TREE)/pserror.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/pserror.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pserror.Tpo $(DEPDIR)/pserror.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/pserror.c' object='pserror.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pserror.o `test -f '$(PSUTILS_TREE)/pserror.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/pserror.c
+
+pserror.obj: $(PSUTILS_TREE)/pserror.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pserror.obj -MD -MP -MF $(DEPDIR)/pserror.Tpo -c -o pserror.obj `if test -f '$(PSUTILS_TREE)/pserror.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/pserror.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/pserror.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pserror.Tpo $(DEPDIR)/pserror.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/pserror.c' object='pserror.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pserror.obj `if test -f '$(PSUTILS_TREE)/pserror.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/pserror.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/pserror.c'; fi`
+
+psbook.o: $(PSUTILS_TREE)/psbook.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psbook.o -MD -MP -MF $(DEPDIR)/psbook.Tpo -c -o psbook.o `test -f '$(PSUTILS_TREE)/psbook.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psbook.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psbook.Tpo $(DEPDIR)/psbook.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psbook.c' object='psbook.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psbook.o `test -f '$(PSUTILS_TREE)/psbook.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psbook.c
+
+psbook.obj: $(PSUTILS_TREE)/psbook.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psbook.obj -MD -MP -MF $(DEPDIR)/psbook.Tpo -c -o psbook.obj `if test -f '$(PSUTILS_TREE)/psbook.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psbook.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psbook.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psbook.Tpo $(DEPDIR)/psbook.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psbook.c' object='psbook.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psbook.obj `if test -f '$(PSUTILS_TREE)/psbook.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psbook.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psbook.c'; fi`
+
+psutil.o: $(PSUTILS_TREE)/psutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psutil.o -MD -MP -MF $(DEPDIR)/psutil.Tpo -c -o psutil.o `test -f '$(PSUTILS_TREE)/psutil.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psutil.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psutil.Tpo $(DEPDIR)/psutil.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psutil.c' object='psutil.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psutil.o `test -f '$(PSUTILS_TREE)/psutil.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psutil.c
+
+psutil.obj: $(PSUTILS_TREE)/psutil.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psutil.obj -MD -MP -MF $(DEPDIR)/psutil.Tpo -c -o psutil.obj `if test -f '$(PSUTILS_TREE)/psutil.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psutil.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psutil.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psutil.Tpo $(DEPDIR)/psutil.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psutil.c' object='psutil.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psutil.obj `if test -f '$(PSUTILS_TREE)/psutil.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psutil.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psutil.c'; fi`
+
+psnup.o: $(PSUTILS_TREE)/psnup.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psnup.o -MD -MP -MF $(DEPDIR)/psnup.Tpo -c -o psnup.o `test -f '$(PSUTILS_TREE)/psnup.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psnup.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psnup.Tpo $(DEPDIR)/psnup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psnup.c' object='psnup.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psnup.o `test -f '$(PSUTILS_TREE)/psnup.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psnup.c
+
+psnup.obj: $(PSUTILS_TREE)/psnup.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psnup.obj -MD -MP -MF $(DEPDIR)/psnup.Tpo -c -o psnup.obj `if test -f '$(PSUTILS_TREE)/psnup.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psnup.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psnup.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psnup.Tpo $(DEPDIR)/psnup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psnup.c' object='psnup.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psnup.obj `if test -f '$(PSUTILS_TREE)/psnup.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psnup.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psnup.c'; fi`
+
+psspec.o: $(PSUTILS_TREE)/psspec.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psspec.o -MD -MP -MF $(DEPDIR)/psspec.Tpo -c -o psspec.o `test -f '$(PSUTILS_TREE)/psspec.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psspec.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psspec.Tpo $(DEPDIR)/psspec.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psspec.c' object='psspec.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psspec.o `test -f '$(PSUTILS_TREE)/psspec.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psspec.c
+
+psspec.obj: $(PSUTILS_TREE)/psspec.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psspec.obj -MD -MP -MF $(DEPDIR)/psspec.Tpo -c -o psspec.obj `if test -f '$(PSUTILS_TREE)/psspec.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psspec.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psspec.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psspec.Tpo $(DEPDIR)/psspec.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psspec.c' object='psspec.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psspec.obj `if test -f '$(PSUTILS_TREE)/psspec.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psspec.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psspec.c'; fi`
+
+psresize.o: $(PSUTILS_TREE)/psresize.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psresize.o -MD -MP -MF $(DEPDIR)/psresize.Tpo -c -o psresize.o `test -f '$(PSUTILS_TREE)/psresize.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psresize.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psresize.Tpo $(DEPDIR)/psresize.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psresize.c' object='psresize.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psresize.o `test -f '$(PSUTILS_TREE)/psresize.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psresize.c
+
+psresize.obj: $(PSUTILS_TREE)/psresize.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psresize.obj -MD -MP -MF $(DEPDIR)/psresize.Tpo -c -o psresize.obj `if test -f '$(PSUTILS_TREE)/psresize.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psresize.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psresize.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psresize.Tpo $(DEPDIR)/psresize.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psresize.c' object='psresize.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psresize.obj `if test -f '$(PSUTILS_TREE)/psresize.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psresize.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psresize.c'; fi`
+
+psselect.o: $(PSUTILS_TREE)/psselect.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psselect.o -MD -MP -MF $(DEPDIR)/psselect.Tpo -c -o psselect.o `test -f '$(PSUTILS_TREE)/psselect.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psselect.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psselect.Tpo $(DEPDIR)/psselect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psselect.c' object='psselect.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psselect.o `test -f '$(PSUTILS_TREE)/psselect.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/psselect.c
+
+psselect.obj: $(PSUTILS_TREE)/psselect.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psselect.obj -MD -MP -MF $(DEPDIR)/psselect.Tpo -c -o psselect.obj `if test -f '$(PSUTILS_TREE)/psselect.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psselect.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psselect.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/psselect.Tpo $(DEPDIR)/psselect.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/psselect.c' object='psselect.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psselect.obj `if test -f '$(PSUTILS_TREE)/psselect.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/psselect.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/psselect.c'; fi`
+
+pstops.o: $(PSUTILS_TREE)/pstops.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pstops.o -MD -MP -MF $(DEPDIR)/pstops.Tpo -c -o pstops.o `test -f '$(PSUTILS_TREE)/pstops.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/pstops.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pstops.Tpo $(DEPDIR)/pstops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/pstops.c' object='pstops.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pstops.o `test -f '$(PSUTILS_TREE)/pstops.c' || echo '$(srcdir)/'`$(PSUTILS_TREE)/pstops.c
+
+pstops.obj: $(PSUTILS_TREE)/pstops.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pstops.obj -MD -MP -MF $(DEPDIR)/pstops.Tpo -c -o pstops.obj `if test -f '$(PSUTILS_TREE)/pstops.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/pstops.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/pstops.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pstops.Tpo $(DEPDIR)/pstops.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(PSUTILS_TREE)/pstops.c' object='pstops.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pstops.obj `if test -f '$(PSUTILS_TREE)/pstops.c'; then $(CYGPATH_W) '$(PSUTILS_TREE)/pstops.c'; else $(CYGPATH_W) '$(srcdir)/$(PSUTILS_TREE)/pstops.c'; fi`
+install-man1: $(nodist_man1_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(dist_man1_MANS) $(nodist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	@list='$(nodist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	{ for i in $$list; do echo "$$i"; done; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
@@ -495,7 +616,7 @@ install-man1: $(dist_man1_MANS) $(nodist_man1_MANS)
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_man1_MANS) $(nodist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	@list='$(nodist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
@@ -600,6 +721,9 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -829,26 +953,31 @@ uninstall-man: uninstall-man1
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz 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-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-hook \
-	install-html install-html-am install-info install-info-am \
-	install-man install-man1 install-nodist_binSCRIPTS install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+	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-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-nodist_binSCRIPTS 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-hook \
 	uninstall-man uninstall-man1 uninstall-nodist_binSCRIPTS
 
 
+# in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
+
 install-exec-hook:
 	@for f in $(shell_scripts); do \
-	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
-	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
+	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$(PSUTILS_TREE)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
+	  $(INSTALL_SCRIPT) "$(srcdir)/$(PSUTILS_TREE)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
 uninstall-hook:
@@ -857,11 +986,11 @@ uninstall-hook:
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
-%: %.pl
+%: $(PSUTILS_TREE)/%.pl
 	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@
 
-%.1: %.man
-	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@
+%.1: $(PSUTILS_TREE)/%.man
+	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(nodist_man1_MANS)" $< >$@
 
 # 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/psutils/configure b/Build/source/utils/psutils/configure
index f91826809b1..6b9f8f3d45d 100755
--- a/Build/source/utils/psutils/configure
+++ b/Build/source/utils/psutils/configure
@@ -564,11 +564,12 @@ PACKAGE_STRING='psutils for TeX Live 1.17'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="psutil.c"
+ac_unique_file="psutils-1.17/psutil.c"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+PSUTILS_TREE
 WARNING_CFLAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
@@ -3350,7 +3351,10 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-ac_config_files="$ac_config_files Makefile patchlev.h"
+PSUTILS_TREE=psutils-1.17
+
+
+ac_config_files="$ac_config_files Makefile patchlev.h:psutils-1.17/patchlev.h.in"
 
 
 cat >confcache <<\_ACEOF
@@ -4104,7 +4108,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "patchlev.h") CONFIG_FILES="$CONFIG_FILES patchlev.h" ;;
+    "patchlev.h") CONFIG_FILES="$CONFIG_FILES patchlev.h:psutils-1.17/patchlev.h.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/utils/psutils/configure.ac b/Build/source/utils/psutils/configure.ac
index 99cc24e4140..b3641ee0fc3 100644
--- a/Build/source/utils/psutils/configure.ac
+++ b/Build/source/utils/psutils/configure.ac
@@ -1,14 +1,15 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2010 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,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([psutils for TeX Live], [1.17], [tex-k@tug.org])
+m4_define([psutils_version], [1.17])[]dnl using unmodified psutils source tree
+AC_INIT([psutils for TeX Live], psutils_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([psutil.c])
+AC_CONFIG_SRCDIR([psutils-]psutils_version[/psutil.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -19,6 +20,10 @@ AC_PROG_CC
 
 KPSE_COMPILER_WARNINGS
 
-AC_CONFIG_FILES([Makefile patchlev.h])
+PSUTILS_TREE=psutils-[]psutils_version
+AC_SUBST([PSUTILS_TREE])
+
+AC_CONFIG_FILES([Makefile
+                 patchlev.h:psutils-]psutils_version[/patchlev.h.in])
 
 AC_OUTPUT
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog b/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog
new file mode 100644
index 00000000000..272c6fd3381
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/ChangeLog
@@ -0,0 +1,10 @@
+2010-12-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Patches applied to psutils-1.17 as obtained from CTAN.
+	* patch-01-WIN32: Added various #ifdef WIN32.
+	* patch-02-PERL: Handling of perl scripts.
+	* patch-03-main-is-int: Changed return type of main() from void
+	to int; changed exit at end into return.
+	* patch-04-warnings: Avoid various compiler warnings.
+	* patch-05-const: Constify strings.
+	* patch-06-MINGW: Do not #include <win32lib.h> for MinGW32.
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes b/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
new file mode 100644
index 00000000000..91f4c1c1016
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
@@ -0,0 +1,3 @@
+Changes applied to the psutils-1.17 tree as obtained from:
+	http://mirror.ctan.org/support/psutils/psutils-p17.tar.gz
+
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32 b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32
new file mode 100644
index 00000000000..fe2f4afab44
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-01-WIN32
@@ -0,0 +1,129 @@
+diff -ur psutils-1.17.orig/config.h psutils-1.17/config.h
+--- psutils-1.17.orig/config.h	1997-03-11 23:52:52.000000000 +0100
++++ psutils-1.17/config.h	2006-01-17 22:16:42.000000000 +0100
+@@ -4,13 +4,16 @@
+  * OS specific configuration for PSUtils
+  */
+ 
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+ #define TMPDIR "\\tmp"
+ #define OPEN_READ "rb"
+ #define OPEN_WRITE "wb"
+ #include <fcntl.h>
+ #include <io.h>
+-#else /* ! MSDOS && ! WINNT */
++#if defined(WIN32)
++#include <win32lib.h>
++#endif /* WIN32 */
++#else /* ! MSDOS && ! WINNT && ! WIN32 */
+ #if defined(OS2)
+ #define TMPDIR "."
+ #define OPEN_READ "rb"
+@@ -26,5 +29,5 @@
+ #define TMPDIR "/tmp"
+ #endif /* ! VMS */
+ #endif /* ! OS2 */
+-#endif /* ! MSDOS && ! WINNT */
++#endif /* ! MSDOS && ! WINNT && !WIN32 */
+ 
+diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
+--- psutils-1.17.orig/epsffit.c	1997-03-11 23:52:52.000000000 +0100
++++ psutils-1.17/epsffit.c	2006-01-17 22:16:42.000000000 +0100
+@@ -75,7 +75,7 @@
+       if(!(input = fopen(argv[4], OPEN_READ)))
+ 	 message(FATAL, "can't open input file %s\n", argv[4]);
+    } else {
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+       int fd = fileno(stdin) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+          message(FATAL, "can't reset stdin to binary mode\n");
+@@ -87,7 +87,7 @@
+       if(!(output = fopen(argv[5], OPEN_WRITE)))
+ 	 message(FATAL, "can't open output file %s\n", argv[5]);
+    } else {
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+       int fd = fileno(stdout) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+          message(FATAL, "can't reset stdout to binary mode\n");
+diff -ur psutils-1.17.orig/psbook.c psutils-1.17/psbook.c
+--- psutils-1.17.orig/psbook.c	1997-03-11 23:53:01.000000000 +0100
++++ psutils-1.17/psbook.c	2006-01-17 22:16:42.000000000 +0100
+@@ -62,7 +62,7 @@
+ 	    message(FATAL, "can't open output file %s\n", *argv);
+       } else usage();
+    }
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+    if ( infile == stdin ) {
+       int fd = fileno(stdin) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
+--- psutils-1.17.orig/psnup.c	1997-03-11 23:53:02.000000000 +0100
++++ psutils-1.17/psnup.c	2006-01-17 22:16:42.000000000 +0100
+@@ -190,7 +190,7 @@
+ 	    message(FATAL, "can't open output file %s\n", *argv);
+       } else usage();
+    }
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+    if ( infile == stdin ) {
+       int fd = fileno(stdin) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+diff -ur psutils-1.17.orig/psresize.c psutils-1.17/psresize.c
+--- psutils-1.17.orig/psresize.c	1997-03-11 23:53:03.000000000 +0100
++++ psutils-1.17/psresize.c	2006-01-17 22:16:42.000000000 +0100
+@@ -114,7 +114,7 @@
+ 	    message(FATAL, "can't open output file %s\n", *argv);
+       } else usage();
+    }
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+    if ( infile == stdin ) {
+       int fd = fileno(stdin) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+diff -ur psutils-1.17.orig/psselect.c psutils-1.17/psselect.c
+--- psutils-1.17.orig/psselect.c	1997-03-11 23:53:03.000000000 +0100
++++ psutils-1.17/psselect.c	2006-01-17 22:16:42.000000000 +0100
+@@ -133,7 +133,7 @@
+ 	    message(FATAL, "can't open output file %s\n", *argv);
+       } else usage();
+    }
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+    if ( infile == stdin ) {
+       int fd = fileno(stdin) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
+--- psutils-1.17.orig/pstops.c	1997-03-11 23:53:04.000000000 +0100
++++ psutils-1.17/pstops.c	2006-01-17 22:16:42.000000000 +0100
+@@ -177,7 +177,7 @@
+    }
+    if (specs == NULL)
+       usage();
+-#if defined(MSDOS) || defined(WINNT)
++#if defined(MSDOS) || defined(WINNT) || defined(WIN32)
+    if ( infile == stdin ) {
+       int fd = fileno(stdin) ;
+       if ( setmode(fd, O_BINARY) < 0 )
+diff -ur psutils-1.17.orig/psutil.c psutils-1.17/psutil.c
+--- psutils-1.17.orig/psutil.c	1997-03-11 23:53:04.000000000 +0100
++++ psutils-1.17/psutil.c	2006-01-17 22:16:42.000000000 +0100
+@@ -85,13 +85,13 @@
+ #endif
+   char *p;
+   char buffer[BUFSIZ] ;
+-#if defined(WINNT)
++#if defined(WINNT) || defined(WIN32)
+   struct _stat fs ;
+ #else
+   long fpos;
+ #endif
+ 
+-#if defined(WINNT)
++#if defined(WINNT) || defined(WIN32)
+   if (_fstat(fileno(fp), &fs) == 0 && (fs.st_mode&_S_IFREG) != 0)
+     return (fp);
+ #else
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
new file mode 100644
index 00000000000..e595d1e3348
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-02-PERL
@@ -0,0 +1,79 @@
+diff -ur psutils-1.17.orig/fixmacps.man psutils-1.17/fixmacps.man
+--- psutils-1.17.orig/fixmacps.man	1997-03-11 23:52:54.000000000 +0100
++++ psutils-1.17/fixmacps.man	2006-01-17 22:16:42.000000000 +0100
+@@ -16,7 +16,7 @@
+ .B psutils
+ package.
+ .SH FILES
+-@INCLUDE@/md68_0.ps, @INCLUDE@/md71_0.ps - sanitised versions of the md
++md68_0.ps, md71_0.ps - sanitised versions of the md
+ prologue.
+ .SH AUTHOR
+ 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 @@
+ # See file LICENSE for details.
+ 
+ $line = 0;			# keep line count
+-$dir = "@INCLUDE@";
++$predir = `kpsewhich -progname=psutils md71_0.ps`;
++$dir=`basename $predir`;
+ $prefix = "md";
+ $default = "md71_0.ps";
+ 
+diff -ur psutils-1.17.orig/includeres.man psutils-1.17/includeres.man
+--- psutils-1.17.orig/includeres.man	1997-03-11 23:52:57.000000000 +0100
++++ psutils-1.17/includeres.man	2006-01-17 22:16:42.000000000 +0100
+@@ -26,8 +26,6 @@
+ or 
+ .I pstops
+ safely.
+-.SH FILES
+-@INCLUDE@ - system resource directory.
+ .SH AUTHOR
+ Copyright (C) Angus J. C. Duggan 1991-1995
+ .SH "SEE ALSO"
+diff -ur psutils-1.17.orig/includeres.pl psutils-1.17/includeres.pl
+--- psutils-1.17.orig/includeres.pl	1997-03-11 23:52:58.000000000 +0100
++++ psutils-1.17/includeres.pl	2006-01-17 22:16:42.000000000 +0100
+@@ -28,7 +28,7 @@
+       local($comment, @res) = split(/\s+/);
+       local($type) = defined($type{$comment}) ? $type{$comment} : shift(@res);
+       local($name) = &filename(@res);
+-      local($inc) = "@INCLUDE@"; # system include directory
++      local($inc) = ""; # system include directory
+       if (open(RES, $name) || open(RES, "$name$extn{$type}") ||
+ 	  open(RES, "$inc/$name") || open(RES, "$inc/$name$extn{$type}")) {
+ 	 while (<RES>) {
+diff -ur psutils-1.17.orig/maketext psutils-1.17/maketext
+--- psutils-1.17.orig/maketext	1997-03-11 23:52:59.000000000 +0100
++++ psutils-1.17/maketext	2006-01-17 22:16:42.000000000 +0100
+@@ -1,7 +1,4 @@
+-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+-   & eval 'exec perl -S $0 $argv:q'
+-   if 0;
+-
++#!/usr/bin/env perl
+ # maketext: perl filter to substitute names in scripts and man pages.
+ 
+ %change = ();			# names -> substitutions
+@@ -15,14 +12,16 @@
+ 
+ $os = "" ;
+ 
+-%perlstart = ("UNIX", "\#!PERL\neval 'exec perl -S \$0 \"\$\@\"'\n\tif \$running_under_some_shell;\n",
++%perlstart = ("UNIX", "\#!PERL",
+ 	      "DOS", "\@rem = '-*- Perl -*-\n\@echo off\nPERL -S %0.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9\ngoto endofperl\n';\n",
+ 	      "WINNT", "\@rem = '-*- Perl -*-\n\@echo off\nPERL -S %0.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9\ngoto endofperl\n';\n",
++	      "Win32", "\@rem = '-*- Perl -*-\n\@echo off\nPERL -S %0.cmd %1 %2 %3 %4 %5 %6 %7 %8 %9\ngoto endofperl\n';\n",
+ 	      "OS2", "extproc PERL -x\n\#! PERL\n",
+ 	      "", "PSUTILS MAKEFILE CONFIGURATION ERROR") ;
+ %perlend = ("UNIX", "",
+ 	    "DOS", "__END__\n:endofperl\n",
+ 	    "WINNT", "__END__\n:endofperl\n",
++	    "Win32", "__END__\n:endofperl\n",
+ 	    "OS2", "\# End of Script",
+ 	    "", "PSUTILS MAKEFILE CONFIGURATION ERROR");
+ 
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int
new file mode 100644
index 00000000000..c36e61686ce
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-03-main-is-int
@@ -0,0 +1,128 @@
+diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
+--- psutils-1.17.orig/epsffit.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/epsffit.c	2008-02-01 12:23:16.000000000 +0100
+@@ -39,7 +39,7 @@
+    exit(1);
+ }
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+    int bbfound = 0;              /* %%BoundingBox: found */
+    int urx, ury, llx, lly;
+@@ -185,5 +185,5 @@
+    } else
+       message(FATAL, "no %%%%BoundingBox:\n");
+ 
+-   exit(0);
++   return 0;
+ }
+diff -ur psutils-1.17.orig/psbook.c psutils-1.17/psbook.c
+--- psutils-1.17.orig/psbook.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/psbook.c	2008-02-01 12:23:16.000000000 +0100
+@@ -32,7 +32,7 @@
+ }
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int signature = 0;
+    int currentpg, maxpage;
+@@ -107,5 +107,5 @@
+    }
+    writetrailer();
+ 
+-   exit(0);
++   return 0;
+ }
+diff -ur psutils-1.17.orig/pserror.c psutils-1.17/pserror.c
+--- psutils-1.17.orig/pserror.c	1997-03-11 23:53:01.000000000 +0100
++++ psutils-1.17/pserror.c	2008-02-01 12:23:16.000000000 +0100
+@@ -24,7 +24,7 @@
+ void message(int flags, char *format, ...)
+ {
+   va_list args ;
+-  static column = 0 ;		/* current screen column for message wrap */
++  static int column = 0 ;	/* current screen column for message wrap */
+   char msgbuf[MAX_MESSAGE] ;	/* buffer in which to put the message */
+   char *bufptr = msgbuf ;	/* message buffer pointer */
+ 
+diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
+--- psutils-1.17.orig/psnup.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/psnup.c	2008-02-01 12:23:16.000000000 +0100
+@@ -66,7 +66,7 @@
+    return (0);
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int horiz, vert, rotate, column, flip, leftright, topbottom;
+    int nup = 1;
+@@ -331,6 +331,6 @@
+       pstops(nup, 1, 0, specs, draw);		/* do page rearrangement */
+    }
+ 
+-   exit(0);
++   return 0;
+ }
+ 
+diff -ur psutils-1.17.orig/psresize.c psutils-1.17/psresize.c
+--- psutils-1.17.orig/psresize.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/psresize.c	2008-02-01 12:23:16.000000000 +0100
+@@ -46,7 +46,7 @@
+ #define MIN(x,y) ((x) > (y) ? (y) : (x))
+ #define MAX(x,y) ((x) > (y) ? (x) : (y))
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    double scale, rscale;			/* page scale */
+    double waste, rwaste;			/* amount wasted */
+@@ -175,6 +175,6 @@
+       
+    pstops(1, 1, 0, specs, 0.0);		/* do page rearrangement */
+ 
+-   exit(0);
++   return 0;
+ }
+ 
+diff -ur psutils-1.17.orig/psselect.c psutils-1.17/psselect.c
+--- psutils-1.17.orig/psselect.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/psselect.c	2008-02-01 12:23:16.000000000 +0100
+@@ -91,7 +91,7 @@
+ }
+ 
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    int currentpg, maxpage = 0;
+    int even = 0, odd = 0, reverse = 0;
+@@ -235,5 +235,5 @@
+    }
+    writetrailer();
+ 
+-   exit(0);
++   return 0;
+ }
+diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
+--- psutils-1.17.orig/pstops.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/pstops.c	2008-02-01 12:23:16.000000000 +0100
+@@ -112,7 +112,7 @@
+    return (head);
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+    PageSpec *specs = NULL;
+    int nobinding = 0;
+@@ -194,5 +194,5 @@
+ 
+    pstops(modulo, pagesperspec, nobinding, specs, draw);
+ 
+-   exit(0);
++   return 0;
+ }
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings
new file mode 100644
index 00000000000..c8b957a185b
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-04-warnings
@@ -0,0 +1,41 @@
+diff -ur psutils-1.17.orig/epsffit.c psutils-1.17/epsffit.c
+--- psutils-1.17.orig/epsffit.c	2008-02-01 12:23:16.000000000 +0100
++++ psutils-1.17/epsffit.c	2009-06-24 00:22:15.000000000 +0200
+@@ -42,7 +42,7 @@
+ int main(int argc, char **argv)
+ {
+    int bbfound = 0;              /* %%BoundingBox: found */
+-   int urx, ury, llx, lly;
++   int urx = 0, ury = 0, llx = 0, lly = 0;	/* avoid uninitialized warning */
+    int furx, fury, fllx, flly;
+    int showpage = 0, centre = 0, rotate = 0, aspect = 0, maximise = 0;
+    char buf[BUFSIZ];
+diff -ur psutils-1.17.orig/psnup.c psutils-1.17/psnup.c
+--- psutils-1.17.orig/psnup.c	2008-02-01 12:23:16.000000000 +0100
++++ psutils-1.17/psnup.c	2009-06-24 00:18:08.000000000 +0200
+@@ -68,10 +68,11 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-   int horiz, vert, rotate, column, flip, leftright, topbottom;
++   int horiz = 0, vert = 0, rotate = 0;		/* avoid uninitialized warning */
++   int column, flip, leftright, topbottom;
+    int nup = 1;
+    double draw = 0;				/* draw page borders */
+-   double scale;				/* page scale */
++   double scale = 0;				/* page scale */
+    double uscale = 0;				/* user supplied scale */
+    double ppwid, pphgt;				/* paper dimensions */
+    double margin, border;			/* paper & page margins */
+diff -ur psutils-1.17.orig/pstops.c psutils-1.17/pstops.c
+--- psutils-1.17.orig/pstops.c	2008-02-01 12:23:16.000000000 +0100
++++ psutils-1.17/pstops.c	2009-06-24 00:18:08.000000000 +0200
+@@ -21,7 +21,7 @@
+ char pagelabel[BUFSIZ] ;
+ int pageno ;
+ 
+-void usage(void)
++static void usage(void)
+ {
+    fprintf(stderr, "%s release %d patchlevel %d\n", program, RELEASE, PATCHLEVEL);
+    fprintf(stderr, "Copyright (C) Angus J. C. Duggan, 1991-1995. See file LICENSE for details.\n");
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const
new file mode 100644
index 00000000000..ce8b5ca4920
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-05-const
@@ -0,0 +1,114 @@
+diff -ur psutils-1.17.orig/pserror.c psutils-1.17/pserror.c
+--- psutils-1.17.orig/pserror.c	2008-02-01 12:23:16.000000000 +0100
++++ psutils-1.17/pserror.c	2009-09-01 13:40:27.000000000 +0200
+@@ -21,7 +21,7 @@
+ #define MAX_FORMAT	16	/* maximum format length */
+ #define MAX_COLUMN	78	/* maximum column to print upto */
+ 
+-void message(int flags, char *format, ...)
++void message(int flags, const char *format, ...)
+ {
+   va_list args ;
+   static int column = 0 ;	/* current screen column for message wrap */
+diff -ur psutils-1.17.orig/pserror.h psutils-1.17/pserror.h
+--- psutils-1.17.orig/pserror.h	1997-03-11 23:53:02.000000000 +0100
++++ psutils-1.17/pserror.h	2009-08-22 22:53:17.000000000 +0200
+@@ -17,4 +17,4 @@
+ #define WARN		(MESSAGE_NL|MESSAGE_PROGRAM)
+ #define LOG		0
+ 
+-extern void message(int flags, char *format, ...) ;
++extern void message(int flags, const char *format, ...) ;
+diff -ur psutils-1.17.orig/psspec.c psutils-1.17/psspec.c
+--- psutils-1.17.orig/psspec.c	1997-03-11 23:53:04.000000000 +0100
++++ psutils-1.17/psspec.c	2009-08-27 14:47:26.000000000 +0200
+@@ -91,7 +91,7 @@
+    return (num);
+ }
+ 
+-static char *prologue[] = { /* PStoPS procset */
++static const char *prologue[] = { /* PStoPS procset */
+ #ifndef SHOWPAGE_LOAD
+    "userdict begin",
+    "[/showpage/erasepage/copypage]{dup where{pop dup load",	/* prevent */
+@@ -138,7 +138,7 @@
+ {
+    int thispg, maxpage;
+    int pageindex = 0;
+-   char **pro;
++   const char **pro;
+ 
+    scanpages();
+ 
+@@ -214,7 +214,6 @@
+ 	    }
+ 	    writestring("userdict/PStoPSmatrix matrix currentmatrix put\n");
+ 	    if (width > 0 && height > 0) {
+-	       char buffer[BUFSIZ];
+ 	       writestring("userdict/PStoPSclip{0 0 moveto\n");
+ 	       sprintf(buffer, " %f 0 rlineto 0 %f rlineto -%f 0 rlineto\n",
+ 		       width, height, width);
+diff -ur psutils-1.17.orig/psutil.c psutils-1.17/psutil.c
+--- psutils-1.17.orig/psutil.c	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/psutil.c	2009-09-01 13:43:52.000000000 +0200
+@@ -65,7 +65,7 @@
+ };
+ 
+ /* return pointer to paper size struct or NULL */
+-Paper* findpaper(char *name)
++Paper* findpaper(const char *name)
+ {
+    Paper *pp;
+    for (pp = papersizes; PaperName(pp); pp++) {
+@@ -233,14 +233,14 @@
+ 
+ /* Output routines. These all update the global variable bytes with the number
+  * of bytes written */
+-void writestring(char *s)
++void writestring(const char *s)
+ {
+    fputs(s, outfile);
+    bytes += strlen(s);
+ }
+ 
+ /* write page comment */
+-void writepageheader(char *label, int page)
++void writepageheader(const char *label, int page)
+ {
+    if (verbose)
+       message(LOG, "[%d] ", page);
+diff -ur psutils-1.17.orig/psutil.h psutils-1.17/psutil.h
+--- psutils-1.17.orig/psutil.h	1997-03-11 23:53:04.000000000 +0100
++++ psutils-1.17/psutil.h	2009-08-22 22:55:59.000000000 +0200
+@@ -17,7 +17,7 @@
+ /* paper size structure; configurability and proper paper resources will have
+    to wait until version 2 */
+ typedef struct papersize {
+-   char *name;		/* name of paper size */
++   const char *name;		/* name of paper size */
+    int width, height;	/* width, height in points */
+ } Paper ;
+ #define PaperName(p) ((p)->name)
+@@ -25,11 +25,11 @@
+ #define PaperHeight(p) ((p)->height)
+ 
+ /* Definitions for functions found in psutil.c */
+-extern Paper *findpaper(char *name);
++extern Paper *findpaper(const char *name);
+ extern FILE *seekable(FILE *fp);
+ extern void writepage(int p);
+ extern void seekpage(int p);
+-extern void writepageheader(char *label, int p);
++extern void writepageheader(const char *label, int p);
+ extern void writepagesetup(void);
+ extern void writepagebody(int p);
+ extern void writeheader(int p);
+@@ -39,7 +39,7 @@
+ extern void writetrailer(void);
+ extern void writeemptypage(void);
+ extern void scanpages(void);
+-extern void writestring(char *s);
++extern void writestring(const char *s);
+ 
+ /* These variables are imported from the client program (e.g. psbook, psnup,
+    etc.) */
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-06-MINGW b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-06-MINGW
new file mode 100644
index 00000000000..f44490351db
--- /dev/null
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/patch-06-MINGW
@@ -0,0 +1,15 @@
+diff -ur psutils-1.17.orig/config.h psutils-1.17/config.h
+--- psutils-1.17.orig/config.h	2006-01-17 22:16:42.000000000 +0100
++++ psutils-1.17/config.h	2010-02-20 12:23:30.000000000 +0100
+@@ -10,9 +10,9 @@
+ #define OPEN_WRITE "wb"
+ #include <fcntl.h>
+ #include <io.h>
+-#if defined(WIN32)
++#if defined(WIN32) && !defined(__MINGW32__)
+ #include <win32lib.h>
+-#endif /* WIN32 */
++#endif /* WIN32 && !__MINGW32__ */
+ #else /* ! MSDOS && ! WINNT && ! WIN32 */
+ #if defined(OS2)
+ #define TMPDIR "."
diff --git a/Build/source/utils/psutils/LICENSE b/Build/source/utils/psutils/psutils-1.17/LICENSE
index e5e718ac10c..e5e718ac10c 100644
--- a/Build/source/utils/psutils/LICENSE
+++ b/Build/source/utils/psutils/psutils-1.17/LICENSE
diff --git a/Build/source/utils/psutils/Makefile.bcc b/Build/source/utils/psutils/psutils-1.17/Makefile.bcc
index 89ab6bbcc04..89ab6bbcc04 100644
--- a/Build/source/utils/psutils/Makefile.bcc
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.bcc
diff --git a/Build/source/utils/psutils/Makefile.msc b/Build/source/utils/psutils/psutils-1.17/Makefile.msc
index 90d1383e5f3..90d1383e5f3 100644
--- a/Build/source/utils/psutils/Makefile.msc
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.msc
diff --git a/Build/source/utils/psutils/Makefile.nt b/Build/source/utils/psutils/psutils-1.17/Makefile.nt
index 41d9b054d3c..41d9b054d3c 100644
--- a/Build/source/utils/psutils/Makefile.nt
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.nt
diff --git a/Build/source/utils/psutils/Makefile.os2 b/Build/source/utils/psutils/psutils-1.17/Makefile.os2
index ba99fcd81f6..ba99fcd81f6 100644
--- a/Build/source/utils/psutils/Makefile.os2
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.os2
diff --git a/Build/source/utils/psutils/Makefile.sc b/Build/source/utils/psutils/psutils-1.17/Makefile.sc
index d2b4c43818e..d2b4c43818e 100644
--- a/Build/source/utils/psutils/Makefile.sc
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.sc
diff --git a/Build/source/utils/psutils/Makefile.unix b/Build/source/utils/psutils/psutils-1.17/Makefile.unix
index 11c7ef311fb..bbe286e0e74 100644
--- a/Build/source/utils/psutils/Makefile.unix
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.unix
@@ -38,7 +38,8 @@ INSTALLMAN = install -c -m $(MANMODE)
 MANEXT = 1
 MANDIR = /usr/local/share/man/man$(MANEXT)
 
-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O 
+CC = gcc
+CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
 
 BIN = psbook psselect pstops epsffit psnup \
 	psresize
@@ -98,55 +99,55 @@ showchar:	showchar.sh
 	cp $? $@
 
 psmerge: psmerge.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixfmps: fixfmps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixmacps: fixmacps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" INCLUDE=$(INCLUDEDIR) $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixpsditps: fixpsditps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixpspps: fixpspps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixscribeps: fixscribeps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixtpps: fixtpps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixwfwps: fixwfwps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixwpps: fixwpps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixwwps: fixwwps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 fixdlsrps: fixdlsrps.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 extractres: extractres.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 includeres: includeres.pl
-	$(PERL) maketext OS=$(OS) PERL="$(PERL)" INCLUDE=$(INCLUDEDIR) $? > $@
+	$(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
 	$(CHMOD) $(BINMODE) $@
 
 epsffit.$(MANEXT): epsffit.man
@@ -222,7 +223,6 @@ install.bin: $(BIN)
 	@for i in $(BIN); do \
 		echo Installing $$i; \
 		$(INSTALL) $$i $(BINDIR); \
-		$(CHMOD) u+w $(BINDIR)/$$i; \
 	done
 
 install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
@@ -230,7 +230,6 @@ install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
 	@for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
 		echo Installing $$i; \
 		$(INSTALL) $$i $(SCRIPTDIR); \
-		$(CHMOD) u+w $(SCRIPTDIR)/$$i; \
 	done
 
 install.include: $(INCLUDES)
@@ -238,7 +237,6 @@ install.include: $(INCLUDES)
 	@for i in $(INCLUDES); do \
 		echo Installing $$i; \
 		$(INSTALLMAN) $$i $(INCLUDEDIR); \
-		$(CHMOD) u+w $(INCLUDEDIR)/$$i; \
 	done
 
 install.man: $(MANPAGES)
diff --git a/Build/source/utils/psutils/Makefile.wat b/Build/source/utils/psutils/psutils-1.17/Makefile.wat
index 71e289d6742..71e289d6742 100644
--- a/Build/source/utils/psutils/Makefile.wat
+++ b/Build/source/utils/psutils/psutils-1.17/Makefile.wat
diff --git a/Build/source/utils/psutils/README b/Build/source/utils/psutils/psutils-1.17/README
index cc2018357d4..cc2018357d4 100644
--- a/Build/source/utils/psutils/README
+++ b/Build/source/utils/psutils/psutils-1.17/README
diff --git a/Build/source/utils/psutils/config.h b/Build/source/utils/psutils/psutils-1.17/config.h
index 88af01a9027..88af01a9027 100644
--- a/Build/source/utils/psutils/config.h
+++ b/Build/source/utils/psutils/psutils-1.17/config.h
diff --git a/Build/source/utils/psutils/descrip.mms b/Build/source/utils/psutils/psutils-1.17/descrip.mms
index f3f98e5cdac..f3f98e5cdac 100644
--- a/Build/source/utils/psutils/descrip.mms
+++ b/Build/source/utils/psutils/psutils-1.17/descrip.mms
diff --git a/Build/source/utils/psutils/epsffit.c b/Build/source/utils/psutils/psutils-1.17/epsffit.c
index 908c2366a95..cc4432e4a8c 100644
--- a/Build/source/utils/psutils/epsffit.c
+++ b/Build/source/utils/psutils/psutils-1.17/epsffit.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "psutil.h"
 #include "pserror.h"
 #include "patchlev.h"
 #include "config.h"
diff --git a/Build/source/utils/psutils/epsffit.man b/Build/source/utils/psutils/psutils-1.17/epsffit.man
index 9f1bf66beb1..9f1bf66beb1 100644
--- a/Build/source/utils/psutils/epsffit.man
+++ b/Build/source/utils/psutils/psutils-1.17/epsffit.man
diff --git a/Build/source/utils/psutils/extractres.man b/Build/source/utils/psutils/psutils-1.17/extractres.man
index e0702233827..e0702233827 100644
--- a/Build/source/utils/psutils/extractres.man
+++ b/Build/source/utils/psutils/psutils-1.17/extractres.man
diff --git a/Build/source/utils/psutils/extractres.pl b/Build/source/utils/psutils/psutils-1.17/extractres.pl
index d7520c47d33..d7520c47d33 100644
--- a/Build/source/utils/psutils/extractres.pl
+++ b/Build/source/utils/psutils/psutils-1.17/extractres.pl
diff --git a/Build/source/utils/psutils/fixdlsrps.man b/Build/source/utils/psutils/psutils-1.17/fixdlsrps.man
index d392691cc83..d392691cc83 100644
--- a/Build/source/utils/psutils/fixdlsrps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixdlsrps.man
diff --git a/Build/source/utils/psutils/fixdlsrps.pl b/Build/source/utils/psutils/psutils-1.17/fixdlsrps.pl
index 324109d1b50..324109d1b50 100644
--- a/Build/source/utils/psutils/fixdlsrps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixdlsrps.pl
diff --git a/Build/source/utils/psutils/fixfmps.man b/Build/source/utils/psutils/psutils-1.17/fixfmps.man
index 2276cfd052e..2276cfd052e 100644
--- a/Build/source/utils/psutils/fixfmps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixfmps.man
diff --git a/Build/source/utils/psutils/fixfmps.pl b/Build/source/utils/psutils/psutils-1.17/fixfmps.pl
index f09a3c04b40..f09a3c04b40 100644
--- a/Build/source/utils/psutils/fixfmps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixfmps.pl
diff --git a/Build/source/utils/psutils/fixmacps.man b/Build/source/utils/psutils/psutils-1.17/fixmacps.man
index ce0ae891e66..ce0ae891e66 100644
--- a/Build/source/utils/psutils/fixmacps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixmacps.man
diff --git a/Build/source/utils/psutils/fixmacps.pl b/Build/source/utils/psutils/psutils-1.17/fixmacps.pl
index 9dcdb8517ce..9dcdb8517ce 100644
--- a/Build/source/utils/psutils/fixmacps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixmacps.pl
diff --git a/Build/source/utils/psutils/fixpsditps.man b/Build/source/utils/psutils/psutils-1.17/fixpsditps.man
index 7ff19b34c51..7ff19b34c51 100644
--- a/Build/source/utils/psutils/fixpsditps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixpsditps.man
diff --git a/Build/source/utils/psutils/fixpsditps.pl b/Build/source/utils/psutils/psutils-1.17/fixpsditps.pl
index a9008f58408..a9008f58408 100644
--- a/Build/source/utils/psutils/fixpsditps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixpsditps.pl
diff --git a/Build/source/utils/psutils/fixpspps.man b/Build/source/utils/psutils/psutils-1.17/fixpspps.man
index 9a6ed98c87c..9a6ed98c87c 100644
--- a/Build/source/utils/psutils/fixpspps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixpspps.man
diff --git a/Build/source/utils/psutils/fixpspps.pl b/Build/source/utils/psutils/psutils-1.17/fixpspps.pl
index c10c93e7666..c10c93e7666 100644
--- a/Build/source/utils/psutils/fixpspps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixpspps.pl
diff --git a/Build/source/utils/psutils/fixscribeps.man b/Build/source/utils/psutils/psutils-1.17/fixscribeps.man
index 68904461df1..68904461df1 100644
--- a/Build/source/utils/psutils/fixscribeps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixscribeps.man
diff --git a/Build/source/utils/psutils/fixscribeps.pl b/Build/source/utils/psutils/psutils-1.17/fixscribeps.pl
index d8ed1e86aa3..d8ed1e86aa3 100644
--- a/Build/source/utils/psutils/fixscribeps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixscribeps.pl
diff --git a/Build/source/utils/psutils/fixtpps.man b/Build/source/utils/psutils/psutils-1.17/fixtpps.man
index c6309f12cca..c6309f12cca 100644
--- a/Build/source/utils/psutils/fixtpps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixtpps.man
diff --git a/Build/source/utils/psutils/fixtpps.pl b/Build/source/utils/psutils/psutils-1.17/fixtpps.pl
index 29c2cebb15c..29c2cebb15c 100644
--- a/Build/source/utils/psutils/fixtpps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixtpps.pl
diff --git a/Build/source/utils/psutils/fixwfwps.man b/Build/source/utils/psutils/psutils-1.17/fixwfwps.man
index 42810c26995..42810c26995 100644
--- a/Build/source/utils/psutils/fixwfwps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixwfwps.man
diff --git a/Build/source/utils/psutils/fixwfwps.pl b/Build/source/utils/psutils/psutils-1.17/fixwfwps.pl
index 03b0cdaca38..03b0cdaca38 100644
--- a/Build/source/utils/psutils/fixwfwps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixwfwps.pl
diff --git a/Build/source/utils/psutils/fixwpps.man b/Build/source/utils/psutils/psutils-1.17/fixwpps.man
index d6ab4a274ed..d6ab4a274ed 100644
--- a/Build/source/utils/psutils/fixwpps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixwpps.man
diff --git a/Build/source/utils/psutils/fixwpps.pl b/Build/source/utils/psutils/psutils-1.17/fixwpps.pl
index 059119daf48..059119daf48 100644
--- a/Build/source/utils/psutils/fixwpps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixwpps.pl
diff --git a/Build/source/utils/psutils/fixwwps.man b/Build/source/utils/psutils/psutils-1.17/fixwwps.man
index 1fb1aea4d9a..1fb1aea4d9a 100644
--- a/Build/source/utils/psutils/fixwwps.man
+++ b/Build/source/utils/psutils/psutils-1.17/fixwwps.man
diff --git a/Build/source/utils/psutils/fixwwps.pl b/Build/source/utils/psutils/psutils-1.17/fixwwps.pl
index a0096998b83..a0096998b83 100644
--- a/Build/source/utils/psutils/fixwwps.pl
+++ b/Build/source/utils/psutils/psutils-1.17/fixwwps.pl
diff --git a/Build/source/utils/psutils/getafm.man b/Build/source/utils/psutils/psutils-1.17/getafm.man
index 661c8c19f81..661c8c19f81 100644
--- a/Build/source/utils/psutils/getafm.man
+++ b/Build/source/utils/psutils/psutils-1.17/getafm.man
diff --git a/Build/source/utils/psutils/getafm.sh b/Build/source/utils/psutils/psutils-1.17/getafm.sh
index 1c6cd21cf77..1c6cd21cf77 100644
--- a/Build/source/utils/psutils/getafm.sh
+++ b/Build/source/utils/psutils/psutils-1.17/getafm.sh
diff --git a/Build/source/utils/psutils/includeres.man b/Build/source/utils/psutils/psutils-1.17/includeres.man
index 24a2615c396..df36e8468c4 100644
--- a/Build/source/utils/psutils/includeres.man
+++ b/Build/source/utils/psutils/psutils-1.17/includeres.man
@@ -26,7 +26,6 @@ re-arrangement filters such as
 or 
 .I pstops
 safely.
-.SH FILES
 .SH AUTHOR
 Copyright (C) Angus J. C. Duggan 1991-1995
 .SH "SEE ALSO"
diff --git a/Build/source/utils/psutils/includeres.pl b/Build/source/utils/psutils/psutils-1.17/includeres.pl
index 083e0bfa52e..083e0bfa52e 100644
--- a/Build/source/utils/psutils/includeres.pl
+++ b/Build/source/utils/psutils/psutils-1.17/includeres.pl
diff --git a/Build/source/utils/psutils/maketext b/Build/source/utils/psutils/psutils-1.17/maketext
index b5715b3a25d..b5715b3a25d 100644
--- a/Build/source/utils/psutils/maketext
+++ b/Build/source/utils/psutils/psutils-1.17/maketext
diff --git a/Build/source/utils/psutils/md68_0.ps b/Build/source/utils/psutils/psutils-1.17/md68_0.ps
index 1934c7f7ab3..1934c7f7ab3 100644
--- a/Build/source/utils/psutils/md68_0.ps
+++ b/Build/source/utils/psutils/psutils-1.17/md68_0.ps
diff --git a/Build/source/utils/psutils/md71_0.ps b/Build/source/utils/psutils/psutils-1.17/md71_0.ps
index 43c102c4f2f..43c102c4f2f 100644
--- a/Build/source/utils/psutils/md71_0.ps
+++ b/Build/source/utils/psutils/psutils-1.17/md71_0.ps
diff --git a/Build/source/utils/psutils/patchlev.h.in b/Build/source/utils/psutils/psutils-1.17/patchlev.h.in
index 8f957dcf464..8f957dcf464 100644
--- a/Build/source/utils/psutils/patchlev.h.in
+++ b/Build/source/utils/psutils/psutils-1.17/patchlev.h.in
diff --git a/Build/source/utils/psutils/psbook.c b/Build/source/utils/psutils/psutils-1.17/psbook.c
index 5e9b35b80cf..5e9b35b80cf 100644
--- a/Build/source/utils/psutils/psbook.c
+++ b/Build/source/utils/psutils/psutils-1.17/psbook.c
diff --git a/Build/source/utils/psutils/psbook.man b/Build/source/utils/psutils/psutils-1.17/psbook.man
index 6f5ad6d7927..6f5ad6d7927 100644
--- a/Build/source/utils/psutils/psbook.man
+++ b/Build/source/utils/psutils/psutils-1.17/psbook.man
diff --git a/Build/source/utils/psutils/pserror.c b/Build/source/utils/psutils/psutils-1.17/pserror.c
index f26aab7c8dd..f26aab7c8dd 100644
--- a/Build/source/utils/psutils/pserror.c
+++ b/Build/source/utils/psutils/psutils-1.17/pserror.c
diff --git a/Build/source/utils/psutils/pserror.h b/Build/source/utils/psutils/psutils-1.17/pserror.h
index 438f2e5c040..438f2e5c040 100644
--- a/Build/source/utils/psutils/pserror.h
+++ b/Build/source/utils/psutils/psutils-1.17/pserror.h
diff --git a/Build/source/utils/psutils/psmerge.man b/Build/source/utils/psutils/psutils-1.17/psmerge.man
index 4bce92da61b..4bce92da61b 100644
--- a/Build/source/utils/psutils/psmerge.man
+++ b/Build/source/utils/psutils/psutils-1.17/psmerge.man
diff --git a/Build/source/utils/psutils/psmerge.pl b/Build/source/utils/psutils/psutils-1.17/psmerge.pl
index a1a9db7c086..a1a9db7c086 100644
--- a/Build/source/utils/psutils/psmerge.pl
+++ b/Build/source/utils/psutils/psutils-1.17/psmerge.pl
diff --git a/Build/source/utils/psutils/psnup.c b/Build/source/utils/psutils/psutils-1.17/psnup.c
index 1a39e95c418..1a39e95c418 100644
--- a/Build/source/utils/psutils/psnup.c
+++ b/Build/source/utils/psutils/psutils-1.17/psnup.c
diff --git a/Build/source/utils/psutils/psnup.man b/Build/source/utils/psutils/psutils-1.17/psnup.man
index 3edd10b4f40..3edd10b4f40 100644
--- a/Build/source/utils/psutils/psnup.man
+++ b/Build/source/utils/psutils/psutils-1.17/psnup.man
diff --git a/Build/source/utils/psutils/psresize.c b/Build/source/utils/psutils/psutils-1.17/psresize.c
index 7bc3a75c788..7bc3a75c788 100644
--- a/Build/source/utils/psutils/psresize.c
+++ b/Build/source/utils/psutils/psutils-1.17/psresize.c
diff --git a/Build/source/utils/psutils/psresize.man b/Build/source/utils/psutils/psutils-1.17/psresize.man
index f7ba9cb3093..f7ba9cb3093 100644
--- a/Build/source/utils/psutils/psresize.man
+++ b/Build/source/utils/psutils/psutils-1.17/psresize.man
diff --git a/Build/source/utils/psutils/psselect.c b/Build/source/utils/psutils/psutils-1.17/psselect.c
index e48c6cc7fa4..e48c6cc7fa4 100644
--- a/Build/source/utils/psutils/psselect.c
+++ b/Build/source/utils/psutils/psutils-1.17/psselect.c
diff --git a/Build/source/utils/psutils/psselect.man b/Build/source/utils/psutils/psutils-1.17/psselect.man
index 5311db233e3..5311db233e3 100644
--- a/Build/source/utils/psutils/psselect.man
+++ b/Build/source/utils/psutils/psutils-1.17/psselect.man
diff --git a/Build/source/utils/psutils/psspec.c b/Build/source/utils/psutils/psutils-1.17/psspec.c
index 304d2a28d43..304d2a28d43 100644
--- a/Build/source/utils/psutils/psspec.c
+++ b/Build/source/utils/psutils/psutils-1.17/psspec.c
diff --git a/Build/source/utils/psutils/psspec.h b/Build/source/utils/psutils/psutils-1.17/psspec.h
index ce796f5407a..ce796f5407a 100644
--- a/Build/source/utils/psutils/psspec.h
+++ b/Build/source/utils/psutils/psutils-1.17/psspec.h
diff --git a/Build/source/utils/psutils/pstops.c b/Build/source/utils/psutils/psutils-1.17/pstops.c
index 02632c1e74d..02632c1e74d 100644
--- a/Build/source/utils/psutils/pstops.c
+++ b/Build/source/utils/psutils/psutils-1.17/pstops.c
diff --git a/Build/source/utils/psutils/pstops.man b/Build/source/utils/psutils/psutils-1.17/pstops.man
index 350af6c2990..350af6c2990 100644
--- a/Build/source/utils/psutils/pstops.man
+++ b/Build/source/utils/psutils/psutils-1.17/pstops.man
diff --git a/Build/source/utils/psutils/psutil.c b/Build/source/utils/psutils/psutils-1.17/psutil.c
index 9ededee7f82..9ededee7f82 100644
--- a/Build/source/utils/psutils/psutil.c
+++ b/Build/source/utils/psutils/psutils-1.17/psutil.c
diff --git a/Build/source/utils/psutils/psutil.h b/Build/source/utils/psutils/psutils-1.17/psutil.h
index 0ca9012e499..0ca9012e499 100644
--- a/Build/source/utils/psutils/psutil.h
+++ b/Build/source/utils/psutils/psutils-1.17/psutil.h
diff --git a/Build/source/utils/psutils/showchar.sh b/Build/source/utils/psutils/psutils-1.17/showchar.sh
index e685e99ae8c..e685e99ae8c 100644
--- a/Build/source/utils/psutils/showchar.sh
+++ b/Build/source/utils/psutils/psutils-1.17/showchar.sh