Update pdfjam to 2.08

3 files changed, 13 insertions, 38 deletions

diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index 12186e16673f..fec3dc60d089 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	pdfjam
-PORTVERSION=	1.21
-PORTREVISION=	4
+PORTVERSION=	2.08
 CATEGORIES=	print
 MASTER_SITES=	http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/ \
-		http://www.it.ca/~paul/src/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+		ftp://ftp.stack.nl/pub/users/johans/pdfjam/
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Shell scripts to manipulate PDF files
@@ -20,25 +18,24 @@ RUN_DEPENDS=	pdflatex:${PORTSDIR}/print/teTeX-base
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAN1=		pdfjoin.1 pdf90.1 pdfnup.1
-PLIST_FILES=	bin/pdfjoin bin/pdf90 bin/pdfnup
+PROGS=		pdf90 pdf180 pdf270 pdfbook pdfflip pdfjam \
+		pdfjam-pocketmod pdfjam-slides3up pdfjam-slides6up \
+		pdfjoin pdfnup pdfpun
+MAN1=		${PROGS:S/$/.1/}
+PLIST_FILES=	${PROGS:S/^/bin\//} etc/pdfjam.conf.dist
 PORTDOCS=	PDFjam-README.html pdfdroplets.png
 
 NO_BUILD=	yes
 
-post-patch:
-	cd ${WRKSRC} && \
-	${REINPLACE_CMD} -e"s,^#!/bin/bash,#!/bin/sh," \
-		${PLIST_FILES:C/bin/scripts/}
-
 do-install:
-.for FILE in ${PLIST_FILES}
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${FILE:C/bin/scripts/} ${PREFIX}/bin
+.for FILE in ${PROGS}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin
 .endfor
 .for FILE in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}/man1/${FILE} ${MAN1PREFIX}/man/man1
 .endfor
-.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/pdfjam.conf ${PREFIX}/etc/pdfjam.conf.dist
+.ifndef NOPORTDOCS
 	${MKDIR} ${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
diff --git a/print/pdfjam/distinfo b/print/pdfjam/distinfo
index ef8d7555c8f4..fe8f3f265958 100644
--- a/print/pdfjam/distinfo
+++ b/print/pdfjam/distinfo
@@ -1,3 +1,2 @@
-MD5 (pdfjam_1.21.tar.gz) = 71d2d664777d32ec4154ab4c2e5965dc
-SHA256 (pdfjam_1.21.tar.gz) = 53b1306bb13a12b64429a248eb97e902afcc296671dd4d96049e7bbfb457cde3
-SIZE (pdfjam_1.21.tar.gz) = 54457
+SHA256 (pdfjam-2.08.tar.gz) = c731c598cfad076c985526ff89cbf34423a216101aa5e2d753a71de119ecc0f3
+SIZE (pdfjam-2.08.tar.gz) = 180725
diff --git a/print/pdfjam/files/patch-pdfjam-nobash b/print/pdfjam/files/patch-pdfjam-nobash
deleted file mode 100644
index 88659c45f3af..000000000000
--- a/print/pdfjam/files/patch-pdfjam-nobash
+++ /dev/null
@@ -1,21 +0,0 @@
---- scripts/pdfjoin.orig	2009-08-21 14:49:42.000000000 +0400
-+++ scripts/pdfjoin	2009-08-21 14:53:57.000000000 +0400
-@@ -8,8 +8,16 @@
- echo "This is pdfjoin version ""$version"
- ##
- ##
--shopt -u xpg_echo ## mainly to cope with Mac OS 10.5 "Leopard"
--                  ## -- and this is why we need /bin/bash as interpreter
-+## Inhibit interpretation of backslashed characters inside echo
-+## arguments.  Needed mainly to cope with Mac OS 10.5 "Leopard".
-+
-+## This is why we need /bin/bash as interpreter; but do a check
-+## if the interpretation is really here -- people on systems
-+## with conformant /bin/sh might want to run this script
-+## without Bash -- don't trouble them with 'shopt' stuff.
-+if [ "`echo '\n'`" != '\n' ]; then
-+	shopt -u xpg_echo
-+fi
- ##
- ##
- ##  Relies on pdflatex and the 'pdfpages' package (version 0.2e