From 62ff35245303c06f22fee0da9b1b7e046ce4e156 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 5 Oct 2019 02:10:06 +0000
Subject: Update 4.01 --> 4.02

---
 graphics/xpdf4/Makefile                     |  3 +-
 graphics/xpdf4/distinfo                     |  6 +--
 graphics/xpdf4/files/patch-aconf.h.in       | 12 ------
 graphics/xpdf4/files/patch-cmake-config.txt | 59 +++++++++++------------------
 4 files changed, 26 insertions(+), 54 deletions(-)
 delete mode 100644 graphics/xpdf4/files/patch-aconf.h.in

(limited to 'graphics/xpdf4')

diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile
index 8c6332d12bb7..83abf57438f4 100644
--- a/graphics/xpdf4/Makefile
+++ b/graphics/xpdf4/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xpdf
-PORTVERSION=	4.01
-PORTREVISION=	2
+PORTVERSION=	4.02
 PORTEPOCH=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	https://xpdfreader-dl.s3.amazonaws.com/
diff --git a/graphics/xpdf4/distinfo b/graphics/xpdf4/distinfo
index fcdb7740b0ac..599bb1558bea 100644
--- a/graphics/xpdf4/distinfo
+++ b/graphics/xpdf4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550580216
-SHA256 (xpdf-4.01.tar.gz) = a4de7369029ce6d920af39fe02b777d86721464c70a2a678087fe265e5557563
-SIZE (xpdf-4.01.tar.gz) = 891150
+TIMESTAMP = 1570240487
+SHA256 (xpdf-4.02.tar.gz) = 52d51dc943b9614b8da66e8662b3031a3c82dc25bfc792eac6b438aa36d549a4
+SIZE (xpdf-4.02.tar.gz) = 912885
diff --git a/graphics/xpdf4/files/patch-aconf.h.in b/graphics/xpdf4/files/patch-aconf.h.in
deleted file mode 100644
index 760d2682b4f4..000000000000
--- a/graphics/xpdf4/files/patch-aconf.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- aconf.h.in.orig	2017-08-08 16:22:50.000000000 -0700
-+++ aconf.h.in	2017-09-17 20:40:48.183421000 -0700
-@@ -110,4 +110,9 @@
-  */
- #cmakedefine01 BUILDING_XPDFREADER
- 
-+/*
-+ * Defined when print option selected
-+ */
-+#cmakedefine01 XPDFWIDGET_PRINTING
-+
- #endif
diff --git a/graphics/xpdf4/files/patch-cmake-config.txt b/graphics/xpdf4/files/patch-cmake-config.txt
index 2601c3540ad3..10644617e651 100644
--- a/graphics/xpdf4/files/patch-cmake-config.txt
+++ b/graphics/xpdf4/files/patch-cmake-config.txt
@@ -1,47 +1,32 @@
---- cmake-config.txt.orig	2019-02-18 10:24:19.000000000 -0800
-+++ cmake-config.txt	2019-02-19 18:15:45.359569000 -0800
+--- cmake-config.txt.orig	2019-09-25 12:54:33.000000000 -0700
++++ cmake-config.txt	2019-10-04 19:03:10.517020000 -0700
 @@ -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(USE_LIBPAPER "use libpaper" OFF)
+ option(NO_FONTCONFIG "disable support for libfontconfig" OFF)
  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} ${Qt5Network_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}")
-     set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}")
--    if (APPLE)
--      set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport "-framework ApplicationServices")
--    elseif (UNIX)
-+    if (CUPS)
-       set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport cups)
-     else ()
-       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 "")
-@@ -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 @@
+@@ -212,7 +213,7 @@
+       set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
+     elseif (UNIX)
+       find_package(Cups)
+-      if (CUPS_FOUND)
++      if (CUPS)
+         set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
+       else ()
+         set (XPDFWIDGET_PRINTING OFF)
+@@ -230,7 +231,7 @@
+       set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
+     elseif (UNIX)
+       find_package(Cups)
+-      if (CUPS_FOUND)
++      if (CUPS)
+         set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
+       else ()
+         set (XPDFWIDGET_PRINTING OFF)
+@@ -248,6 +249,29 @@
               NAMES paper libpaper
               PATH_SUFFIXES lib64 lib
  )
-- 
cgit v1.2.3