Index: graphics/poppler/Makefile =================================================================== --- graphics/poppler/Makefile (revision 451135) +++ graphics/poppler/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= poppler -PORTVERSION= 0.57.0 +PORTVERSION= 0.60.0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -21,26 +21,22 @@ libnspr4.so:devel/nspr RUN_DEPENDS= poppler-data>0:graphics/poppler-data -USES= cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz +USES= cmake cpe jpeg localbase pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= libxml2 -GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-zlib \ - --enable-xpdf-headers \ - --disable-libnss \ - --disable-gtk-test \ - --without-html-dir \ - --disable-static \ - --enable-libnss +CMAKE_ARGS= -DENABLE_ZLIB:BOOL=true \ + -DENABLE_XPDF_HEADERS:BOOL=true \ + -DWITH_NSS3:BOOL=true + # --enable-libnss -INSTALL_TARGET= install-strip +#INSTALL_TARGET= install-strip .if !defined(SLAVEPORT) PORTSCOUT= limitw:1,even -OPTIONS_DEFINE= CAIRO CURL OPENJPEG -OPTIONS_DEFAULT=CAIRO OPENJPEG +OPTIONS_DEFINE= CURL OPENJPEG +OPTIONS_DEFAULT=CURL OPENJPEG USES+= iconv .endif @@ -52,27 +48,25 @@ LIB_DEPENDS+= libpoppler.so:graphics/poppler .if ${SLAVEPORT}==glib -CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes +CMAKE_ARGS+= -DENABLE_GLIB:BOOL=true USE_GNOME+= cairo glib20 introspection:build BUILD_WRKSRC= ${WRKSRC}/glib INSTALL_WRKSRC= ${WRKSRC}/glib .else -CONFIGURE_ARGS+=--disable-poppler-glib +CMAKE_ARGS+= -DENABLE_GLIB:BOOL=false .endif .if ${SLAVEPORT}==qt4 -CONFIGURE_ARGS+=--enable-poppler-qt4 -CONFIGURE_ENV+= MOCQT4=${MOC} +CMAKE_ARGS+= -DENABLE_QT4:BOOL=true USE_QT4= gui corelib xml qtestlib moc_build BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 .else -CONFIGURE_ARGS+=--disable-poppler-qt4 +CMAKE_ARGS+= -DENABLE_QT4:BOOL=false .endif .if ${SLAVEPORT}==qt5 -CONFIGURE_ARGS+=--enable-poppler-qt5 -CONFIGURE_ENV+= MOCQT5=${MOC} +CMAKE_ARGS+= -DENABLE_QT5:BOOL=true USE_QT5= core gui widgets xml buildtools_build testlib_build # Qt from 5.7.0 on requires c++11. USE_CXXSTD= c++11 @@ -79,52 +73,42 @@ BUILD_WRKSRC= ${WRKSRC}/qt5 INSTALL_WRKSRC= ${WRKSRC}/qt5 .else -CONFIGURE_ARGS+=--disable-poppler-qt5 +CMAKE_ARGS+= -DENABLE_QT5:BOOL=false .endif .if ${SLAVEPORT}==utils LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib -CONFIGURE_ARGS+=--enable-utils +USE_GNOME+= cairo +CMAKE_ARGS+= -DENABLE_UTILS:BOOL=true BUILD_WRKSRC= ${WRKSRC}/utils INSTALL_WRKSRC= ${WRKSRC}/utils .else -CONFIGURE_ARGS+=--disable-utils +CMAKE_ARGS+= -DENABLE_UTILS:BOOL=false .endif .else # ! SLAVE options below -CONFIGURE_ARGS+=--disable-poppler-glib \ - --disable-poppler-qt4 \ - --disable-poppler-qt5 \ - --disable-utils +CMAKE_ARGS+= -DENABLE_GLIB:BOOL=false \ + -DENABLE_QT4:BOOL=false \ + -DENABLE_QT5:BOOL=false \ + -DENABLE_UTILS:BOOL=false -.if ${PORT_OPTIONS:MCAIRO} -LIB_DEPENDS+= libcairo.so:graphics/cairo -PLIST_SUB+= CAIRO="" -.else -CONFIGURE_ARGS+=--disable-cairo-output -PLIST_SUB+= CAIRO="@comment " -.endif - .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:ftp/curl -CONFIGURE_ARGS+=--enable-libcurl +CMAKE_ARGS+= -DENABLE_LIBCURL:BOOL=true PLIST_SUB+= CURL="" .else -CONFIGURE_ARGS+=--disable-libcurl +CMAKE_ARGS+= -DENABLE_LIBCURL:BOOL=false PLIST_SUB+= CURL="@comment " .endif .if ${PORT_OPTIONS:MOPENJPEG} -CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2 +CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING=openjpeg2 LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg .else -CONFIGURE_ARGS+=--enable-libopenjpeg=none +CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING=none .endif .endif # end of options -post-patch: - @${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure - post-install: .if defined(SLAVEPORT) . if ${SLAVEPORT}==glib Index: graphics/poppler/distinfo =================================================================== --- graphics/poppler/distinfo (revision 451135) +++ graphics/poppler/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1503426409 -SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 -SIZE (poppler-0.57.0.tar.xz) = 1703300 +TIMESTAMP = 1507026268 +SHA256 (poppler-0.60.0.tar.xz) = 1570774f44ba86c42ffacc5d9151a771e99584a55e6631bdf267123a2aed1c72 +SIZE (poppler-0.60.0.tar.xz) = 1432384 Index: graphics/poppler/files/patch-CMakeLists.txt =================================================================== --- graphics/poppler/files/patch-CMakeLists.txt (nonexistent) +++ graphics/poppler/files/patch-CMakeLists.txt (working copy) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2017-10-03 15:28:26.040955000 +0200 ++++ CMakeLists.txt 2017-10-03 15:28:50.084890000 +0200 +@@ -500,7 +500,7 @@ + set(poppler_SRCS ${poppler_SRCS} + poppler/SignatureHandler.cc + ) +- set(poppler_LIBS ${poppler_LIBS} ${NSS3_LIBRARIES}) ++ set(poppler_LIBS ${poppler_LIBS} ${NSS3_LDFLAGS} ${NSS3_LIBRARIES}) + endif() + if(LIBOPENJPEG_FOUND) + set(poppler_SRCS ${poppler_SRCS} Property changes on: graphics/poppler/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/poppler/files/patch-cmake_moducles_FindNSS3.cmake =================================================================== --- graphics/poppler/files/patch-cmake_moducles_FindNSS3.cmake (nonexistent) +++ graphics/poppler/files/patch-cmake_moducles_FindNSS3.cmake (working copy) @@ -0,0 +1,10 @@ +--- cmake/modules/FindNSS3.cmake.orig 2017-10-03 15:25:42.717099000 +0200 ++++ cmake/modules/FindNSS3.cmake 2017-10-03 15:26:14.402124000 +0200 +@@ -17,6 +17,6 @@ + + pkg_check_modules(NSS3 "nss>=3.19") + +- find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS) ++ find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LDFLAGS NSS3_LIBRARIES NSS3_CFLAGS) + + endif(NOT WIN32) Property changes on: graphics/poppler/files/patch-cmake_moducles_FindNSS3.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/poppler/files/patch-configure =================================================================== --- graphics/poppler/files/patch-configure (revision 451135) +++ graphics/poppler/files/patch-configure (nonexistent) @@ -1,29 +0,0 @@ ---- configure.orig 2016-07-24 22:14:28 UTC -+++ configure -@@ -20556,7 +20556,7 @@ fi - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" --ac_save_LIBS="$LDFLAGS" -+ac_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS" - LIBS="$LIBS $LIBTIFF_LIBS" -@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then : - else - - ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm" -+LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm" - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the - else - - ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm" -+LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm" - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext Property changes on: graphics/poppler/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-glib_Makefile.in =================================================================== --- graphics/poppler/files/patch-glib_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-glib_Makefile.in (nonexistent) @@ -1,28 +0,0 @@ ---- 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__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) -@@ -576,7 +575,7 @@ - @HAVE_INTROSPECTION_TRUE@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@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0 - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) --@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la -+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files) - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib Property changes on: graphics/poppler/files/patch-glib_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-glib_demo_Makefile.in =================================================================== --- graphics/poppler/files/patch-glib_demo_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-glib_demo_Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- 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) -+ $(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 -@@ -365,7 +365,7 @@ - - LDADD = \ - $(top_builddir)/glib/libpoppler-glib.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(GTK_TEST_LIBS) - - all: all-am Property changes on: graphics/poppler/files/patch-glib_demo_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-qt4_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt4_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-qt4_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- qt4/Makefile.in.orig 2008-03-24 08:30:49.000000000 -0400 -+++ qt4/Makefile.in 2008-03-24 08:30:34.000000000 -0400 -@@ -223,7 +223,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - win32_libs = @win32_libs@ --SUBDIRS = src tests demos -+SUBDIRS = src - all: all-recursive - - .SUFFIXES: Property changes on: graphics/poppler/files/patch-qt4_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-qt4_src_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt4_src_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-qt4_src_Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- qt4/src/Makefile.in.orig 2013-12-02 18:58:51.000000000 +0100 -+++ qt4/src/Makefile.in 2013-12-02 18:59:39.000000000 +0100 -@@ -129,7 +129,7 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \ - libpoppler_qt4_la-poppler-page.lo \ - libpoppler_qt4_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ - -Dpoppler_qt4_EXPORTS - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@ Property changes on: graphics/poppler/files/patch-qt4_src_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-qt5_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt5_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-qt5_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- qt5/Makefile.in.orig 2014-11-25 11:49:19 UTC -+++ qt5/Makefile.in -@@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - win32_libs = @win32_libs@ --SUBDIRS = src tests demos -+SUBDIRS = src - all: all-recursive - - .SUFFIXES: Property changes on: graphics/poppler/files/patch-qt5_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-qt5_src_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt5_src_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-qt5_src_Makefile.in (nonexistent) @@ -1,20 +0,0 @@ ---- qt5/src/Makefile.in.orig 2014-11-25 11:49:19 UTC -+++ qt5/src/Makefile.in -@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt5_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \ - libpoppler_qt5_la-poppler-page.lo \ - libpoppler_qt5_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \ - -Dpoppler_qt5_EXPORTS -fPIC - - libpoppler_qt5_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT5_LIBS) - - libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@ Property changes on: graphics/poppler/files/patch-qt5_src_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/files/patch-utils_Makefile.in =================================================================== --- graphics/poppler/files/patch-utils_Makefile.in (revision 451135) +++ graphics/poppler/files/patch-utils_Makefile.in (nonexistent) @@ -1,111 +0,0 @@ ---- utils/Makefile.in.orig 2016-03-16 22:22:14 UTC -+++ utils/Makefile.in -@@ -136,45 +136,38 @@ PROGRAMS = $(bin_PROGRAMS) - am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) - pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) - pdfdetach_LDADD = $(LDADD) --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 = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdffonts_DEPENDENCIES = libparseargs.la - am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) - pdfimages_LDADD = $(LDADD) --pdfimages_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfimages_DEPENDENCIES = libparseargs.la - am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) - pdfinfo_LDADD = $(LDADD) --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 = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfseparate_DEPENDENCIES = libparseargs.la - am_pdfsig_OBJECTS = pdfsig.$(OBJEXT) - pdfsig_OBJECTS = $(am_pdfsig_OBJECTS) - pdfsig_LDADD = $(LDADD) --pdfsig_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfsig_DEPENDENCIES = libparseargs.la - am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ - pdftocairo-pdftocairo-win32.$(OBJEXT) - pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) --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@am__DEPENDENCIES_3 = \ - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) - am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) --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) \ -@@ -182,31 +175,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht - pdftohtml-HtmlOutputDev.$(OBJEXT) - pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) - pdftohtml_LDADD = $(LDADD) --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 $@ - am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) - pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) - pdftoppm_LDADD = $(LDADD) --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 = 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 = 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 = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfunite_DEPENDENCIES = libparseargs.la - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -549,7 +537,7 @@ AM_CPPFLAGS = \ - - LDADD = \ - libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(UTILS_LIBS) - - @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ -@@ -615,7 +603,7 @@ pdftocairo_SOURCES = \ - pdftocairo-win32.h - - pdftocairo_LDADD = \ -- $(top_builddir)/poppler/libpoppler-cairo.la \ -+ -lpoppler-glib \ - $(LDADD) \ - $(PDFTOCAIRO_LIBS) \ - $(PTHREAD_LIBS) Property changes on: graphics/poppler/files/patch-utils_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/poppler/pkg-plist =================================================================== --- graphics/poppler/pkg-plist (revision 451135) +++ graphics/poppler/pkg-plist (working copy) @@ -19,6 +19,7 @@ include/poppler/FontEncodingTables.h include/poppler/FontInfo.h include/poppler/Form.h +include/poppler/Function.cc include/poppler/Function.h include/poppler/Gfx.h include/poppler/GfxFont.h @@ -28,6 +29,7 @@ include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h +include/poppler/JPEG2000Stream.h include/poppler/Lexer.h include/poppler/Linearization.h include/poppler/Link.h @@ -54,8 +56,6 @@ include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SecurityHandler.h -include/poppler/SignatureHandler.h -include/poppler/SignatureInfo.h include/poppler/Sound.h include/poppler/SplashOutputDev.h include/poppler/StdinCachedFile.h @@ -102,7 +102,6 @@ include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h -include/poppler/goo/NetPBMWriter.h include/poppler/goo/PNGWriter.h include/poppler/goo/TiffWriter.h include/poppler/goo/gfile.h @@ -138,9 +137,9 @@ lib/libpoppler-cpp.so.0 lib/libpoppler-cpp.so.0.3.0 lib/libpoppler.so -lib/libpoppler.so.68 -lib/libpoppler.so.68.0.0 -%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc +lib/libpoppler.so.70 +lib/libpoppler.so.70.0.0 +libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc Index: graphics/poppler-glib/Makefile =================================================================== --- graphics/poppler-glib/Makefile (revision 451135) +++ graphics/poppler-glib/Makefile (working copy) @@ -11,8 +11,4 @@ SLAVEPORT= glib PLIST= ${.CURDIR}/pkg-plist -pre-build: - @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} libpoppler-cairo.la - .include "${MASTERDIR}/Makefile" Index: graphics/poppler-qt4/Makefile =================================================================== --- graphics/poppler-qt4/Makefile (revision 451135) +++ graphics/poppler-qt4/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Michael Johnson # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt4 MAINTAINER= gnome@FreeBSD.org Index: graphics/poppler-qt5/Makefile =================================================================== --- graphics/poppler-qt5/Makefile (revision 451135) +++ graphics/poppler-qt5/Makefile (working copy) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MAINTAINER= gnome@FreeBSD.org Index: graphics/poppler-qt5/pkg-plist =================================================================== --- graphics/poppler-qt5/pkg-plist (revision 451135) +++ graphics/poppler-qt5/pkg-plist (working copy) @@ -2,7 +2,6 @@ include/poppler/qt5/poppler-export.h include/poppler/qt5/poppler-form.h include/poppler/qt5/poppler-link.h -include/poppler/qt5/poppler-link-private.h include/poppler/qt5/poppler-media.h include/poppler/qt5/poppler-optcontent.h include/poppler/qt5/poppler-page-transition.h