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

[dmichelsen at users.sourceforge.net]

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

Log Message:
-----------
pdfjam: Fix dependencies and hardcode CSW pathes and tools

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

Added Paths:
-----------
    csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch

Modified: csw/mgar/pkg/pdfjam/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/Makefile	2009-12-21 14:15:23 UTC (rev 7692)
+++ csw/mgar/pkg/pdfjam/trunk/Makefile	2009-12-21 14:29:03 UTC (rev 7693)
@@ -11,12 +11,15 @@
 
 MASTER_SITES = http://www.warwick.ac.uk/go/pdfjam/
 DISTFILES  = $(GARNAME)_$(GARVERSION).tar.gz
+PATCHFILES = 0001-Hardcode-CSW-tools-and-pathes.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
+
 DISTNAME = pdfjam
 
 CONFIGURE_SCRIPTS =

Modified: csw/mgar/pkg/pdfjam/trunk/checksums
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/checksums	2009-12-21 14:15:23 UTC (rev 7692)
+++ csw/mgar/pkg/pdfjam/trunk/checksums	2009-12-21 14:29:03 UTC (rev 7693)
@@ -1 +1,2 @@
+ad3f63f1304a73f7ef25d4ea70c03b7f  0001-Hardcode-CSW-tools-and-pathes.patch
 71d2d664777d32ec4154ab4c2e5965dc  pdfjam_1.21.tar.gz

Added: csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch
===================================================================
--- csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch	                        (rev 0)
+++ csw/mgar/pkg/pdfjam/trunk/files/0001-Hardcode-CSW-tools-and-pathes.patch	2009-12-21 14:29:03 UTC (rev 7693)
@@ -0,0 +1,80 @@
+From 260e4cde6050335998d92f62b068e357e2d1ca4c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 21 Dec 2009 15:14:31 +0100
+Subject: [PATCH] Hardcode CSW tools and pathes
+
+---
+ scripts/pdf90   |    4 ++--
+ scripts/pdfjoin |    4 ++--
+ scripts/pdfnup  |    4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/pdf90 b/scripts/pdf90
+index 8b9ac02..7402567 100755
+--- a/scripts/pdf90
++++ b/scripts/pdf90
+@@ -23,7 +23,7 @@ echo "This is pdf90 version ""$version"
+ ##  
+ ##  First say where your "pdflatex" program lives:
+ ##
+-pdflatex=pdflatex
++pdflatex=/opt/csw/bin/pdflatex
+ #pdflatex="pdflatex.exe"    ## this for Windows computers
+ ##
+ ##  Next a permitted location for temporary files on your system:
+@@ -40,7 +40,7 @@ tidy=true              ## delete all temporary files immediately
+ ##
+ ##  Read the configuration file(s) if such exist:
+ ##
+-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
++for d in /opt/csw/etc /etc/opt/csw
+ do if test -f $d/pdfnup.conf; then
+    echo "Reading site configuration from $d/pdfnup.conf"
+    . $d/pdfnup.conf
+diff --git a/scripts/pdfjoin b/scripts/pdfjoin
+index 761c68a..afce83a 100755
+--- a/scripts/pdfjoin
++++ b/scripts/pdfjoin
+@@ -28,7 +28,7 @@ shopt -u xpg_echo ## mainly to cope with Mac OS 10.5 "Leopard"
+ ##  
+ ##  First say where your "pdflatex" program lives:
+ ##
+-pdflatex=pdflatex
++pdflatex=/opt/csw/bin/pdflatex
+ #pdflatex="pdflatex.exe"    ## this for Windows computers
+ ##
+ ##  Next a permitted location for temporary files on your system:
+@@ -52,7 +52,7 @@ tidy=true              ## delete all temporary files immediately
+ ##
+ ##  Read the configuration file(s) if such exist:
+ ##
+-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
++for d in /opt/csw/etc /etc/opt/csw
+ do if test -f $d/pdfnup.conf; then
+    echo "Reading site configuration from $d/pdfnup.conf"
+    . $d/pdfnup.conf
+diff --git a/scripts/pdfnup b/scripts/pdfnup
+index b4efe1c..71330c3 100755
+--- a/scripts/pdfnup
++++ b/scripts/pdfnup
+@@ -24,7 +24,7 @@ echo "This is pdfnup version ""$version"
+ ##  
+ ##  First say where your "pdflatex" program lives:
+ ##
+-pdflatex=pdflatex
++pdflatex=/opt/csw/bin/pdflatex
+ #pdflatex="pdflatex.exe"    ## this for Windows computers
+ ##
+ ##  Next a permitted location for temporary files on your system:
+@@ -55,7 +55,7 @@ tidy=true              ## delete all temporary files immediately
+ ##
+ ##  Read the configuration file(s) if such exist:
+ ##
+-for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
++for d in /opt/csw/etc /etc/opt/csw
+ do if test -f $d/pdfnup.conf; then
+      echo "Reading site configuration from $d/pdfnup.conf"
+      . $d/pdfnup.conf
+-- 
+1.6.5.1
+


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