[csw-devel] SF.net SVN: gar:[7694] csw/mgar/pkg/pdfjam/trunk

[dmichelsen at users.sourceforge.net]

Revision: 7694
          http://gar.svn.sourceforge.net/gar/?rev=7694&view=rev
Author:   dmichelsen
Date:     2009-12-21 14:43:04 +0000 (Mon, 21 Dec 2009)

Log Message:
-----------
pdfjam: Some patches for Solaris

Modified Paths:
--------------
    csw/mgar/pkg/pdfjam/trunk/Makefile
    csw/mgar/pkg/pdfjam/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch
    csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch

Modified: csw/mgar/pkg/pdfjam/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/Makefile	2009-12-21 14:29:03 UTC (rev 7693)
+++ csw/mgar/pkg/pdfjam/trunk/Makefile	2009-12-21 14:43:04 UTC (rev 7694)
@@ -11,14 +11,16 @@
 
 MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/
 DISTFILES  = $(GARNAME)_$(GARVERSION).tar.gz
-PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.patch
+PATCHFILES  = 0001-Hardcode-CSW-tools-and-pathes.patch
+PATCHFILES += 0002-Step-out-of-tempdir-before-removing-it.patch
+PATCHFILES += 0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 SPKG_SOURCEURL = http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam
 
-REQUIRED_PKGS = CSWtetex
+REQUIRED_PKGS = CSWtetex CSWbash
 
 DISTNAME = pdfjam
 

Modified: csw/mgar/pkg/pdfjam/trunk/checksums
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/checksums	2009-12-21 14:29:03 UTC (rev 7693)
+++ csw/mgar/pkg/pdfjam/trunk/checksums	2009-12-21 14:43:04 UTC (rev 7694)
@@ -1,2 +1,4 @@
 ad3f63f1304a73f7ef25d4ea70c03b7f  0001-Hardcode-CSW-tools-and-pathes.patch
+267c5818992a3c1de19f2bcc074892b3  0002-Step-out-of-tempdir-before-removing-it.patch
+3b0072b467cb1d961056a1164c531602  0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch
 71d2d664777d32ec4154ab4c2e5965dc  pdfjam_1.21.tar.gz

Added: csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch	                        (rev 0)
+++ csw/mgar/pkg/pdfjam/trunk/files/0002-Step-out-of-tempdir-before-removing-it.patch	2009-12-21 14:43:04 UTC (rev 7694)
@@ -0,0 +1,53 @@
+From 339813fa03f83e99b0f98626f1ca72f75ab82ca5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 21 Dec 2009 15:22:00 +0100
+Subject: [PATCH] Step out of tempdir before removing it
+
+---
+ scripts/pdf90   |    2 +-
+ scripts/pdfjoin |    2 +-
+ scripts/pdfnup  |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/pdf90 b/scripts/pdf90
+index 7402567..5df5a37 100755
+--- a/scripts/pdf90
++++ b/scripts/pdf90
+@@ -213,7 +213,7 @@ EndTemplate
+                    "$outfileDir"/"$outfileNameRoot"".pdf"
+          fi
+     case "$tidy" in
+-      true) rm "$tempfileDir"/"$uniqueName"* ;;
++      true) cd && rm "$tempfileDir"/"$uniqueName"* ;;
+     esac
+     outFile=""
+   else echo "  Failed: output file not written"
+diff --git a/scripts/pdfjoin b/scripts/pdfjoin
+index afce83a..24551ce 100755
+--- a/scripts/pdfjoin
++++ b/scripts/pdfjoin
+@@ -263,7 +263,7 @@ if test -f "$tempfileDir"/"$uniqueName"".aux";
+                  "$outfileDir"/"$outfileNameRoot"".pdf"
+        fi
+        case "$tidy" in
+-         true) rm "$tempfileDir"/"$uniqueName"* ;;
++         true) cd && rm "$tempfileDir"/"$uniqueName"* ;;
+        esac
+   else echo "  Failed: output file not written"
+ fi 
+diff --git a/scripts/pdfnup b/scripts/pdfnup
+index 71330c3..d7872ac 100755
+--- a/scripts/pdfnup
++++ b/scripts/pdfnup
+@@ -342,7 +342,7 @@ EndTemplate
+                    "$outfileDir"/"$outfileNameRoot"".pdf"
+          fi
+          case "$tidy" in
+-           true) rm "$tempfileDir"/"$uniqueName"* ;;
++           true) cd && rm "$tempfileDir"/"$uniqueName"* ;;
+          esac
+          outFile=""
+     else echo "  Failed: output file not written"
+-- 
+1.6.5.1
+

Added: csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch	                        (rev 0)
+++ csw/mgar/pkg/pdfjam/trunk/files/0003-Use-CSW-bash-because-the-Solaris-shipped-one-is-too-.patch	2009-12-21 14:43:04 UTC (rev 7694)
@@ -0,0 +1,44 @@
+From 5f8d163c0b2fa7c6eb6eba6dc271e96573293340 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 21 Dec 2009 15:28:31 +0100
+Subject: [PATCH] Use CSW bash because the Solaris shipped one is too old
+
+---
+ scripts/pdf90   |    2 +-
+ scripts/pdfjoin |    2 +-
+ scripts/pdfnup  |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/pdf90 b/scripts/pdf90
+index 5df5a37..cf15109 100755
+--- a/scripts/pdf90
++++ b/scripts/pdf90
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ ##
+ ##  pdf90: A shell program to rotate all pages of PDF files
+ ##
+diff --git a/scripts/pdfjoin b/scripts/pdfjoin
+index 24551ce..0bac762 100755
+--- a/scripts/pdfjoin
++++ b/scripts/pdfjoin
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ ##
+ ##  pdfjoin: A shell program to concatenate PDF pages into one file
+ ##
+diff --git a/scripts/pdfnup b/scripts/pdfnup
+index d7872ac..6baeeb1 100755
+--- a/scripts/pdfnup
++++ b/scripts/pdfnup
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/opt/csw/bin/bash
+ ##
+ ##  pdfnup: A shell program to generate a "n-up" version of a PDF file
+ ##
+-- 
+1.6.5.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.