diff options
| -rw-r--r-- | graphics/poppler-glib/pkg-plist | 1 | ||||
| -rw-r--r-- | graphics/poppler/Makefile | 4 | ||||
| -rw-r--r-- | graphics/poppler/distinfo | 4 | ||||
| -rw-r--r-- | graphics/poppler/files/patch-utils_Makefile.in | 86 | ||||
| -rw-r--r-- | graphics/poppler/pkg-plist | 4 |
5 files changed, 47 insertions, 52 deletions
diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist index e638bd6cc..5c2ed78f4 100644 --- a/graphics/poppler-glib/pkg-plist +++ b/graphics/poppler-glib/pkg-plist @@ -31,6 +31,7 @@ libdata/pkgconfig/poppler-glib.pc %%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/Makefile b/graphics/poppler/Makefile index ef243c973..563c311c8 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,9 +1,9 @@ # Created by: marcus@FreeBSD.org # $FreeBSD$ -# $MCom: ports/graphics/poppler/Makefile,v 1.81 2012/10/14 23:04:21 kwm Exp $ +# $MCom: ports/graphics/poppler/Makefile,v 1.82 2012/11/29 12:14:52 kwm Exp $ PORTNAME= poppler -PORTVERSION= 0.20.5 +PORTVERSION= 0.22.1 PORTREVISION?= 0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 5a18f963c..62defd841 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,2 +1,2 @@ -SHA256 (poppler-0.20.5.tar.gz) = c6d7048a5f011dbde1f579d21bcfdd652b472d9d1c607dde9aa89eff960454b6 -SIZE (poppler-0.20.5.tar.gz) = 2158387 +SHA256 (poppler-0.22.1.tar.gz) = 12b6a6d3c0bfda065653b7507cda49e22773693c913f8e563d55fb33031197c0 +SIZE (poppler-0.22.1.tar.gz) = 2213552 diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in index 58cdb32bb..33a7ee9a7 100644 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ b/graphics/poppler/files/patch-utils_Makefile.in @@ -1,103 +1,95 @@ ---- utils/Makefile.in.orig 2012-06-13 13:33:03.000000000 +0200 -+++ utils/Makefile.in 2012-06-13 13:35:43.000000000 +0200 -@@ -68,7 +68,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) - am__DEPENDENCIES_1 = --pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdfdetach_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-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@) -@@ -76,35 +76,35 @@ + am__v_lt_0 = --silent am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) --pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -+pdffonts_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) +-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 = -lpoppler \ - $(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 = -lpoppler \ - @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__objects_2 = pdftohtml-parseargs.$(OBJEXT) -@@ -113,7 +113,7 @@ +@@ -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) +-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) \ -@@ -123,23 +123,23 @@ + $(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 -@@ -441,7 +441,7 @@ + am__depfiles_maybe = depfiles +@@ -451,7 +451,7 @@ $(PDFTOCAIRO_CFLAGS) LDADD = \ - $(top_builddir)/poppler/libpoppler.la \ + -lpoppler \ - $(UTILS_LIBS) \ - $(FONTCONFIG_LIBS) + $(UTILS_LIBS) -@@ -450,7 +450,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 e6ca41182..d831a0b66 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 @@ -98,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 @@ -131,7 +133,7 @@ lib/libpoppler-cpp.so.0 lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.26 +lib/libpoppler.so.34 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc |