[69948] trunk/dports/graphics/pdf2djvu

ryandesign at macports.org ryandesign at macports.org
Fri Jul 23 03:43:54 PDT 2010


Revision: 69948
          http://trac.macports.org/changeset/69948
Author:   ryandesign at macports.org
Date:     2010-07-23 03:43:54 -0700 (Fri, 23 Jul 2010)
Log Message:
-----------
pdf2djvu: update to 0.7.4 (fixes incompatibility with latest poppler) and enable GraphicsMagick support; see #25783

Modified Paths:
--------------
    trunk/dports/graphics/pdf2djvu/Portfile

Added Paths:
-----------
    trunk/dports/graphics/pdf2djvu/files/patch-configure.diff
    trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff

Removed Paths:
-------------
    trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff

Modified: trunk/dports/graphics/pdf2djvu/Portfile
===================================================================
--- trunk/dports/graphics/pdf2djvu/Portfile	2010-07-23 10:39:52 UTC (rev 69947)
+++ trunk/dports/graphics/pdf2djvu/Portfile	2010-07-23 10:43:54 UTC (rev 69948)
@@ -2,8 +2,7 @@
 
 PortSystem          1.0
 name                pdf2djvu
-version             0.5.11
-revision        1
+version             0.7.4
 categories          graphics textproc
 maintainers         nomaintainer
 description         Convert PDF to DjVu
@@ -19,15 +18,15 @@
 distname            ${name}_${version}
 worksrcdir          ${name}-${version}
 
-checksums           md5     a9f99c1e755c9f3b5136de235c6851ff \
-                    sha1    cad44090306b28112c0652fff1963b4ee91cec78 \
-                    rmd160  708b3cd28ab8337c2dece643e431aa2e51807381
+checksums           md5     fde5e9bdae4f8643a3457be5989acc83 \
+                    sha1    a3e4e13ac3eeb8f1e643d63d7828a0eec6d944f6 \
+                    rmd160  131f015ccedb071da7394ece0a80a5de65bdc11b
 
-depends_build       port:pkgconfig
+depends_build       port:pkgconfig port:gsed
 
-depends_lib         port:djvulibre port:poppler port:libiconv
+depends_lib         port:djvulibre port:poppler port:libiconv port:GraphicsMagick
 
-patchfiles          patch-configure.disableGM.diff
+patchfiles          patch-configure.diff patch-tools-xml2c.diff
 
 configure.args-append --disable-nls
 

Added: trunk/dports/graphics/pdf2djvu/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/pdf2djvu/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/graphics/pdf2djvu/files/patch-configure.diff	2010-07-23 10:43:54 UTC (rev 69948)
@@ -0,0 +1,11 @@
+--- configure.orig	2010-06-12 15:20:48.000000000 -0500
++++ configure	2010-07-23 05:21:04.000000000 -0500
+@@ -3017,7 +3017,7 @@
+ # Prior to pdf2djvu 0.5.0, pdf2djvu simply dissalowed subsample ratio 12 by
+ # itself.
+ echo 'P1 12 12' > conftest.458211.pbm
+-yes 0 | head -n 144 >> conftest.458211.pbm
++for i in {1..144}; do echo 0; done >> conftest.458211.pbm
+ "$djvulibre_bin_path/cjb2" conftest.458211.pbm conftest.458211.djvu
+ "$djvulibre_bin_path/ddjvu" -format=rle conftest.458211.djvu conftest.458211.sep
+ printf 'P6 1 1 255 xxx' >> conftest.458211.sep

Deleted: trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff
===================================================================
--- trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff	2010-07-23 10:39:52 UTC (rev 69947)
+++ trunk/dports/graphics/pdf2djvu/files/patch-configure.disableGM.diff	2010-07-23 10:43:54 UTC (rev 69948)
@@ -1,45 +0,0 @@
---- configure.orig	2009-07-31 09:18:17.000000000 -0600
-+++ configure	2009-08-02 21:21:22.000000000 -0600
-@@ -3137,8 +3137,8 @@
-         pkg_cv_GRAPHICSMAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagick++\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "GraphicsMagick++") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagickDisabled\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "GraphicsMagickDisabled") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-@@ -3155,8 +3155,8 @@
-         pkg_cv_GRAPHICSMAGICK_LIBS="$GRAPHICSMAGICK_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagick++\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "GraphicsMagick++") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"GraphicsMagickDisabled\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "GraphicsMagickDisabled") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-@@ -3179,9 +3179,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "GraphicsMagick++"`
-+	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "GraphicsMagickDisabled"`
-         else
--	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "GraphicsMagick++"`
-+	        GRAPHICSMAGICK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "GraphicsMagickDisabled"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GRAPHICSMAGICK_PKG_ERRORS" >&5
-@@ -3202,7 +3202,7 @@
- 
- $as_echo "#define HAVE_GRAPHICSMAGICK 1" >>confdefs.h
- 
--    graphicsmagick_version=`$PKG_CONFIG --modversion GraphicsMagick++`
-+    graphicsmagick_version=`$PKG_CONFIG --modversion GraphicsMagickDisabled`
- 
- cat >>confdefs.h <<_ACEOF
- #define GRAPHICSMAGICK_VERSION_STRING "$graphicsmagick_version"

Added: trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff
===================================================================
--- trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff	                        (rev 0)
+++ trunk/dports/graphics/pdf2djvu/files/patch-tools-xml2c.diff	2010-07-23 10:43:54 UTC (rev 69948)
@@ -0,0 +1,11 @@
+--- 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' \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100723/d974c037/attachment.html>


More information about the macports-changes mailing list