Index: head/graphics/xpdf4/Makefile =================================================================== --- head/graphics/xpdf4/Makefile (revision 493403) +++ head/graphics/xpdf4/Makefile (revision 493404) @@ -1,69 +1,67 @@ # $FreeBSD$ PORTNAME= xpdf -PORTVERSION= 4.00 -PORTREVISION= 2 +PORTVERSION= 4.01 PORTEPOCH= 1 CATEGORIES= graphics print MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/ .if !defined(MASTERDIR) PKGNAMESUFFIX= 4 CONFLICTS_INSTALL= xpdf3-* xpdf-* .else CONFLICTS_INSTALL= xpdf3-* xpdf4-* .endif MAINTAINER= cy@FreeBSD.org COMMENT= Display PDF files and convert them to other formats LICENSE= GPLv2 LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png CONFLICTS_INSTALL= xpdf MANPREFIX= ${PREFIX}/share/xpdf SUB_FILES= xpdf-man.conf -USES= compiler:c++11-lang cmake localbase:ldflags +USES= compiler:c++11-lang cmake localbase:ldflags \ + desktop-file-utils qt:5 +USE_QT= buildtools_build,qmake_build,concurrent,core,gui,widgets,\ + printsupport,svg,network CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ - -DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc + -DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc \ + -DCMAKE_INSTALL_PREFIX=${PREFIX} \ + -DCMAKE_INSTALL_BINDIR=${PREFIX}/libexec/xpdf \ + -DCMAKE_INSTALL_MANDIR=${PREFIX}/share/xpdf/man \ + -DNO_TEXT_SELECT:BOOL=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE -OPTIONS_DEFINE= TYPE1 LIBPAPER GUI PRINT -OPTIONS_DEFAULT= TYPE1 GUI PRINT +PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}" + +OPTIONS_DEFINE= TYPE1 LIBPAPER PRINT +OPTIONS_DEFAULT= TYPE1 PRINT OPTIONS_SUB= yes TYPE1_CMAKE_BOOL= TYPE1 TYPE1_DESC= Ghostscript type1 fonts TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/d050000l.pfb:print/gsfonts LIBPAPER_CMAKE_BOOL= USE_LIBPAPER LIBPAPER_LIB_DEPENDS= libpaper.so:print/libpaper -GUI_CMAKE_ON= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=FALSE -GUI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets:BOOL=TRUE -GUI_DESC= QT5 interface -GUI_CMAKE_ARGS+= -DNO_TEXT_SELECT:BOOL=OFF -GUI_USE= QT=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport,svg -GUI_PLIST_SUB= DESKTOPDIR="${DESKTOPDIR}" -GUI_USES= desktop-file-utils qt:5 - PRINT_CMAKE_ON= -DXPDFWIDGET_PRINTING:BOOL=ON -DCUPS:BOOL=ON PRINT_CMAKE_OFF= -DXPDFWIDGET_PRINTING:BOOL=OFF -DCUPS:BOOL=OFF PRINT_DESC= Print support (CUPS dependency) PRINT_LDFLAGS= -L${LOCALBASE}/lib PRINT_LIB_DEPENDS= libcups.so:print/cups post-install: @cd ${STAGEDIR}${PREFIX}; \ ${LN} -sf ../libexec/xpdf/xpdf bin/xpdf - ${INSTALL_DATA} ${WRKSRC}/doc/sample-xpdfrc ${STAGEDIR}${PREFIX}/etc/xpdfrc.sample ${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf - -post-install-GUI-on: ${INSTALL_DATA} ${FILESDIR}/xpdf.desktop ${STAGEDIR}${DESKTOPDIR} .include Index: head/graphics/xpdf4/distinfo =================================================================== --- head/graphics/xpdf4/distinfo (revision 493403) +++ head/graphics/xpdf4/distinfo (revision 493404) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517947887 -SHA256 (xpdf-4.00.tar.gz) = ff3d92c42166e35b1ba6aec9b5f0adffb5fc05a3eb95dc49505b6e344e4216d6 -SIZE (xpdf-4.00.tar.gz) = 854175 +TIMESTAMP = 1550580216 +SHA256 (xpdf-4.01.tar.gz) = a4de7369029ce6d920af39fe02b777d86721464c70a2a678087fe265e5557563 +SIZE (xpdf-4.01.tar.gz) = 891150 Index: head/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt =================================================================== --- head/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt (revision 493403) +++ head/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt (nonexistent) @@ -1,143 +0,0 @@ ---- xpdf/CMakeLists.txt.orig 2017-08-08 23:22:50 UTC -+++ xpdf/CMakeLists.txt -@@ -23,6 +23,9 @@ if (HAVE_LCMS) - else () - set(COLOR_MANAGER_SOURCE "") - endif () -+if (HAVE_PAPER_H) -+ include_directories("${PAPER_INCLUDE_DIR}") -+endif () - - add_library(xpdf_objs OBJECT - AcroForm.cc -@@ -108,7 +111,7 @@ if (HAVE_SPLASH) - target_link_libraries(pdftops goo fofi splash - ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS} - ${DTYPE_LIBRARY} -- ${LCMS_LIBRARY}) -+ ${LCMS_LIBRARY} ${PAPER_LIBRARY}) - else () - add_executable(pdftops - $ -@@ -116,10 +119,10 @@ else () - PSOutputDev.cc - pdftops.cc - ) -- target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY}) -+ target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY}) - endif () --install(TARGETS pdftops RUNTIME DESTINATION bin) --install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION man/man1) -+install(TARGETS pdftops RUNTIME DESTINATION libexec/xpdf) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftops.1 DESTINATION share/xpdf/man/man1) - - #--- pdftotext - -@@ -128,9 +131,9 @@ add_executable(pdftotext - TextOutputDev.cc - pdftotext.cc - ) --target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY}) --install(TARGETS pdftotext RUNTIME DESTINATION bin) --install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION man/man1) -+target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY}) -+install(TARGETS pdftotext RUNTIME DESTINATION libexec/xpdf) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftotext.1 DESTINATION share/xpdf/man/man1) - - #--- pdftohtml - -@@ -145,9 +148,9 @@ if (HAVE_SPLASH AND PNG_FOUND) - target_link_libraries(pdftohtml goo fofi splash - ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS} - ${DTYPE_LIBRARY} -- ${LCMS_LIBRARY} ${PNG_LIBRARIES}) -- install(TARGETS pdftohtml RUNTIME DESTINATION bin) -- install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION man/man1) -+ ${LCMS_LIBRARY} ${PNG_LIBRARIES} ${PAPER_LIBRARY}) -+ install(TARGETS pdftohtml RUNTIME DESTINATION libexec/xpdf) -+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftohtml.1 DESTINATION share/xpdf/man/man1) - endif () - - #--- pdfinfo -@@ -156,9 +159,9 @@ add_executable(pdfinfo - $ - pdfinfo.cc - ) --target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY}) --install(TARGETS pdfinfo RUNTIME DESTINATION bin) --install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION man/man1) -+target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY}) -+install(TARGETS pdfinfo RUNTIME DESTINATION libexec/xpdf) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfinfo.1 DESTINATION share/xpdf/man/man1) - - #--- pdffonts - -@@ -166,9 +169,9 @@ add_executable(pdffonts - $ - pdffonts.cc - ) --target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY}) --install(TARGETS pdffonts RUNTIME DESTINATION bin) --install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION man/man1) -+target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY}) -+install(TARGETS pdffonts RUNTIME DESTINATION libexec/xpdf) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdffonts.1 DESTINATION share/xpdf/man/man1) - - #--- pdfdetach - -@@ -176,9 +179,9 @@ add_executable(pdfdetach - $ - pdfdetach.cc - ) --target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY}) --install(TARGETS pdfdetach RUNTIME DESTINATION bin) --install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION man/man1) -+target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY}) -+install(TARGETS pdfdetach RUNTIME DESTINATION libexec/xpdf) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfdetach.1 DESTINATION share/xpdf/man/man1) - - #--- pdftoppm - -@@ -190,10 +193,10 @@ if (HAVE_SPLASH) - ) - target_link_libraries(pdftoppm goo fofi splash - ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS} -- ${DTYPE_LIBRARY} -+ ${DTYPE_LIBRARY} ${PAPER_LIBRARY} - ${LCMS_LIBRARY}) -- install(TARGETS pdftoppm RUNTIME DESTINATION bin) -- install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION man/man1) -+ install(TARGETS pdftoppm RUNTIME DESTINATION libexec/xpdf) -+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftoppm.1 DESTINATION share/xpdf/man/man1) - endif () - - #--- pdftopng -@@ -206,10 +209,10 @@ if (HAVE_SPLASH AND PNG_FOUND) - ) - target_link_libraries(pdftopng goo fofi splash - ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS} -- ${DTYPE_LIBRARY} -+ ${DTYPE_LIBRARY} ${PAPER_LIBRARY} - ${LCMS_LIBRARY} ${PNG_LIBRARIES}) -- install(TARGETS pdftopng RUNTIME DESTINATION bin) -- install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION man/man1) -+ install(TARGETS pdftopng RUNTIME DESTINATION libexec/xpdf) -+ install(FILES ${PROJECT_SOURCE_DIR}/doc/pdftopng.1 DESTINATION share/xpdf/man/man1) - endif () - - #--- pdfimages -@@ -219,10 +222,10 @@ add_executable(pdfimages - ImageOutputDev.cc - pdfimages.cc - ) --target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY}) --install(TARGETS pdfimages RUNTIME DESTINATION bin) --install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION man/man1) -+target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${PAPER_LIBRARY}) -+install(TARGETS pdfimages RUNTIME DESTINATION libexec/xpdf) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/pdfimages.1 DESTINATION share/xpdf/man/man1) - - #--- xpdfrc man page - --install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION man/man5) -+install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdfrc.5 DESTINATION share/xpdf/man/man5) Property changes on: head/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt ___________________________________________________________________ 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: head/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt =================================================================== --- head/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt (revision 493403) +++ head/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- xpdf-qt/CMakeLists.txt.orig 2017-08-08 23:22:50 UTC -+++ xpdf-qt/CMakeLists.txt -@@ -86,6 +86,6 @@ if ((QT4_FOUND OR Qt5Widgets_FOUND) - ${CMAKE_THREAD_LIBS_INIT}) - set_property(TARGET xpdf PROPERTY WIN32_EXECUTABLE 1) - -- install(TARGETS xpdf RUNTIME DESTINATION bin) -- install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION man/man1) -+ install(TARGETS xpdf RUNTIME DESTINATION libexec/xpdf) -+ install(FILES ${PROJECT_SOURCE_DIR}/doc/xpdf.1 DESTINATION share/xpdf/man/man1) - endif () Property changes on: head/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt ___________________________________________________________________ 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: head/graphics/xpdf4/files/patch-cmake-config.txt =================================================================== --- head/graphics/xpdf4/files/patch-cmake-config.txt (revision 493403) +++ head/graphics/xpdf4/files/patch-cmake-config.txt (revision 493404) @@ -1,71 +1,73 @@ ---- cmake-config.txt.orig 2017-08-08 16:22:50.000000000 -0700 -+++ cmake-config.txt 2017-09-17 21:03:21.838497000 -0700 -@@ -79,6 +79,7 @@ +--- cmake-config.txt.orig 2019-02-18 10:24:19.000000000 -0800 ++++ cmake-config.txt 2019-02-19 18:15:45.359569000 -0800 +@@ -81,6 +81,7 @@ + option(USE_EXCEPTIONS "use C++ exceptions" ON) option(USE_FIXEDPOINT "use fixed point (instead of floating point) arithmetic" OFF) option(SPLASH_CMYK "include support for CMYK rasterization" OFF) - option(SPLASH_DEVICEN "include support for DeviceN rasterization" OFF) +option(USE_LIBPAPER "use libpaper" OFF) - if (SPLASH_DEVICEN) - set(SPLASH_CMYK ON) - endif () -@@ -235,9 +236,7 @@ + option(SYSTEM_XPDFRC "full path for system-wide xpdfrc file" "") + if (SYSTEM_XPDFRC) + set(SYSTEM_XPDFRC_DEFINE "#define SYSTEM_XPDFRC \"${SYSTEM_XPDFRC}\"") +@@ -200,9 +201,7 @@ if (XPDFWIDGET_PRINTING) - set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}") - set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}") + set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}") + set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}") - if (APPLE) -- set(QT_LIBRARIES Qt5::Widgets Qt5::PrintSupport "-framework ApplicationServices") +- set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport "-framework ApplicationServices") - elseif (UNIX) + if (CUPS) - set(QT_LIBRARIES Qt5::Widgets Qt5::PrintSupport cups) + set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport cups) else () - set(QT_LIBRARIES Qt5::Widgets Qt5::PrintSupport) -@@ -248,9 +247,7 @@ - set(QT_LIBRARIES Qt5::Widgets) + set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport) +@@ -213,9 +212,7 @@ + set(QT_LIBRARIES Qt5::Widgets Qt5::Network) endif () if (XPDFWIDGET_PRINTING) - if (APPLE) - set(EXTRA_QT_LIBRARIES "-framework ApplicationServices") - elseif (UNIX) + if (CUPS) set(EXTRA_QT_LIBRARIES cups) else () set(EXTRA_QT_LIBRARIES "") -@@ -278,10 +275,34 @@ - endif() - - #--- look for libpaper --find_library(HAVE_PAPER_H -- NAMES paper libpaper -- PATH_SUFFIXES lib64 lib --) +@@ -226,9 +223,7 @@ + elseif(QT4_FOUND) + message(STATUS "Qt4 found") + if (XPDFWIDGET_PRINTING) +- if (APPLE) +- set(EXTRA_QT_LIBRARIES "-framework ApplicationServices") +- elseif (UNIX) ++ if (CUPS) + set(EXTRA_QT_LIBRARIES cups) + else () + set(EXTRA_QT_LIBRARIES "") +@@ -243,6 +238,29 @@ + NAMES paper libpaper + PATH_SUFFIXES lib64 lib + ) +if(USE_LIBPAPER) + find_library(PAPER_LIBRARY + NAMES paper libpaper + HINTS + ${PAPER_DIR} + PATHS + /usr/local -+ /usr/freeware + ) + find_path(PAPER_INCLUDE_DIR .h + HINTS + ${PAPER_DIR} + PATHS + /usr/local/include -+ /usr/freeware/include + PATH_SUFFIXES include + ) -+endif() -+ -+if (USE_LIBPAPER) + if (PAPER_INCLUDE_DIR AND PAPER_LIBRARY) + set(HAVE_PAPER_H TRUE) + message(STATUS "Found libpaper: ${PAPER_LIBRARY}") + else () + set(HAVE_PAPER_H FALSE) + message(STATUS "libpaper not found") + endif () +endif () - - #--- look for pthreads - find_package(Threads) + if (PAPER_LIBRARY) + set(HAVE_PAPER_H TRUE) + else () Index: head/graphics/xpdf4/pkg-plist =================================================================== --- head/graphics/xpdf4/pkg-plist (revision 493403) +++ head/graphics/xpdf4/pkg-plist (revision 493404) @@ -1,25 +1,25 @@ libexec/xpdf/pdffonts libexec/xpdf/pdfimages libexec/xpdf/pdfinfo libexec/xpdf/pdfdetach libexec/xpdf/pdftohtml libexec/xpdf/pdftopng libexec/xpdf/pdftoppm libexec/xpdf/pdftops libexec/xpdf/pdftotext -%%GUI%%libexec/xpdf/xpdf -%%GUI%%bin/xpdf -%%GUI%%%%DESKTOPDIR%%/xpdf.desktop +libexec/xpdf/xpdf +bin/xpdf +%%DESKTOPDIR%%/xpdf.desktop etc/man.d/xpdf.conf %%DATADIR%%/man/man1/pdfdetach.1.gz %%DATADIR%%/man/man1/pdffonts.1.gz %%DATADIR%%/man/man1/pdfimages.1.gz %%DATADIR%%/man/man1/pdfinfo.1.gz %%DATADIR%%/man/man1/pdftohtml.1.gz %%DATADIR%%/man/man1/pdftopng.1.gz %%DATADIR%%/man/man1/pdftoppm.1.gz %%DATADIR%%/man/man1/pdftops.1.gz %%DATADIR%%/man/man1/pdftotext.1.gz -%%GUI%%%%DATADIR%%/man/man1/xpdf.1.gz +%%DATADIR%%/man/man1/xpdf.1.gz %%DATADIR%%/man/man5/xpdfrc.5.gz @sample etc/xpdfrc.sample