[98044] trunk/dports/graphics/pdf2djvu

[Ryan Schmidt]

On Sep 23, 2012, at 21:45, nicos at macports.org wrote:

> Revision: 98044
>          http://trac.macports.org//changeset/98044
> Author:   nicos at macports.org
> Date:     2012-09-23 19:45:20 -0700 (Sun, 23 Sep 2012)
> Log Message:
> -----------
> pdf2djvu: upgrade to 0.7.14, with update of patches
> 
> Modified Paths:
> --------------
>    trunk/dports/graphics/pdf2djvu/Portfile
>    trunk/dports/graphics/pdf2djvu/files/patch-configure.diff
> 
> Removed Paths:
> -------------
>    trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff

> @@ -34,8 +32,7 @@
>                     port:GraphicsMagick
> 
> patchfiles          patch-configure.diff \
> -                    patch-i18n.hh.diff \
> -                    patch-tools-xml2c.diff
> +                    patch-i18n.hh.diff
> 
> configure.universal_args-delete \
>                     --disable-dependency-tracking
> @@ -44,6 +41,10 @@
> configure.cxxflags-append \
>                     -DHAVE_SYS_TYPES_H=1
> 
> +pre-configure {
> +    reinplace "s|sed|gsed|g" ${worksrcpath}/tools/xml2c
> +}


> Deleted: trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff
> ===================================================================
> --- trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff	2012-09-24 01:36:56 UTC (rev 98043)
> +++ trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff	2012-09-24 02:45:20 UTC (rev 98044)
> @@ -1,11 +0,0 @@
> ---- tools/xml2c.orig	2010-06-12 15:20:36.000000000 -0500
> -+++ tools/xml2c	2010-07-23 05:25:40.000000000 -0500
> -@@ -6,7 +6,7 @@
> - # it under the terms of the GNU General Public License as published by
> - # the Free Software Foundation; version 2 dated June, 1991.
> - 
> --exec sed \
> -+exec gsed \
> -   -e '/<!--# *\(.*\) *#-->/ { s//\1/; b; }' \
> -   -e '/<!--.*-->/ { s///g; b; }' \
> -   -e 's/\\\\/\\\\/g' \


In most cases, patchfiles are preferred over reinplaces, so this change is a step backward. A patchfile can be easily opened in a text editor and read and understood, and provides context about the changes. When a developer later wants to update a port to a newer version, this context can help them know how to update or whether to discard a failing patch. In contrast, a reinplace doesn't even provide any notification if it fails (see #15514) and even if it did that wouldn't help a developer understand what was being patched before thus it wouldn't help them see what needs to be patched now.

Additionally, this change causes a problem if users interrupt the configure phase and then try to resume, because then the reinplace runs a second time and changes "gsed" into "ggsed":


$ sudo port install pdf2djvu
--->  Computing dependencies for pdf2djvu
--->  Fetching distfiles for pdf2djvu
--->  Verifying checksum(s) for pdf2djvu
--->  Extracting pdf2djvu
--->  Applying patches to pdf2djvu
--->  Configuring pdf2djvu
^C
$ sudo port install pdf2djvu
--->  Computing dependencies for pdf2djvu
--->  Configuring pdf2djvu
--->  Building pdf2djvu
Error: org.macports.build for port pdf2djvu returned: command execution failed
Please see the log file for port pdf2djvu for details:
    /opt/local/var/macports/logs/_Users_rschmidt_macports_dports_graphics_pdf2djvu/pdf2djvu/main.log
To report a bug, follow the instructions in the guide:
    http://guide.macports.org/#project.tickets
Error: Processing of port pdf2djvu failed
$ port log pdf2djvu | grep found
tools/xml2c: line 9: exec: ggsed: not found
$