12 files changed, 86 insertions, 11 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 85b8008a08fc..6283e0405fea 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	2.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 046f71b6bcc1..4806e78fb877 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -26,7 +26,6 @@ LIB_DEPENDS=	GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		paper.2:${PORTSDIR}/print/libpaper \
-		poppler-qt.3:${PORTSDIR}/graphics/poppler-qt \
 		wpd-0.8.8:${PORTSDIR}/textproc/libwpd08 \
 		wv2.4:${PORTSDIR}/textproc/wv2
 RUN_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 85b8008a08fc..6283e0405fea 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	2.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/
diff --git a/editors/libreoffice-legacy/Makefile b/editors/libreoffice-legacy/Makefile
index 1f7275e0ccb3..5ddc4796df24 100644
--- a/editors/libreoffice-legacy/Makefile
+++ b/editors/libreoffice-legacy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libreoffice
 PORTVERSION=	3.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 LOVERSION=	${PORTVERSION}.1
 CATEGORIES=	editors
 MASTER_SITES=	http://ftp.osuosl.org/pub/tdf/libreoffice/src/ \
@@ -90,7 +90,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		curl.6:${PORTSDIR}/ftp/curl \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
-		poppler.13:${PORTSDIR}/graphics/poppler \
+		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		wpd-0.9.9:${PORTSDIR}/textproc/libwpd \
 		wpg-0.2.2:${PORTSDIR}/graphics/libwpg \
 		wps-0.2.2:${PORTSDIR}/textproc/libwps \
diff --git a/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx
new file mode 100644
index 000000000000..8a1a054775d2
--- /dev/null
+++ b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx
@@ -0,0 +1,20 @@
+--- ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2010-11-11 16:03:29.000000000 +0000
++++ ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2011-10-29 17:46:20.000000000 +0000
+@@ -150,7 +150,7 @@
+ void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
+ {
+     // dump JPEG file as-is
+-    str = ((DCTStream *)str)->getRawStream();
++    str = str->getBaseStream();
+     str->reset();
+ 
+     int c;
+@@ -489,7 +489,7 @@
+     printf("endPage\n");
+ }
+ 
+-void PDFOutDev::processLink(Link* link, Catalog*)
++void PDFOutDev::processLink(AnnotLink* link, Catalog*)
+ {
+     assert(link);
+ 
diff --git a/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx
new file mode 100644
index 000000000000..f6234c7d1076
--- /dev/null
+++ b/editors/libreoffice-legacy/files/patch-build__libreoffice__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx
@@ -0,0 +1,22 @@
+--- ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2010-11-11 16:03:29.000000000 +0000
++++ ./build/libreoffice/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2011-10-29 17:47:36.000000000 +0000
+@@ -65,7 +65,10 @@
+ class GfxFont;
+ class PDFDoc;
+ #ifndef SYSTEM_POPPLER
++#define POPPLER_CHECK_VERSION(major, minor, micro) (0)
+ typedef GString GooString;
++#else
++#include <glib/poppler-features.h>
+ #endif
+ 
+ namespace pdfi
+@@ -195,7 +198,7 @@
+         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
+         
+         //----- link borders
+-        virtual void processLink(Link *link, Catalog *catalog);
++        virtual void processLink(AnnotLink *link, Catalog *catalog);
+         
+         //----- save/restore graphics state
+         virtual void saveState(GfxState *state);
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index ae59ed24b2d1..5588e76ac2c5 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libreoffice
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 LOVERSION=	${PORTVERSION}.2
 CATEGORIES=	editors
 MASTER_SITES=	http://ftp.osuosl.org/pub/tdf/libreoffice/src/${PORTVERSION}/ \
@@ -91,7 +91,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
 		mythes-1.2.0:${PORTSDIR}/textproc/mythes \
 		hyphen.2:${PORTSDIR}/textproc/hyphen \
-		poppler.13:${PORTSDIR}/graphics/poppler \
+		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		wpd-0.9.9:${PORTSDIR}/textproc/libwpd \
 		wpg-0.2.2:${PORTSDIR}/graphics/libwpg \
 		wps-0.2.2:${PORTSDIR}/textproc/libwps \
diff --git a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx
new file mode 100644
index 000000000000..59a896b3d577
--- /dev/null
+++ b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.cxx
@@ -0,0 +1,11 @@
+--- clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2011-10-26 13:23:40.000000000 +0000
++++ clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2011-10-26 13:23:57.000000000 +0000
+@@ -489,7 +489,7 @@ void PDFOutDev::endPage()
+     printf("endPage\n");
+ }
+ 
+-void PDFOutDev::processLink(Link* link, Catalog*)
++void PDFOutDev::processLink(AnnotLink* link, Catalog*)
+ {
+     assert(link);
+ 
diff --git a/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx
new file mode 100644
index 000000000000..b891f3d08615
--- /dev/null
+++ b/editors/libreoffice/files/patch-clone__extensions__sdext__source__pdfimport__xpdfwrapper__pdfioutdev_gpl.hxx
@@ -0,0 +1,22 @@
+--- clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2011-05-19 09:14:21.000000000 +0000
++++ clone/extensions/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2011-10-29 20:19:33.000000000 +0000
+@@ -65,7 +65,10 @@ class GfxPath;
+ class GfxFont;
+ class PDFDoc;
+ #ifndef SYSTEM_POPPLER
++#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
+ typedef GString GooString;
++#else
++#include <glib/poppler-features.h>
+ #endif
+ 
+ namespace pdfi
+@@ -195,7 +198,7 @@ namespace pdfi
+         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
+         
+         //----- link borders
+-        virtual void processLink(Link *link, Catalog *catalog);
++        virtual void processLink(AnnotLink *link, Catalog *catalog);
+         
+         //----- save/restore graphics state
+         virtual void saveState(GfxState *state);
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index d5dbafc91531..d32ca012cb13 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	texmaker
 PORTVERSION=	3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
@@ -15,7 +16,7 @@ MASTER_SITES=	http://www.xm1math.net/texmaker/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	LaTeX Development Environment
 
-LIB_DEPENDS=	poppler.13:${PORTSDIR}/graphics/poppler \
+LIB_DEPENDS=	poppler.18:${PORTSDIR}/graphics/poppler \
 		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index 0717df3fc46b..85c59e480089 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texmakerx
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	A LaTeX IDE derived from Texmaker
 
-LIB_DEPENDS=	poppler.13:${PORTSDIR}/graphics/poppler \
+LIB_DEPENDS=	poppler.18:${PORTSDIR}/graphics/poppler \
 		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index de11f4b4de28..ccf8ec72f964 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texworks
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}