svn commit: r378348 - in head: converters/pdf2djvu databases/kbibtex deskutils/calibre deskutils/xfce4-tumbler editors/calligra editors/libreoffice editors/openoffice-4 editors/openoffice-devel edi...

Koop Mast kwm at FreeBSD.org
Tue Feb 3 12:28:39 UTC 2015 

Author: kwm
Date: Tue Feb  3 12:28:23 2015
New Revision: 378348
URL: https://svnweb.freebsd.org/changeset/ports/378348
QAT: https://qat.redports.org/buildarchive/r378348/

Log:
  Update poppler to 0.30.0 [1].
  
  Make sure we use openjpeg1 in poppler, while openjpeg2 support
  was added there still bugs in openjpeg2 that need to be fixed.
  Add patches to inkscape for API changes in poppler 0.29.0 [2].
  
  PR:		196599 [1]
  Submitted by:	olivierd@ [1]
  Exp-run by:	antoine@
  Obtained from:	upstream [2]

Added:
  head/graphics/inkscape/files/configure.ac   (contents, props changed)
  head/graphics/inkscape/files/patch-config.h.in   (contents, props changed)
  head/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp   (contents, props changed)
Modified:
  head/converters/pdf2djvu/Makefile
  head/databases/kbibtex/Makefile
  head/deskutils/calibre/Makefile
  head/deskutils/xfce4-tumbler/Makefile
  head/editors/calligra/Makefile
  head/editors/libreoffice/Makefile
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-devel/Makefile
  head/editors/texmaker/Makefile
  head/editors/texstudio/Makefile
  head/editors/texworks/Makefile
  head/graphics/apvlv/Makefile
  head/graphics/atril/Makefile
  head/graphics/electrix/Makefile
  head/graphics/epdfview/Makefile
  head/graphics/evas_generic_loaders-pdf/Makefile
  head/graphics/evince/Makefile
  head/graphics/gdal/Makefile
  head/graphics/gimp-app/Makefile
  head/graphics/inkscape/Makefile
  head/graphics/inkscape/files/patch-configure
  head/graphics/okular/Makefile
  head/graphics/pdf2svg/Makefile
  head/graphics/poppler-glib/Makefile
  head/graphics/poppler-qt4/pkg-plist
  head/graphics/poppler-qt5/pkg-plist
  head/graphics/poppler/Makefile
  head/graphics/poppler/distinfo
  head/graphics/poppler/files/patch-glib_Makefile.in
  head/graphics/poppler/files/patch-utils_Makefile.in
  head/graphics/poppler/pkg-plist
  head/graphics/py-poppler-qt4/Makefile
  head/graphics/py-poppler/Makefile
  head/graphics/qcomicbook/Makefile
  head/graphics/xournal/Makefile
  head/graphics/zathura-pdf-poppler/Makefile
  head/mail/claws-mail-pdf_viewer/Makefile
  head/misc/tellico-kde4/Makefile
  head/print/cups-filters/Makefile
  head/print/deforaos-pdfviewer/Makefile
  head/print/pdfcube/Makefile
  head/print/qpdfview/Makefile
  head/print/tex-luatex/Makefile
  head/print/tex-xetex/Makefile
  head/print/texlive-base/Makefile
  head/sysutils/kfilemetadata/Makefile
  head/sysutils/nepomuk-core/Makefile
  head/sysutils/tracker/Makefile
  head/textproc/pdfgrep/Makefile
  head/x11-fm/gnome-commander2/Makefile
  head/x11-toolkits/rubygem-poppler/Makefile
  head/x11/eaglemode/Makefile

Modified: head/converters/pdf2djvu/Makefile
==============================================================================
--- head/converters/pdf2djvu/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/converters/pdf2djvu/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.7.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}

Modified: head/databases/kbibtex/Makefile
==============================================================================
--- head/databases/kbibtex/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/databases/kbibtex/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kbibtex
 DISTVERSION=	0.4.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases kde
 MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/
 

Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/deskutils/calibre/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	1.48.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 

Modified: head/deskutils/xfce4-tumbler/Makefile
==============================================================================
--- head/deskutils/xfce4-tumbler/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/deskutils/xfce4-tumbler/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tumbler
 PORTVERSION=	0.1.30
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}

Modified: head/editors/calligra/Makefile
==============================================================================
--- head/editors/calligra/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/calligra/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/libreoffice/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Full integrated office productivity suite
 

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/openoffice-4/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/openoffice-devel/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	editors java
 MASTER_SITES=	http://ci.apache.org/projects/openoffice/milestones/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \

Modified: head/editors/texmaker/Makefile
==============================================================================
--- head/editors/texmaker/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/texmaker/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	texmaker
 PORTVERSION=	4.3
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 

Modified: head/editors/texstudio/Makefile
==============================================================================
--- head/editors/texstudio/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/texstudio/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,6 +2,7 @@
 
 PORTNAME=	texstudio
 PORTVERSION=	2.8.8
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
 

Modified: head/editors/texworks/Makefile
==============================================================================
--- head/editors/texworks/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/editors/texworks/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	texworks
 PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-r${VCS_REVISION}

Modified: head/graphics/apvlv/Makefile
==============================================================================
--- head/graphics/apvlv/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/apvlv/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	apvlv
 PORTVERSION=	0.1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://cloud.github.com/downloads/naihe2010/apvlv/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source

Modified: head/graphics/atril/Makefile
==============================================================================
--- head/graphics/atril/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/atril/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	atril
 PORTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate

Modified: head/graphics/electrix/Makefile
==============================================================================
--- head/graphics/electrix/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/electrix/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	electrix
 PORTVERSION=	0.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION}
 

Modified: head/graphics/epdfview/Makefile
==============================================================================
--- head/graphics/epdfview/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/epdfview/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	epdfview
 PORTVERSION=	0.1.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
 		http://mirror.slitaz.org/sources/packages/e/

Modified: head/graphics/evas_generic_loaders-pdf/Makefile
==============================================================================
--- head/graphics/evas_generic_loaders-pdf/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/evas_generic_loaders-pdf/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdf
 PORTVERSION=	1.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PKGNAMEPREFIX:S/-//}/
 PKGNAMEPREFIX=	evas_generic_loaders-

Modified: head/graphics/evince/Makefile
==============================================================================
--- head/graphics/evince/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/evince/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -4,7 +4,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	3.14.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3

Modified: head/graphics/gdal/Makefile
==============================================================================
--- head/graphics/gdal/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/gdal/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.11.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \

Modified: head/graphics/gimp-app/Makefile
==============================================================================
--- head/graphics/gimp-app/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/gimp-app/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	gimp-app
 PORTVERSION=	2.8.14
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP

Modified: head/graphics/inkscape/Makefile
==============================================================================
--- head/graphics/inkscape/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/inkscape/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}

Added: head/graphics/inkscape/files/configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/inkscape/files/configure.ac	Tue Feb  3 12:28:23 2015	(r378348)
@@ -0,0 +1,14 @@
+--- configure.ac.orig	2015-01-29 19:58:01.271153231 +0100
++++ configure.ac	2015-01-29 19:58:25.237151226 +0100
+@@ -593,6 +593,11 @@
+ 	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
+ fi
+ 
++PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
++	AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
++fi
++
+ # Poppler's b604a008 commit changes this
+ AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
+ popplergfxcolor="no"

Added: head/graphics/inkscape/files/patch-config.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/inkscape/files/patch-config.h.in	Tue Feb  3 12:28:23 2015	(r378348)
@@ -0,0 +1,12 @@
+--- config.h.in.orig	2015-01-29 20:28:40.068026139 +0100
++++ config.h.in	2015-01-29 20:31:07.000000000 +0100
+@@ -246,6 +246,9 @@
+ /* Use even newer color space API from Poppler >= 0.26.0 */
+ #undef POPPLER_EVEN_NEWER_COLOR_SPACE_API
+ 
++/* Use even newer new color space API from Poppler >= 0.29.0 */
++#undef POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
++
+ /* Use color space API from Poppler >= 0.12.2 */
+ #undef POPPLER_NEW_COLOR_SPACE_API
+ 

Modified: head/graphics/inkscape/files/patch-configure
==============================================================================
--- head/graphics/inkscape/files/patch-configure	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/inkscape/files/patch-configure	Tue Feb  3 12:28:23 2015	(r378348)
@@ -1,6 +1,37 @@
---- configure.orig	2014-10-20 01:29:05.836430783 +0200
-+++ configure	2014-10-20 01:29:05.872430406 +0200
-@@ -9046,10 +9046,11 @@
+--- configure.orig	2015-01-29 19:57:54.424153129 +0100
++++ configure	2015-01-29 20:00:37.112141976 +0100
+@@ -657,6 +657,8 @@
+ LIBWPG01_CFLAGS
+ INKBOARD_CFLAGS
+ INKBOARD_LIBS
++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
+ POPPLER_NEWERRORAPI_LIBS
+@@ -914,6 +916,8 @@
+ POPPLER_NEWERRORAPI_LIBS
+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
+ LIBWPG01_CFLAGS
+ LIBWPG01_LIBS
+ LIBWPG02_CFLAGS
+@@ -1630,6 +1634,12 @@
+   POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
+               linker flags for POPPLER_EVEN_NEWER_COLOR_SPACE_API, overriding
+               pkg-config
++  POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
++              C compiler flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
++              overriding pkg-config
++  POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
++              linker flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
++              overriding pkg-config
+   LIBWPG01_CFLAGS
+               C compiler flags for LIBWPG01, overriding pkg-config
+   LIBWPG01_LIBS
+@@ -9047,10 +9057,11 @@
  			#include <stdio.h>
  			extern unsigned GC_version;
  			int main(void){
@@ -16,3 +47,87 @@
  			}
  _ACEOF
  if ac_fn_cxx_try_run "$LINENO"; then :
+@@ -10561,6 +10572,83 @@
+ 
+ fi
+ 
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API" >&5
++$as_echo_n "checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API... " >&6; }
++
++if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"; then
++    pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.29.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"; then
++    pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=`$PKG_CONFIG --libs "poppler >= 0.29.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
++        else
++	        POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS" >&5
++
++	popplernewernewcolorspaceapi=no
++elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	popplernewernewcolorspaceapi=no
++else
++	POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
++	POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	popplernewernewcolorspaceapi=yes
++fi
++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
++
++$as_echo "#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1" >>confdefs.h
++
++fi
++
+ # Poppler's b604a008 commit changes this
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Poppler's GfxPatch no longer uses GfxColor" >&5
+ $as_echo_n "checking whether Poppler's GfxPatch no longer uses GfxColor... " >&6; }

Added: head/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp	Tue Feb  3 12:28:23 2015	(r378348)
@@ -0,0 +1,83 @@
+=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
+--- src/extension/internal/pdfinput/pdf-parser.cpp	2014-06-03 15:44:09 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp	2014-12-10 20:32:30 +0000
+@@ -860,7 +860,9 @@
+ 	  blendingColorSpace = NULL;
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++	    blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+@@ -1085,7 +1087,13 @@
+ 
+   state->setFillPattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++  if (obj.isNull()) {
++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++  } else {
++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++  }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+@@ -1126,7 +1134,13 @@
+ 
+   state->setStrokePattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++  if (obj.isNull()) {
++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++  } else {
++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++  }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+@@ -2756,8 +2770,10 @@
+       }
+     }
+     if (!obj1.isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+-            colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++      colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+       colorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
+@@ -2847,8 +2863,10 @@
+ 	  obj2.free();
+ 	}
+       }
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+-            GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
+@@ -3040,7 +3058,9 @@
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++	blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+
+

Modified: head/graphics/okular/Makefile
==============================================================================
--- head/graphics/okular/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/okular/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	okular
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

Modified: head/graphics/pdf2svg/Makefile
==============================================================================
--- head/graphics/pdf2svg/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/pdf2svg/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdf2svg
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cityinthesky.co.uk/_media/opensource/
 

Modified: head/graphics/poppler-glib/Makefile
==============================================================================
--- head/graphics/poppler-glib/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler-glib/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-glib
 
 MAINTAINER=	gnome at FreeBSD.org

Modified: head/graphics/poppler-qt4/pkg-plist
==============================================================================
--- head/graphics/poppler-qt4/pkg-plist	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler-qt4/pkg-plist	Tue Feb  3 12:28:23 2015	(r378348)
@@ -8,5 +8,5 @@ include/poppler/qt4/poppler-page-transit
 include/poppler/qt4/poppler-qt4.h
 lib/libpoppler-qt4.so
 lib/libpoppler-qt4.so.4
-lib/libpoppler-qt4.so.4.4.0
+lib/libpoppler-qt4.so.4.5.0
 libdata/pkgconfig/poppler-qt4.pc

Modified: head/graphics/poppler-qt5/pkg-plist
==============================================================================
--- head/graphics/poppler-qt5/pkg-plist	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler-qt5/pkg-plist	Tue Feb  3 12:28:23 2015	(r378348)
@@ -8,5 +8,5 @@ include/poppler/qt5/poppler-page-transit
 include/poppler/qt5/poppler-qt5.h
 lib/libpoppler-qt5.so
 lib/libpoppler-qt5.so.1
-lib/libpoppler-qt5.so.1.1.0
+lib/libpoppler-qt5.so.1.2.0
 libdata/pkgconfig/poppler-qt5.pc

Modified: head/graphics/poppler/Makefile
==============================================================================
--- head/graphics/poppler/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,8 +3,8 @@
 #   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
 
 PORTNAME=	poppler
-PORTVERSION=	0.26.3
-PORTREVISION?=	1
+PORTVERSION=	0.30.0
+PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -115,8 +115,10 @@ CONFIGURE_ARGS+=--disable-libcurl
 PLIST_SUB+=	CURL="@comment "
 .endif
 
+# stick with openjpeg1 for now due to regression in openjpeg2 (configure)
+# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
 .if ${PORT_OPTIONS:MOPENJPEG}
-CONFIGURE_ARGS+=--enable-libopenjpeg
+CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1
 LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
 .else
 CONFIGURE_ARGS+=--disable-libopenjpeg

Modified: head/graphics/poppler/distinfo
==============================================================================
--- head/graphics/poppler/distinfo	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler/distinfo	Tue Feb  3 12:28:23 2015	(r378348)
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1
-SIZE (poppler-0.26.3.tar.xz) = 1593760
+SHA256 (poppler-0.30.0.tar.xz) = b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5
+SIZE (poppler-0.30.0.tar.xz) = 1605292

Modified: head/graphics/poppler/files/patch-glib_Makefile.in
==============================================================================
--- head/graphics/poppler/files/patch-glib_Makefile.in	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler/files/patch-glib_Makefile.in	Tue Feb  3 12:28:23 2015	(r378348)
@@ -1,19 +1,28 @@
---- glib/Makefile.in.orig	2011-10-03 23:55:25.000000000 +0200
-+++ glib/Makefile.in	2011-10-03 23:56:20.000000000 +0200
-@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+--- glib/Makefile.in.orig	2015-01-19 11:51:06.175898921 +0100
++++ glib/Makefile.in	2015-01-19 11:51:27.026898915 +0100
+@@ -134,7 +134,6 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la \
  	$(top_builddir)/poppler/libpoppler-cairo.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
-@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \
- 	poppler-private.h
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 = libpoppler_glib_la-poppler-enums.lo
+@@ -553,7 +552,7 @@
+ 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
 +	-lpoppler		\
  	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
+ 	$(FREETYPE_LIBS)
+@@ -576,7 +575,7 @@
+ @HAVE_INTROSPECTION_TRUE at introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
+ @HAVE_INTROSPECTION_TRUE at Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
+ @HAVE_INTROSPECTION_TRUE at Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
+- at HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
++ at HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
+ @HAVE_INTROSPECTION_TRUE at Poppler_0_18_gir_FILES = $(introspection_files)
+ @HAVE_INTROSPECTION_TRUE at Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
+ @HAVE_INTROSPECTION_TRUE at Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib

Modified: head/graphics/poppler/files/patch-utils_Makefile.in
==============================================================================
--- head/graphics/poppler/files/patch-utils_Makefile.in	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler/files/patch-utils_Makefile.in	Tue Feb  3 12:28:23 2015	(r378348)
@@ -1,101 +1,105 @@
---- utils/Makefile.in.orig	2014-11-25 11:49:19 UTC
+--- utils/Makefile.in.orig	2014-11-04 18:46:22 UTC
 +++ utils/Makefile.in
-@@ -111,7 +111,7 @@
- am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
+@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
--pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfdetach_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -119,31 +119,31 @@
- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
+-pdfdetach_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfdetach_DEPENDENCIES = libparseargs.la
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES =
+-pdffonts_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = libparseargs.la
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
- 	JSInfo.$(OBJEXT) $(am__objects_1)
+ 	JSInfo.$(OBJEXT)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES =
+-pdfimages_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = libparseargs.la
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
- 	JSInfo.$(OBJEXT) $(am__objects_1)
+ 	JSInfo.$(OBJEXT)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES =
- am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
+-pdfinfo_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = libparseargs.la
+ am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
  pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
  pdfseparate_LDADD = $(LDADD)
--pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfseparate_DEPENDENCIES =
- am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h
- @BUILD_CAIRO_OUTPUT_TRUE at am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__objects_1)
+-pdfseparate_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfseparate_DEPENDENCIES = libparseargs.la
+ am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
+ 	pdftocairo-pdftocairo-win32.$(OBJEXT)
  pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
--am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la
-+am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_1 = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++am__DEPENDENCIES_1 = libparseargs.la
  am__DEPENDENCIES_2 =
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE at am__DEPENDENCIES_3 =  \
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
  am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
-- at BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
-+ at BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2)
-@@ -153,7 +153,7 @@
- 	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
+-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
++pdftocairo_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ 	$(am__DEPENDENCIES_2)
+ am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
+@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+ 	pdftohtml-HtmlOutputDev.$(OBJEXT)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftohtml_DEPENDENCIES =
+-pdftohtml_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES = libparseargs.la
  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -162,20 +162,20 @@
- @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
+ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES =
- am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
+-pdftoppm_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES = libparseargs.la
+ am_pdftops_OBJECTS = pdftops.$(OBJEXT)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES =
- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
- 	$(am__objects_1)
+-pdftops_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES = libparseargs.la
+ am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES =
- am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
+-pdftotext_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES = libparseargs.la
+ am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
  pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
  pdfunite_LDADD = $(LDADD)
--pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfunite_DEPENDENCIES =
+-pdfunite_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfunite_DEPENDENCIES = libparseargs.la
  AM_V_P = $(am__v_P_ at AM_V@)
  am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -516,7 +516,7 @@
- 	$(PDFTOCAIRO_CFLAGS)
+@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
  
  LDADD = \
+ 	libparseargs.la				\
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler	\
  	$(UTILS_LIBS)
  
- @BUILD_CAIRO_OUTPUT_TRUE at pdftocairo_SOURCES = \
-@@ -524,7 +524,7 @@
- @BUILD_CAIRO_OUTPUT_TRUE@	$(common)
+ @BUILD_UTILS_TRUE at dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
+@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
+ 	pdftocairo-win32.h
  
- @BUILD_CAIRO_OUTPUT_TRUE at pdftocairo_LDADD = \
-- at BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la \
-+ at BUILD_CAIRO_OUTPUT_TRUE@	-lpoppler-glib \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD)				\
- @BUILD_CAIRO_OUTPUT_TRUE@	$(PDFTOCAIRO_LIBS)			\
- @BUILD_CAIRO_OUTPUT_TRUE@	$(PTHREAD_LIBS)
+ pdftocairo_LDADD = \
+-	$(top_builddir)/poppler/libpoppler-cairo.la	\
++	-lpoppler-glib	\
+ 	$(LDADD)					\
+ 	$(PDFTOCAIRO_LIBS)				\
+ 	$(PTHREAD_LIBS)

Modified: head/graphics/poppler/pkg-plist
==============================================================================
--- head/graphics/poppler/pkg-plist	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/poppler/pkg-plist	Tue Feb  3 12:28:23 2015	(r378348)
@@ -134,10 +134,10 @@ include/poppler/splash/SplashXPath.h
 include/poppler/splash/SplashXPathScanner.h
 lib/libpoppler-cpp.so
 lib/libpoppler-cpp.so.0
-lib/libpoppler-cpp.so.0.2.0
+lib/libpoppler-cpp.so.0.2.1
 lib/libpoppler.so
-lib/libpoppler.so.46
-lib/libpoppler.so.46.0.0
+lib/libpoppler.so.49
+lib/libpoppler.so.49.0.0
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc

Modified: head/graphics/py-poppler-qt4/Makefile
==============================================================================
--- head/graphics/py-poppler-qt4/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/py-poppler-qt4/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	poppler-qt4
 PORTVERSION=	0.18.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Modified: head/graphics/py-poppler/Makefile
==============================================================================
--- head/graphics/py-poppler/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/py-poppler/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.12.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/ \
 		http://launchpadlibrarian.net/30270080/ \

Modified: head/graphics/qcomicbook/Makefile
==============================================================================
--- head/graphics/qcomicbook/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/qcomicbook/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://qcomicbook.org/releases/
 

Modified: head/graphics/xournal/Makefile
==============================================================================
--- head/graphics/xournal/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/xournal/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xournal
 PORTVERSION=	0.4.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 

Modified: head/graphics/zathura-pdf-poppler/Makefile
==============================================================================
--- head/graphics/zathura-pdf-poppler/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/graphics/zathura-pdf-poppler/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zathura-pdf-poppler
 PORTVERSION=	0.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
 

Modified: head/mail/claws-mail-pdf_viewer/Makefile
==============================================================================
--- head/mail/claws-mail-pdf_viewer/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/mail/claws-mail-pdf_viewer/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pdf_viewer
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 

Modified: head/misc/tellico-kde4/Makefile
==============================================================================
--- head/misc/tellico-kde4/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/misc/tellico-kde4/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tellico
 PORTVERSION=	2.3.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc kde
 MASTER_SITES=	http://tellico-project.org/files/
 

Modified: head/print/cups-filters/Makefile
==============================================================================
--- head/print/cups-filters/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/cups-filters/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cups-filters
 PORTVERSION=	1.0.62
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 

Modified: head/print/deforaos-pdfviewer/Makefile
==============================================================================
--- head/print/deforaos-pdfviewer/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/deforaos-pdfviewer/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdfviewer
 PORTVERSION=	0.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://www.defora.org/os/download/download/3686/
 PKGNAMEPREFIX=	deforaos-

Modified: head/print/pdfcube/Makefile
==============================================================================
--- head/print/pdfcube/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/pdfcube/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdfcube
 PORTVERSION=	0.0.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	http://code.100allora.it/releases/pdfcube/
 

Modified: head/print/qpdfview/Makefile
==============================================================================
--- head/print/qpdfview/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/qpdfview/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qpdfview
 PORTVERSION=	0.4.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	https://launchpadlibrarian.net/140746246/
 

Modified: head/print/tex-luatex/Makefile
==============================================================================
--- head/print/tex-luatex/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/tex-luatex/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	luatex
 PORTVERSION=	0.79.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMEPREFIX=	tex-

Modified: head/print/tex-xetex/Makefile
==============================================================================
--- head/print/tex-xetex/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/tex-xetex/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xetex
 PORTVERSION=	0.99991
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMEPREFIX=	tex-

Modified: head/print/texlive-base/Makefile
==============================================================================
--- head/print/texlive-base/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/print/texlive-base/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20140525
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2014/
 PKGNAMESUFFIX=	-base

Modified: head/sysutils/kfilemetadata/Makefile
==============================================================================
--- head/sysutils/kfilemetadata/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/sysutils/kfilemetadata/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kfilemetadata
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

Modified: head/sysutils/nepomuk-core/Makefile
==============================================================================
--- head/sysutils/nepomuk-core/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/sysutils/nepomuk-core/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nepomuk-core
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

Modified: head/sysutils/tracker/Makefile
==============================================================================
--- head/sysutils/tracker/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/sysutils/tracker/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -4,7 +4,7 @@
 
 PORTNAME=	tracker
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 

Modified: head/textproc/pdfgrep/Makefile
==============================================================================
--- head/textproc/pdfgrep/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/textproc/pdfgrep/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdfgrep
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 MASTER_SITE_SUBDIR=	${PORTNAME}

Modified: head/x11-fm/gnome-commander2/Makefile
==============================================================================
--- head/x11-fm/gnome-commander2/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/x11-fm/gnome-commander2/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME/sources/gnome-commander/1.4

Modified: head/x11-toolkits/rubygem-poppler/Makefile
==============================================================================
--- head/x11-toolkits/rubygem-poppler/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/x11-toolkits/rubygem-poppler/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -2,7 +2,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits rubygems
 MASTER_SITES=	RG
 

Modified: head/x11/eaglemode/Makefile
==============================================================================
--- head/x11/eaglemode/Makefile	Tue Feb  3 11:08:59 2015	(r378347)
+++ head/x11/eaglemode/Makefile	Tue Feb  3 12:28:23 2015	(r378348)
@@ -3,6 +3,7 @@
 
 PORTNAME=	eaglemode
 PORTVERSION=	0.87.0
+PORTREVISION=	1
 CATEGORIES=	x11

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list