- Update to version 1.21

- Remove patches that have been merged upstream
- Add dependency on bash (and don't call it /bin/bash)
- Grab maintainership

5 files changed, 12 insertions, 153 deletions

diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index 6ee2ad9e08e7..f16393b53c26 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	pdfjam
-PORTVERSION=	1.20
-PORTREVISION=	4
+PORTVERSION=	1.21
 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}
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	Shell scripts to manipulate PDF files
 
-RUN_DEPENDS=	pdflatex:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS=	pdflatex:${PORTSDIR}/print/teTeX-base \
+		bash:${PORTSDIR}/shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -28,17 +27,16 @@ PORTDOCS=	PDFjam-README.html pdfdroplets.png
 NO_BUILD=	yes
 
 post-patch:
-	@${LN} -s scripts ${WRKSRC}/bin
-.for FILE in ${PLIST_FILES}
-	@${REINPLACE_CMD} -e"s|__LOCALBASE__|${LOCALBASE}|g" ${WRKSRC}/${FILE}
-.endfor
+	cd ${WRKSRC} && \
+	${REINPLACE_CMD} -e"s,^#!/bin/bash,#!${LOCALBASE}/bin/bash," \
+		${PLIST_FILES:C/bin/scripts/}
 
 do-install:
 .for FILE in ${PLIST_FILES}
-	${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${FILE:C/bin/scripts/} ${PREFIX}/bin
 .endfor
 .for FILE in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man1/${FILE} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/${FILE} ${MAN1PREFIX}/man/man1
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/print/pdfjam/distinfo b/print/pdfjam/distinfo
index f1f91091054c..ef8d7555c8f4 100644
--- a/print/pdfjam/distinfo
+++ b/print/pdfjam/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdfjam_1.20.tgz) = 3e443fd2c0063330313c1c079053e622
-SHA256 (pdfjam_1.20.tgz) = c9773533b5b9a6692f5d5d28d414f2f0f664461ec581bd762c019a554fafe315
-SIZE (pdfjam_1.20.tgz) = 52814
+MD5 (pdfjam_1.21.tar.gz) = 71d2d664777d32ec4154ab4c2e5965dc
+SHA256 (pdfjam_1.21.tar.gz) = 53b1306bb13a12b64429a248eb97e902afcc296671dd4d96049e7bbfb457cde3
+SIZE (pdfjam_1.21.tar.gz) = 54457
diff --git a/print/pdfjam/files/patch-scripts-pdf90 b/print/pdfjam/files/patch-scripts-pdf90
deleted file mode 100644
index 93bff3ce84c7..000000000000
--- a/print/pdfjam/files/patch-scripts-pdf90
+++ /dev/null
@@ -1,47 +0,0 @@
---- scripts/pdf90.orig        2005-01-25 22:19:21.000000000 +0300
-+++ scripts/pdf90     2008-12-29 20:00:05.000000000 +0300
-@@ -23,12 +23,18 @@
- ##  
- ##  First say where your "pdflatex" program lives:
- ##
--pdflatex=pdflatex
-+pdflatex="__LOCALBASE__"/bin/pdflatex
- #pdflatex="pdflatex.exe"    ## this for Windows computers
- ##
- ##  Next a permitted location for temporary files on your system:
- ##
--tempfileDir="/var/tmp" ## /var/tmp is standard on most unix systems
-+## /var/tmp is standard on most unix systems
-+tempfileDir=`mktemp -dq /var/tmp/pdf90.XXXXXXXX`
-+if [ -z "$tempfileDir" ]; then
-+	echo "pdf90: unable to create temporary directory"
-+	exit 2
-+fi
-+trap "rm -rf -- \"$tempfileDir\"" 0 1 2 3 15
- #tempfileDir="C:/tmp"  ## use something like this under Windows
- ##
- ##  Now specify the default settings for pdf90:
-@@ -43,12 +49,12 @@
- for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
- do if test -f $d/pdfnup.conf; then
-    echo "Reading site configuration from $d/pdfnup.conf"
--   source $d/pdfnup.conf
-+   . $d/pdfnup.conf
-    fi 
- done
- if test -f ~/.pdfnup.conf; then 
-    echo "Reading user defaults from ~/.pdfnup.conf";
--   source ~/.pdfnup.conf; 
-+   . ~/.pdfnup.conf; 
- fi
- #######################################################################
- ##
-@@ -71,7 +77,7 @@
- ##
- ##  Check that necessary LaTeX packages are installed
- ##
--PATH=`dirname "$pdflatex"`:$PATH
-+PATH="$PATH":"__LOCALBASE__"/bin
- export PATH
- case `kpsewhich pdfpages.sty` in
- 	"") echo "pdf90: pdfpages.sty not installed"; exit 1;;
diff --git a/print/pdfjam/files/patch-scripts-pdfjoin b/print/pdfjam/files/patch-scripts-pdfjoin
deleted file mode 100644
index eb50c079de12..000000000000
--- a/print/pdfjam/files/patch-scripts-pdfjoin
+++ /dev/null
@@ -1,46 +0,0 @@
---- scripts/pdfjoin.orig	2005-01-25 22:19:21.000000000 +0300
-+++ scripts/pdfjoin	2008-12-29 20:00:05.000000000 +0300
-@@ -23,12 +23,17 @@
- ##  
- ##  First say where your "pdflatex" program lives:
- ##
--pdflatex=pdflatex
-+pdflatex="__LOCALBASE__"/bin/pdflatex
- #pdflatex="pdflatex.exe"    ## this for Windows computers
- ##
- ##  Next a permitted location for temporary files on your system:
- ##
--tempfileDir="/var/tmp" ## /var/tmp is standard on most unix systems
-+## /var/tmp is standard on most unix systems
-+tempfileDir=`mktemp -dq /var/tmp/pdfjoin.XXXXXXXX`
-+if [ -z "$tempfileDir" ]; then
-+	echo "pdfjoin: unable to create temporary directory"
-+	exit 2
-+fi
- #tempfileDir="C:/tmp"  ## use something like this under Windows
- ##
- ##  Now specify the default settings for pdfjoin:
-@@ -50,12 +55,12 @@
- for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
- do if test -f $d/pdfnup.conf; then
-    echo "Reading site configuration from $d/pdfnup.conf"
--   source $d/pdfnup.conf
-+   . $d/pdfnup.conf
-    fi 
- done
- if test -f ~/.pdfnup.conf; then 
-    echo "Reading user defaults from ~/.pdfnup.conf";
--   source ~/.pdfnup.conf; 
-+   . ~/.pdfnup.conf; 
- fi
- #######################################################################
- ##
-@@ -99,7 +104,7 @@
- ##
- ##  Check that necessary LaTeX packages are installed
- ##
--PATH=`dirname "$pdflatex"`:$PATH
-+PATH="$PATH":"__LOCALBASE__"/bin
- export PATH
- case `kpsewhich pdfpages.sty` in
- 	"") echo "pdfjoin: pdfpages.sty not installed"; exit 1;;
diff --git a/print/pdfjam/files/patch-scripts-pdfnup b/print/pdfjam/files/patch-scripts-pdfnup
deleted file mode 100644
index 68606ede56dd..000000000000
--- a/print/pdfjam/files/patch-scripts-pdfnup
+++ /dev/null
@@ -1,46 +0,0 @@
---- scripts/pdfnup.orig	2005-01-25 22:19:21.000000000 +0300
-+++ scripts/pdfnup	2008-12-29 20:00:44.000000000 +0300
-@@ -23,12 +23,17 @@
- ##  
- ##  First say where your "pdflatex" program lives:
- ##
--pdflatex=pdflatex
-+pdflatex="__LOCALBASE__"/bin/pdflatex
- #pdflatex="pdflatex.exe"    ## this for Windows computers
- ##
- ##  Next a permitted location for temporary files on your system:
- ##
--tempfileDir="/var/tmp" ## /var/tmp is standard on many unix systems
-+## /var/tmp is standard on most unix systems
-+tempfileDir=`mktemp -dq /var/tmp/pdfnup.XXXXXXXX`
-+if [ -z "$tempfileDir" ]; then
-+	echo "pdfnup: unable to create temporary directory"
-+	exit 2
-+fi
- #tempfileDir="C:/tmp"  ## use something like this under Windows
- ##
- ##  Now specify the default settings for pdfnup:
-@@ -57,12 +62,12 @@
- for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
- do if test -f $d/pdfnup.conf; then
-      echo "Reading site configuration from $d/pdfnup.conf"
--     source $d/pdfnup.conf
-+     . $d/pdfnup.conf
-    fi 
- done
- if test -f ~/.pdfnup.conf; then 
-    echo "Reading user defaults from ~/.pdfnup.conf";
--   source ~/.pdfnup.conf; 
-+   . ~/.pdfnup.conf; 
- fi
- #######################################################################
- ##
-@@ -134,7 +139,7 @@
- ##
- ##  Check that necessary LaTeX packages are installed
- ##
--PATH=`dirname "$pdflatex"`:$PATH
-+PATH="$PATH":"__LOCALBASE__"/bin
- export PATH
- case `kpsewhich pdfpages.sty` in
- 	"") echo "pdfnup: pdfpages.sty not installed"; exit 1;;