3 files changed, 33 insertions, 185 deletions

diff --git a/graphics/xpdf4/files/patch-cmake-config.txt b/graphics/xpdf4/files/patch-cmake-config.txt
index e6c3fcaa8be5..2601c3540ad3 100644
--- a/graphics/xpdf4/files/patch-cmake-config.txt
+++ b/graphics/xpdf4/files/patch-cmake-config.txt
@@ -1,26 +1,26 @@
---- 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)
@@ -30,14 +30,21 @@
        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
@@ -45,19 +52,14 @@
 +    ${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}")
@@ -66,6 +68,6 @@
 +  message(STATUS "libpaper not found")
 + endif ()
 +endif ()
- 
- #--- look for pthreads
- find_package(Threads)
+ if (PAPER_LIBRARY)
+   set(HAVE_PAPER_H TRUE)
+ else ()
diff --git a/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt b/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
deleted file mode 100644
index d7e91fe26916..000000000000
--- a/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
+++ /dev/null
@@ -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 ()
diff --git a/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt b/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt
deleted file mode 100644
index dc31866fc386..000000000000
--- a/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt
+++ /dev/null
@@ -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
-     $<TARGET_OBJECTS:xpdf_objs>
-@@ -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
-   $<TARGET_OBJECTS:xpdf_objs>
-   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
-   $<TARGET_OBJECTS:xpdf_objs>
-   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
-   $<TARGET_OBJECTS:xpdf_objs>
-   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)