Proposal: psutils (again)

[Daniel Bößwetter]

Hi Volker,

Volker Quetschke wrote:

> [...]
> Well, beside the fact that you don't provide a patch to restore the
> original source archive. This is the main (?) reason to provide the
> patch, it is there to get back the official sources.


Grr @!%$, forgot to put it into the source archive again :)  Fixed.

>
> The original source archive contains a Makefile, which you removed.


No, mine doesn't. The original download site for psutils seems to be 
down for the past few days, so I got the source from a mirror. It did 
not contain a file named Makefile. Does your's?

BTW, My first release of the source package contained a Makefile which I 
removed, because *you* (spotlight on :-) said it was *not* in the 
original source.

>
> You also added the CYGWIN-PATCHES dir (This is good, but it's not
> in the original sources.


http://cygwin.com/setup.html told me to. Isn't this the usual way to 
include Cygwin-specific stuff?

>
> I attached a patch that IMHO does it right. I also "modified" the
> already present $(prefix) variable that you now can do:


Looks good. I modified the Makefile.unix and README accordingly.

Regards,
Daniel

>
> $ make
> $ make prefix=<targetdir> install
>
> This makes it a lot easier to package the binary archive.
> (I know it should be called DESTDIR, but this way it's a minimal
> patch to the original sources.)
>
> Volker
>
>------------------------------------------------------------------------
>
>diff -u -r -N psutils-1.17.orig/CYGWIN-PATCHES/psutils-1.17.README psutils-1.17-1/CYGWIN-PATCHES/psutils-1.17.README
>--- psutils-1.17.orig/CYGWIN-PATCHES/psutils-1.17.README	1970-01-01 01:00:00.000000000 +0100
>+++ psutils-1.17-1/CYGWIN-PATCHES/psutils-1.17.README	2003-07-27 11:19:36.000000000 +0200
>@@ -0,0 +1,46 @@
>+psutils for Cygwin
>+==================
>+
>+PSUtils is a collection of useful utilities for manipulating PostScript
>+documents. Programs included are psnup, for placing out several logical
>+pages on a single sheet of paper, psselect, for selecting pages from a
>+document, pstops, for general imposition, psbook, for signature generation
>+for booklet printing, and psresize, for adjusting page sizes.
>+
>+This file comes with the Cygwin port of psutils 1.17 (which originates
>+from the patchlevel 17 source).
>+
>+
>+Original Source
>+---------------
>+
>+http://freshmeat.net/projects/psutils/
>+
>+Maintained by Angus J.C. Duggan.
>+
>+
>+Requirements
>+------------
>+
>+Perl is required for compiling as well as running some of the scripts
>+contained in the package.
>+
>+
>+Building from source
>+--------------------
>+
>+make
>+make install
>+
>+For easier packaging you can use:
>+make prefix=<targetdir> install
>+This will install the package into <targetdir> instead of /usr.
>+
>+TCM Port
>+--------
>+
>+Maintainer
>+
>+Daniel Boesswetter <daniel.boesswetter@web.de>
>+Thu Jul 24 17:24:44 WEDT 2003
>+
>diff -u -r -N psutils-1.17.orig/CYGWIN-PATCHES/setup.hint psutils-1.17-1/CYGWIN-PATCHES/setup.hint
>--- psutils-1.17.orig/CYGWIN-PATCHES/setup.hint	1970-01-01 01:00:00.000000000 +0100
>+++ psutils-1.17-1/CYGWIN-PATCHES/setup.hint	2003-07-25 12:10:11.000000000 +0200
>@@ -0,0 +1,9 @@
>+@ psutils
>+sdesc: "psutils - Postscript Utilities"
>+ldesc: "PSUtils is a collection of useful utilities for manipulating
>+PostScript documents. Programs included are psnup, for placing out several
>+logical pages on a single sheet of paper, psselect, for selecting pages
>+from a document, pstops, for general imposition, psbook, for signature
>+generation for booklet printing, and psresize, for adjusting page sizes."
>+category: Publishing
>+requires: perl
>diff -u -r -N psutils-1.17.orig/Makefile psutils-1.17-1/Makefile
>--- psutils-1.17.orig/Makefile	1997-04-16 16:55:56.000000000 +0200
>+++ psutils-1.17-1/Makefile	2003-07-27 10:56:46.000000000 +0200
>@@ -25,11 +25,12 @@
> 
> #OS = UNIX
> prefix=/usr
>+perlprefix=/usr
> 
> BINDIR = $(prefix)/bin
> SCRIPTDIR = $(BINDIR)
>-INCLUDEDIR = $(prefix)/lib/psutils
>-PERL = $(prefix)/bin/perl
>+INCLUDEDIR = $(prefix)/share/psutils
>+PERL = $(perlprefix)/bin/perl
> 
> BINMODE = 0755
> MANMODE = 0644
>@@ -218,30 +219,32 @@
> 	rm -f $(BIN) $(PERLSCRIPTS) $(MANPAGES)
> 
> install: install.bin install.script install.man install.include
>+	-mkdir -p $(prefix)/doc/Cygwin
>+	cp CYGWIN-PATCHES/psutils-1.17.README $(prefix)/doc/Cygwin/
> 
> install.bin: $(BIN)
>-	-mkdir $(BINDIR)
>+	-mkdir -p $(BINDIR)
> 	@for i in $(BIN); do \
> 		echo Installing $$i; \
> 		$(INSTALL) $$i $(BINDIR); \
> 	done
> 
> install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
>-	-mkdir $(SCRIPTDIR)
>+	-mkdir -p $(SCRIPTDIR)
> 	@for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
> 		echo Installing $$i; \
> 		$(INSTALL) $$i $(SCRIPTDIR); \
> 	done
> 
> install.include: $(INCLUDES)
>-	-mkdir $(INCLUDEDIR)
>+	-mkdir -p $(INCLUDEDIR)
> 	@for i in $(INCLUDES); do \
> 		echo Installing $$i; \
> 		$(INSTALLMAN) $$i $(INCLUDEDIR); \
> 	done
> 
> install.man: $(MANPAGES)
>-	-mkdir $(MANDIR)
>+	-mkdir -p $(MANDIR)
> 	@for i in $(MANPAGES); do \
> 		echo Installing manual page for $$i; \
> 		$(INSTALLMAN) $$i $(MANDIR)/$$i; \
>  
>