svn commit: r493404 - in head/graphics/xpdf4: . files
Cy Schubert
cy at FreeBSD.org
Wed Feb 20 03:15:08 UTC 2019
Author: cy
Date: Wed Feb 20 03:15:06 2019
New Revision: 493404
URL: https://svnweb.freebsd.org/changeset/ports/493404
Log:
Update 4.00 --> 4.01.
As of this release the option of not depending on Qt5 and therefore not
installing xpdf is no longer supported.
Deleted:
head/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
head/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt
Modified:
head/graphics/xpdf4/Makefile
head/graphics/xpdf4/distinfo
head/graphics/xpdf4/files/patch-cmake-config.txt
head/graphics/xpdf4/pkg-plist
Modified: head/graphics/xpdf4/Makefile
==============================================================================
--- head/graphics/xpdf4/Makefile Wed Feb 20 01:53:35 2019 (r493403)
+++ head/graphics/xpdf4/Makefile Wed Feb 20 03:15:06 2019 (r493404)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xpdf
-PORTVERSION= 4.00
-PORTREVISION= 2
+PORTVERSION= 4.01
PORTEPOCH= 1
CATEGORIES= graphics print
MASTER_SITES= https://xpdfreader-dl.s3.amazonaws.com/
@@ -26,12 +25,22 @@ 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
@@ -41,14 +50,6 @@ TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/font
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)
@@ -58,12 +59,9 @@ 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 <bsd.port.mk>
Modified: head/graphics/xpdf4/distinfo
==============================================================================
--- head/graphics/xpdf4/distinfo Wed Feb 20 01:53:35 2019 (r493403)
+++ head/graphics/xpdf4/distinfo Wed Feb 20 03:15:06 2019 (r493404)
@@ -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
Modified: head/graphics/xpdf4/files/patch-cmake-config.txt
==============================================================================
--- head/graphics/xpdf4/files/patch-cmake-config.txt Wed Feb 20 01:53:35 2019 (r493403)
+++ head/graphics/xpdf4/files/patch-cmake-config.txt Wed Feb 20 03:15:06 2019 (r493404)
@@ -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 ()
Modified: head/graphics/xpdf4/pkg-plist
==============================================================================
--- head/graphics/xpdf4/pkg-plist Wed Feb 20 01:53:35 2019 (r493403)
+++ head/graphics/xpdf4/pkg-plist Wed Feb 20 03:15:06 2019 (r493404)
@@ -7,9 +7,9 @@ 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
@@ -20,6 +20,6 @@ etc/man.d/xpdf.conf
%%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
More information about the svn-ports-all
mailing list