CVS commit: pkgsrc/print/pdfjam

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Jun 15 13:12:29 UTC 2021

Modified Files:
        pkgsrc/print/pdfjam: Makefile distinfo
Added Files:
        pkgsrc/print/pdfjam/patches: patch-bin_pdfjam

Log Message:
pdfjam: Avoid an extra backslash (NFCI intended on liberal sed(1)-s)

It is problematic at least with recent-ish NetBSD sed(1).

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/pdfjam/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/pdfjam/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/pdfjam/patches/patch-bin_pdfjam

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/pdfjam/Makefile
diff -u pkgsrc/print/pdfjam/Makefile:1.11 pkgsrc/print/pdfjam/Makefile:1.12
--- pkgsrc/print/pdfjam/Makefile:1.11   Mon Nov  4 19:58:00 2019
+++ pkgsrc/print/pdfjam/Makefile        Tue Jun 15 13:12:29 2021
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2019/11/04 19:58:00 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2021/06/15 13:12:29 leot Exp $
 #
 
 DISTNAME=      pdfjam_208
 PKGNAME=       pdfjam-2.08
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  http://www.warwick.ac.uk/go/pdfjam/
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/print/pdfjam/distinfo
diff -u pkgsrc/print/pdfjam/distinfo:1.4 pkgsrc/print/pdfjam/distinfo:1.5
--- pkgsrc/print/pdfjam/distinfo:1.4    Wed Nov  4 01:01:37 2015
+++ pkgsrc/print/pdfjam/distinfo        Tue Jun 15 13:12:29 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:01:37 agc Exp $
+$NetBSD: distinfo,v 1.5 2021/06/15 13:12:29 leot Exp $
 
 SHA1 (pdfjam_208.tgz) = 981b504ef96369a203f85fefb42d4ea0d1194493
 RMD160 (pdfjam_208.tgz) = 98452c703d3d799e8562763d2d828aa64e63b893
 SHA512 (pdfjam_208.tgz) = 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
 Size (pdfjam_208.tgz) = 180725 bytes
+SHA1 (patch-bin_pdfjam) = c67988ea352e00bdcdce46b2d139b417b54579f0

Added files:

Index: pkgsrc/print/pdfjam/patches/patch-bin_pdfjam
diff -u /dev/null pkgsrc/print/pdfjam/patches/patch-bin_pdfjam:1.1
--- /dev/null   Tue Jun 15 13:12:29 2021
+++ pkgsrc/print/pdfjam/patches/patch-bin_pdfjam        Tue Jun 15 13:12:29 2021
@@ -0,0 +1,30 @@
+$NetBSD: patch-bin_pdfjam,v 1.1 2021/06/15 13:12:29 leot Exp $
+
+Remove a problematic extra backslash `\'.
+
+--- bin/pdfjam.orig    2010-11-14 23:39:18.000000000 +0000
++++ bin/pdfjam
+@@ -1143,19 +1143,19 @@ EndTemplate
+     )  > $texFile
+ if test "$hyperref" = false; then  ## we don't need hyperref
+     cp $texFile $tempFile
+-    sed '/\\\usepackage{hyperref}/d' $tempFile | \
+-      sed '/\\\hypersetup.*/d' > "${texFile}"
++    sed '/\\usepackage{hyperref}/d' $tempFile | \
++      sed '/\\hypersetup.*/d' > "${texFile}"
+     rm $tempFile
+ fi
+ if test -z "$geometry" ; then geometry=false ; fi
+ if test "$geometry" = false; then   ## geometry package is not to be used
+     cp $texFile $tempFile
+-    cat $tempFile | sed '/\\\usepackage.*{geometry}/d' > $texFile
++    cat $tempFile | sed '/\\usepackage.*{geometry}/d' > $texFile
+     rm $tempFile
+ fi
+ if test -z "$pagecolor"; then   ## color package is not needed
+     cp $texFile $tempFile
+-    cat $tempFile | sed '/\\\usepackage.*{color}/d' > $texFile
++    cat $tempFile | sed '/\\usepackage.*{color}/d' > $texFile
+     rm $tempFile
+ fi
+ ##