diff options
| author | mezz <mezz@FreeBSD.org> | 2013-03-21 13:27:16 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2013-03-21 13:27:16 +0800 |
| commit | 659ae5f671621168b5422da58b6dcb246f510611 (patch) | |
| tree | c071769bfc107a2663404651db1a2a29a9d85c31 | |
| parent | 9c185be14dea93a7be1396360eccc508489c375b (diff) | |
| download | freebsd-ports-gnome-659ae5f671621168b5422da58b6dcb246f510611.tar.gz freebsd-ports-gnome-659ae5f671621168b5422da58b6dcb246f510611.tar.zst freebsd-ports-gnome-659ae5f671621168b5422da58b6dcb246f510611.zip | |
- Update poppler to 0.22.2.
- Bump the rest ports that depend on the poppler and poppler-qt because of
shared library version have been changed.
- Add a note in the UPDATING for require to rebuild all ports that depend
on poppler.
Submitted by: kwm (poppler* part)
30 files changed, 160 insertions, 135 deletions
@@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130317: + AFFECTS: users of graphics/poppler + AUTHOR: gnome@FreeBSD.org + + The graphics/poppler has been updated to 0.22.2. The shared library version + has changed from 18 to 34. Please rebuild all ports that depends on it: + + # portmaster -r poppler + or + # portupgrade -fr graphics/poppler + or + # pkg install -fR graphics/poppler + 20130319: AFFECTS: users of net/freerdp AUTHOR: fluffy@FreeBSD.org diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index aaf872181364..d36df0214074 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.5.11 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} @@ -16,7 +16,7 @@ MAINTAINER= darcsis@gmail.com COMMENT= Pdf2djvu creates DjVu files from PDF files BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams -LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler +LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre GNU_CONFIGURE= yes diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index efbb67a477f7..e4aac3d0d218 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -3,13 +3,14 @@ PORTNAME= kbibtex DISTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= databases kde MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/ MAINTAINER= makc@FreeBSD.org COMMENT= Bibliography editor for KDE -LIB_DEPENDS= poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 +LIB_DEPENDS= poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 USE_BZIP2= yes USE_CMAKE= yes diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 30a75150d706..8ff4127d7d0a 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,7 +3,7 @@ PORTNAME= calibre PORTVERSION= 0.9.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 581742a39c59..4083bb85976d 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,6 +2,7 @@ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} +PORTREVISION= 1 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d3da09e1986c..5e9ea40ba72e 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 0 +PORTREVISION= 1 MASTER_SITES+= http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext MASTER_SITE_SUBDIR= src/${PORTVERSION}/ diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index 1c2357ff8355..715cccbb4503 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -3,15 +3,15 @@ PORTNAME= texmaker PORTVERSION= 3.5.2 -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ MAINTAINER= makc@FreeBSD.org COMMENT= LaTeX Development Environment -LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler \ - poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 +LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler \ + poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \ dvips:${PORTSDIR}/print/dvipsk-tetex \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile index 499d0473e2f0..5753e52f55a3 100644 --- a/editors/texmakerx/Makefile +++ b/editors/texmakerx/Makefile @@ -7,7 +7,7 @@ PORTNAME= texmakerx PORTVERSION= 2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::} @@ -15,8 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::} MAINTAINER= lx@FreeBSD.org COMMENT= A LaTeX IDE derived from Texmaker -LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler \ - poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 +LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler \ + poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \ dvips:${PORTSDIR}/print/dvipsk-tetex \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 006cf2d094bc..ea2ce281714a 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -3,7 +3,7 @@ PORTNAME= texworks PORTVERSION= 0.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-r${VCS_REVISION} diff --git a/graphics/evas_generic_loaders-pdf/Makefile b/graphics/evas_generic_loaders-pdf/Makefile index 193fcdad7e6c..36bd1578afb3 100644 --- a/graphics/evas_generic_loaders-pdf/Makefile +++ b/graphics/evas_generic_loaders-pdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= pdf PORTVERSION= 1.7.5 +PORTREVISION= 1 CATEGORIES= graphics enlightenment MASTER_SITES= http://download.enlightenment.fr/releases/ \ LOCAL/gblach/e17/ diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index da2a404376fb..a0ca339b7771 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -2,6 +2,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -14,7 +15,7 @@ LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre \ jpeg.11:${PORTSDIR}/graphics/jpeg \ qca.2:${PORTSDIR}/devel/qca \ tiff.4:${PORTSDIR}/graphics/tiff \ - poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \ + poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \ spectre.1:${PORTSDIR}/print/libspectre \ chm.0:${PORTSDIR}/misc/chmlib \ freetype.9:${PORTSDIR}/print/freetype2 \ diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index 0118fa24b6f0..68de97946685 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: poppler-gtk -# Date created: 2006-01-12 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom$ -# +# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -glib MAINTAINER= gnome@FreeBSD.org @@ -17,7 +13,7 @@ SLAVEPORT= glib PLIST= ${.CURDIR}/pkg-plist pre-build: - cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} libpoppler-cairo.la .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist index d8bc721df4a0..5c2ed78f4cd3 100644 --- a/graphics/poppler-glib/pkg-plist +++ b/graphics/poppler-glib/pkg-plist @@ -30,6 +30,8 @@ libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/api-index-0-14.html %%DOCSDIR%%/poppler/api-index-0-16.html %%DOCSDIR%%/poppler/api-index-0-18.html +%%DOCSDIR%%/poppler/api-index-0-20.html +%%DOCSDIR%%/poppler/api-index-0-22.html %%DOCSDIR%%/poppler/api-index-deprecated.html %%DOCSDIR%%/poppler/api-index-full.html %%DOCSDIR%%/poppler/ch01.html diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile index 9f2274b9a69d..7b80148fd5ef 100644 --- a/graphics/poppler-qt4/Makefile +++ b/graphics/poppler-qt4/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: poppler-qt4 -# Date created: June 26, 2007 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $ -# +# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.18 2012/10/14 23:04:21 kwm Exp $ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt4 MAINTAINER= gnome@FreeBSD.org @@ -16,4 +12,8 @@ MASTERDIR= ${.CURDIR}/../../graphics/poppler SLAVEPORT= qt4 PLIST= ${.CURDIR}/pkg-plist +pre-build: + cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + Makefile ${MAKE_ARGS} libpoppler-arthur.la + .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist index d49be20711e6..bd564b99dbf4 100644 --- a/graphics/poppler-qt4/pkg-plist +++ b/graphics/poppler-qt4/pkg-plist @@ -2,12 +2,13 @@ include/poppler/qt4/poppler-annotation.h include/poppler/qt4/poppler-export.h include/poppler/qt4/poppler-form.h include/poppler/qt4/poppler-link.h +include/poppler/qt4/poppler-media.h include/poppler/qt4/poppler-optcontent.h include/poppler/qt4/poppler-page-transition.h include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.a lib/libpoppler-qt4.la lib/libpoppler-qt4.so -lib/libpoppler-qt4.so.3 +lib/libpoppler-qt4.so.4 libdata/pkgconfig/poppler-qt4.pc @dirrm include/poppler/qt4 diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index fafe6bcf1415..fe9540f610dc 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: poppler-utils -# Date created: 2006-05-01 -# Whom: Michael Nottebrock <lofi@FreeBSD.org> -# +# Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $ -# +# $MCom: ports/graphics/poppler-utils/Makefile,v 1.8 2012/10/14 23:04:21 kwm Exp $ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -utils MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/poppler-utils/pkg-plist b/graphics/poppler-utils/pkg-plist index b8e4fd3953c3..4782d6236779 100644 --- a/graphics/poppler-utils/pkg-plist +++ b/graphics/poppler-utils/pkg-plist @@ -1,3 +1,4 @@ +bin/pdfdetach bin/pdffonts bin/pdfimages bin/pdfinfo diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 29a113e3b50a..337cd0421d2a 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: poppler -# Date created: 03 March 2005 -# Whom: marcus@FreeBSD.org -# +# Created by: marcus@FreeBSD.org # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.74 2011/08/05 14:05:23 kwm Exp $ -# +# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $ PORTNAME= poppler -PORTVERSION= 0.18.4 -PORTREVISION?= 2 +PORTVERSION= 0.22.2 +PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -17,9 +13,9 @@ COMMENT?= A PDF rendering library LICENSE= GPLv2 -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - lcms.1:${PORTSDIR}/graphics/lcms +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + lcms2:${PORTSDIR}/graphics/lcms2 RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data USE_GMAKE= yes @@ -35,18 +31,21 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if !defined(SLAVEPORT) -OPTIONS= CAIRO "Enable cairo output backend" on \ - OPENJPEG "Enable JPEG 2000 support" on +PORTSCOUT= limitw:1,even + +OPTIONS_DEFINE= CAIRO OPENJPEG +OPTIONS_DEFAULT=CAIRO OPENJPEG .endif .include <bsd.port.options.mk> .if defined(SLAVEPORT) -LIB_DEPENDS+= poppler.18:${PORTSDIR}/graphics/poppler +PORTSCOUT= ignore:1 +LIB_DEPENDS+= poppler:${PORTSDIR}/graphics/poppler .if ${SLAVEPORT}=="glib" BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo CONFIGURE_ARGS+=--enable-poppler-glib USE_GNOME+= gnomehier glib20 BUILD_WRKSRC= ${WRKSRC}/glib @@ -59,23 +58,20 @@ CONFIGURE_ARGS+=--disable-poppler-glib CONFIGURE_ARGS+=--enable-poppler-qt4 CONFIGURE_ENV+= ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt4 USE_QT4= gui corelib xml qtestlib moc_build -# It requires poppler/splash to be built unless you disable splash backend -# support to allow you use BUILD_WRKSRC here. It seems that splash backend -# can read more PDF files than without, tested with demos's poppler_qt4viewer. -#BUILD_WRKSRC= ${WRKSRC}/qt4 +BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 .else CONFIGURE_ARGS+=--disable-poppler-qt4 .endif .if ${SLAVEPORT}=="utils" -LIB_DEPENDS+= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib +LIB_DEPENDS+= poppler-glib:${PORTSDIR}/graphics/poppler-glib CONFIGURE_ARGS+=--enable-utils -CONFLICTS= xpdf-[0-9]* BUILD_WRKSRC= ${WRKSRC}/utils INSTALL_WRKSRC= ${WRKSRC}/utils -MAN1= pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparate.1 pdftocairo.1 \ - pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 pdfunite.1 +MAN1= pdfdetach.1 pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparate.1 \ + pdftocairo.1 pdftohtml.1 pdftops.1 pdftotext.1 pdftoppm.1 \ + pdfunite.1 .else CONFIGURE_ARGS+=--disable-utils .endif @@ -85,19 +81,19 @@ CONFIGURE_ARGS+=--disable-poppler-glib \ --disable-poppler-qt4 \ --disable-utils -.if defined(WITHOUT_CAIRO) +.if ${PORT_OPTIONS:MCAIRO} +LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo +PLIST_SUB+= CAIRO="" +.else CONFIGURE_ARGS+=--disable-cairo-output PLIST_SUB+= CAIRO="@comment " -.else -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo -PLIST_SUB+= CAIRO="" .endif -.if defined(WITHOUT_OPENJPEG) -CONFIGURE_ARGS+=--disable-libopenjpeg -.else +.if ${PORT_OPTIONS:MOPENJPEG} CONFIGURE_ARGS+=--enable-libopenjpeg -LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg +.else +CONFIGURE_ARGS+=--disable-libopenjpeg .endif .endif @@ -105,15 +101,12 @@ post-patch: .if ${CXX:M*clang*} && ${CXXFLAGS:M-stdlib=libc++} @${REINPLACE_CMD} '/CXXFLAGS.*-ansi/d' ${WRKSRC}/configure .endif - @${REINPLACE_CMD} -e 's|-version-info 19:0:0|-version-info 18:0:0|g' \ + @${REINPLACE_CMD} -e 's|-version-info 35:0:0|-version-info 34:0:0|g' \ ${WRKSRC}/poppler/Makefile.in .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4" @${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \ ${WRKSRC}/configure .endif - # A fix for bug 52193 (fixed upstream at poppler-0.20) - @${REINPLACE_CMD} -e 's:poppler/poppler-config.h:poppler-config.h:' \ - ${WRKSRC}/goo/*.h ${WRKSRC}/splash/*.h post-install: .if defined(SLAVEPORT) diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 433584f354e6..b34e0426d0dd 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -SHA256 (poppler-0.18.4.tar.gz) = 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e -SIZE (poppler-0.18.4.tar.gz) = 1992993 +SHA256 (poppler-0.22.2.tar.gz) = 108736ef84069317f6c5beacb5268f3b799ecf401e353e239611772eae8a662d +SIZE (poppler-0.22.2.tar.gz) = 2215737 diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure new file mode 100644 index 000000000000..9b176321a8ef --- /dev/null +++ b/graphics/poppler/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2012-08-08 11:59:15.000000000 +0200 ++++ configure 2012-08-08 11:59:45.000000000 +0200 +@@ -20271,8 +20271,8 @@ + + ac_save_USER_INCLUDES="$USER_INCLUDES" + ac_save_USER_LDFLAGS="$USER_LDFLAGS" +- USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS" +- USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_CFLAGS" ++ USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS $CPPFLAGS" ++ USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_LDFLAGS $LDFLAGS" + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5 diff --git a/graphics/poppler/files/patch-glib_demo_Makefile.in b/graphics/poppler/files/patch-glib_demo_Makefile.in index 4671dc0998ea..9e5537da8083 100644 --- a/graphics/poppler/files/patch-glib_demo_Makefile.in +++ b/graphics/poppler/files/patch-glib_demo_Makefile.in @@ -1,15 +1,15 @@ ---- glib/demo/Makefile.in.orig 2011-10-04 00:03:29.000000000 +0200 -+++ glib/demo/Makefile.in 2011-10-04 00:04:47.000000000 +0200 -@@ -66,7 +66,7 @@ poppler_glib_demo_LDADD = $(LDADD) +--- glib/demo/Makefile.in.orig 2012-06-13 13:31:37.000000000 +0200 ++++ glib/demo/Makefile.in 2012-06-13 13:32:45.000000000 +0200 +@@ -66,7 +66,7 @@ am__DEPENDENCIES_1 = poppler_glib_demo_DEPENDENCIES = \ $(top_builddir)/glib/libpoppler-glib.la \ - $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ -lpoppler $(am__DEPENDENCIES_1) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) ++ $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -@@ -355,7 +355,7 @@ poppler_glib_demo_SOURCES = \ +@@ -365,7 +365,7 @@ LDADD = \ $(top_builddir)/glib/libpoppler-glib.la \ diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in index ef417d35abc8..33a7ee9a7ae9 100644 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ b/graphics/poppler/files/patch-utils_Makefile.in @@ -1,94 +1,95 @@ ---- 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 @@ +--- utils/Makefile.in.orig 2013-02-10 17:11:45.000000000 +0000 ++++ utils/Makefile.in 2013-02-10 17:13:35.000000000 +0000 +@@ -84,38 +84,38 @@ + am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1) + pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) + pdfdetach_LDADD = $(LDADD) +-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdfdetach_DEPENDENCIES = + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) - am__DEPENDENCIES_1 = --pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdffonts_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) - AM_V_lt = $(am__v_lt_$(V)) - am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -@@ -76,59 +76,59 @@ +-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdffonts_DEPENDENCIES = + am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ $(am__objects_1) pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) pdfimages_LDADD = $(LDADD) --pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdfimages_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdfimages_DEPENDENCIES = am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ $(am__objects_1) pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) pdfinfo_LDADD = $(LDADD) --pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdfinfo_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdfinfo_DEPENDENCIES = am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1) pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) pdfseparate_LDADD = $(LDADD) --pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdfseparate_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdfseparate_DEPENDENCIES = am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \ @BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1) pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) --am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \ -+am__DEPENDENCIES_2 = \ - $(am__DEPENDENCIES_1) +-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la ++am__DEPENDENCIES_1 = + am__DEPENDENCIES_2 = @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_1) + @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) 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@pdftocairo_DEPENDENCIES = \ + @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) + am__objects_2 = pdftohtml-parseargs.$(OBJEXT) +@@ -124,7 +124,7 @@ + pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2) pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) --pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdftohtml_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) - am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h - @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ +-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdftohtml_DEPENDENCIES = + pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -133,20 +133,20 @@ @BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) pdftoppm_LDADD = $(LDADD) --pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdftoppm_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdftoppm_DEPENDENCIES = am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1) pdftops_OBJECTS = $(am_pdftops_OBJECTS) pdftops_LDADD = $(LDADD) --pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdftops_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdftops_DEPENDENCIES = am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \ $(am__objects_1) pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) pdftotext_LDADD = $(LDADD) --pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdftotext_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdftotext_DEPENDENCIES = am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1) pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) pdfunite_LDADD = $(LDADD) --pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdfunite_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la ++pdfunite_DEPENDENCIES = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -419,7 +419,7 @@ + am__depfiles_maybe = depfiles +@@ -451,7 +451,7 @@ $(PDFTOCAIRO_CFLAGS) LDADD = \ - $(top_builddir)/poppler/libpoppler.la \ + -lpoppler \ - $(UTILS_LIBS) \ - $(FONTCONFIG_LIBS) + $(UTILS_LIBS) -@@ -428,7 +428,7 @@ + @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \ +@@ -459,7 +459,7 @@ @BUILD_CAIRO_OUTPUT_TRUE@ $(common) @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \ diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 18c37146ede5..d831a0b66621 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -58,6 +58,7 @@ include/poppler/StdinPDFDocBuilder.h include/poppler/Stream-CCITT.h include/poppler/Stream.h include/poppler/TextOutputDev.h +include/poppler/UTF.h include/poppler/UTF8.h include/poppler/UnicodeCClassTables.h include/poppler/UnicodeCompTables.h @@ -81,6 +82,7 @@ include/poppler/cpp/poppler-toc.h include/poppler/cpp/poppler-version.h include/poppler/fofi/FoFiBase.h include/poppler/fofi/FoFiEncodings.h +include/poppler/fofi/FoFiIdentifier.h include/poppler/fofi/FoFiTrueType.h include/poppler/fofi/FoFiType1.h include/poppler/fofi/FoFiType1C.h @@ -97,6 +99,7 @@ include/poppler/goo/PNGWriter.h include/poppler/goo/TiffWriter.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h +include/poppler/goo/grandom.h include/poppler/goo/gstrtod.h include/poppler/goo/gtypes.h include/poppler/poppler-config.h @@ -130,7 +133,7 @@ lib/libpoppler-cpp.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.18 +lib/libpoppler.so.34 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile index 8a05b9dfa37e..602489493a28 100644 --- a/graphics/py-poppler-qt4/Makefile +++ b/graphics/py-poppler-qt4/Makefile @@ -2,7 +2,7 @@ PORTNAME= poppler-qt4 PORTVERSION= 0.16.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= GOOGLE_CODE PROJECTHOST= python-poppler-qt4 diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index 5853af7281e3..013986671198 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -3,6 +3,7 @@ PORTNAME= qcomicbook PORTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://qcomicbook.linux-projects.net/releases/ diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 0340542acbf2..f3eeb5a69750 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico PORTVERSION= 2.3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index 87b29cf5d8e1..ad0d498ec29f 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -3,6 +3,7 @@ PORTNAME= qpdfview PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/131409309/ diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 07643c75e8bd..425dfd091b63 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= scribus PORTVERSION= 1.5.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print editors MASTER_SITES= http://download.tuxfamily.org/bartcoding/FreeBSD/ \ ${MASTER_SITE_LOCAL} diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index 9dfca169ed45..eb6ec78e6590 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -3,7 +3,7 @@ PORTNAME= libextractor PORTVERSION= 0.6.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 6e06cb75807c..a35a31562fba 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdfgrep PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= michael@ranner.eu COMMENT= A tool to search text in PDF files -LIB_DEPENDS= poppler.18:${PORTSDIR}/graphics/poppler +LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING |