The version in FreeBSD ports compiles with the new poppler.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13070 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 8 insertions, 68 deletions

diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 3a95dcf18..f23a1a6f9 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pdf2djvu
-PORTVERSION=	0.5.10
+PORTVERSION=	0.5.11
 PORTREVISION=	2
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
diff --git a/converters/pdf2djvu/distinfo b/converters/pdf2djvu/distinfo
index f531bbd28..a8d80c5c1 100644
--- a/converters/pdf2djvu/distinfo
+++ b/converters/pdf2djvu/distinfo
@@ -1,3 +1,3 @@
-MD5 (pdf2djvu_0.5.10.tar.gz) = 83f43a712a7c560d484045c3e791b104
-SHA256 (pdf2djvu_0.5.10.tar.gz) = dde12c8f4af0c7cc78eef28fcc810b055ca1c74761786bce482a307a9b1dce70
-SIZE (pdf2djvu_0.5.10.tar.gz) = 213490
+MD5 (pdf2djvu_0.5.11.tar.gz) = a9f99c1e755c9f3b5136de235c6851ff
+SHA256 (pdf2djvu_0.5.11.tar.gz) = 6e57f5be61e2274db2aaa78e2a18dff8ddc0fb5e107287bf87fc1270513f66ab
+SIZE (pdf2djvu_0.5.11.tar.gz) = 223827
diff --git a/converters/pdf2djvu/files/patch-configure b/converters/pdf2djvu/files/patch-configure
index 38ea1c8e1..44d5a4fdf 100644
--- a/converters/pdf2djvu/files/patch-configure
+++ b/converters/pdf2djvu/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2009-07-12 12:59:06.000000000 +0200
-+++ configure	2009-07-26 09:04:22.000000000 +0200
-@@ -2971,9 +2971,9 @@
+--- configure.orig	2009-07-31 17:17:53.000000000 +0200
++++ configure	2009-08-19 20:28:26.000000000 +0200
+@@ -2993,9 +2993,9 @@
  printf 'P1 3 3 0 0 0 0 0 0 0 0 0 0' > conftest.458086.pbm
  "$djvulibre_bin_path/cjb2" conftest.458086.pbm conftest.458086.p1.djvu
  "$djvulibre_bin_path/cjb2" conftest.458086.pbm conftest.458086.p2.djvu
@@ -13,7 +13,7 @@
  printf '(bookmarks ("" ""))' > conftest.458086.outline
  "$djvulibre_bin_path/djvused" -s -e 'set-outline conftest.458086.outline' conftest.458086.djvu
  if ! "$djvulibre_bin_path/djvused" -e print-outline conftest.458086.djvu | grep '(bookmarks' > /dev/null
-@@ -3173,7 +3173,7 @@
+@@ -3170,7 +3170,7 @@
  fi
  
  
diff --git a/converters/pdf2djvu/files/patch-pdf2djvu.cc b/converters/pdf2djvu/files/patch-pdf2djvu.cc
deleted file mode 100644
index 19dbe5df9..000000000
--- a/converters/pdf2djvu/files/patch-pdf2djvu.cc
+++ /dev/null
@@ -1,60 +0,0 @@
---- pdf2djvu.cc.orig	2009-09-28 11:26:02.000000000 +0200
-+++ pdf2djvu.cc	2009-09-28 11:37:12.000000000 +0200
-@@ -277,6 +277,8 @@ public:
-     return !config.no_render;
-   }
- 
-+#if POPPLER_VERSION < 1101
-+
-   void drawImageMask(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height, 
-     pdf::Bool invert, pdf::Bool inline_image)
-   {
-@@ -310,6 +312,48 @@ public:
-       color_map, mask_stream, mask_width, mask_height, mask_color_map);
-   }
- 
-+#else
-+ 
-+  void drawImageMask(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
-+    pdf::Bool invert, pdf::Bool interpolate, pdf::Bool inline_image)
-+  {
-+    return;
-+  }
-+ 
-+  void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
-+    pdf::gfx::ImageColorMap *color_map, pdf::Bool interpolate, int *mask_colors, pdf::Bool inline_image)
-+  {
-+    if (is_foreground_color_map(color_map) || config.no_render)
-+      return;
-+    Renderer::drawImage(state, object, stream, width, height, color_map, interpolate, mask_colors, inline_image);
-+  }
-+ 
-+  void drawMaskedImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
-+    pdf::gfx::ImageColorMap *color_map, pdf::Bool interpolate,
-+    pdf::Stream *mask_stream, int mask_width, int mask_height, pdf::Bool mask_invert, pdf::Bool mask_interpolate)
-+  {
-+    if (is_foreground_color_map(color_map) || config.no_render)
-+      return;
-+    Renderer::drawMaskedImage(state, object, stream, width, height,
-+      color_map, interpolate,
-+      mask_stream, mask_width, mask_height, mask_invert, mask_interpolate);
-+ 
-+  }
-+ 
-+  void drawSoftMaskedImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream,
-+    int width, int height, pdf::gfx::ImageColorMap *color_map, pdf::Bool interpolate,
-+    pdf::Stream *mask_stream, int mask_width, int mask_height,
-+    pdf::gfx::ImageColorMap *mask_color_map, pdf::Bool mask_interpolate)
-+  {
-+    if (is_foreground_color_map(color_map) || config.no_render)
-+      return;
-+    Renderer::drawSoftMaskedImage(state, object, stream, width, height,
-+      color_map, interpolate,
-+      mask_stream, mask_width, mask_height, mask_color_map, mask_interpolate);
-+  }
-+ 
-+#endif
-+
-   pdf::Bool interpretType3Chars() { return gFalse; }
- 
-   void drawChar(pdf::gfx::State *state, double x, double y, double dx, double dy, double origin_x, double origin_y,