Update to 0.18.4.

4 files changed, 17 insertions, 23 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 1595dabaeaa9..be984114ba14 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.18.0
+PORTVERSION=	0.18.4
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -102,6 +102,8 @@ LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|-version-info 19:0:0|-version-info 18:0:0|g' \
+		${WRKSRC}/poppler/Makefile.in
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4"
 	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
 		${WRKSRC}/configure
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index efbd2491d727..433584f354e6 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.18.0.tar.gz) = 9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8
-SIZE (poppler-0.18.0.tar.gz) = 1949737
+SHA256 (poppler-0.18.4.tar.gz) = 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e
+SIZE (poppler-0.18.4.tar.gz) = 1992993
diff --git a/graphics/poppler/files/patch-poppler_PSOutputDev.cc b/graphics/poppler/files/patch-poppler_PSOutputDev.cc
deleted file mode 100644
index b345cdbc48d5..000000000000
--- a/graphics/poppler/files/patch-poppler_PSOutputDev.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- poppler/PSOutputDev.cc.orig	2011-10-03 23:24:27.000000000 +0200
-+++ poppler/PSOutputDev.cc	2011-10-03 23:26:21.000000000 +0200
-@@ -1315,7 +1315,7 @@
-     writePS("%!PS-Adobe-3.0 Resource-Form\n");
-     break;
-   }
--  writePSFmt("% Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
-+  writePSFmt("%Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
-   xref->getDocInfo(&info);
-   if (info.isDict() && info.dictLookup("Creator", &obj1)->isString()) {
-     writePS("%%Creator: ");
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 6407099a16ec..ef417d35abc8 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,6 +1,6 @@
---- utils/Makefile.in.orig	2011-10-04 00:18:03.000000000 +0200
-+++ utils/Makefile.in	2011-10-04 00:24:39.000000000 +0200
-@@ -65,7 +65,7 @@
+--- utils/Makefile.in.orig	2012-02-22 16:52:39.000000000 +0100
++++ utils/Makefile.in	2012-02-22 16:56:09.000000000 +0100
+@@ -67,7 +67,7 @@
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -9,7 +9,7 @@
  	$(am__DEPENDENCIES_1)
  AM_V_lt = $(am__v_lt_$(V))
  am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -74,56 +74,56 @@
+@@ -76,59 +76,59 @@
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
@@ -36,10 +36,13 @@
 -am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
 +am__DEPENDENCIES_2 = \
  	$(am__DEPENDENCIES_1)
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_1)
+ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
 -@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
 +@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \
  @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4)
  am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
@@ -76,8 +79,8 @@
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -409,7 +409,7 @@
- 	$(CAIRO_CFLAGS)
+@@ -419,7 +419,7 @@
+ 	$(PDFTOCAIRO_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
@@ -85,12 +88,12 @@
  	$(UTILS_LIBS)				\
  	$(FONTCONFIG_LIBS)
  
-@@ -418,7 +418,7 @@
+@@ -428,7 +428,7 @@
  @BUILD_CAIRO_OUTPUT_TRUE@	$(common)
  
  @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \
 -@BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la \
 +@BUILD_CAIRO_OUTPUT_TRUE@	-lpoppler-glib \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD) $(CAIRO_LIBS)
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD) $(PDFTOCAIRO_LIBS)
  
  @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo