Index: head/graphics/xpdf4/Makefile =================================================================== --- head/graphics/xpdf4/Makefile (revision 450076) +++ head/graphics/xpdf4/Makefile (revision 450077) @@ -1,54 +1,61 @@ # $FreeBSD$ PORTNAME= xpdf PORTVERSION= 4.02 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= http://www.xpdfreader.com/dl/ .if !defined(MASTERDIR) PKGNAMESUFFIX= 4 .endif MAINTAINER= cy@FreeBSD.org COMMENT= Display PDF files and convert them to other formats WRKSRC= ${WRKDIR}/${PORTNAME}-4.00 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= cmake:outsource localbase CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \ -DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc -OPTIONS_DEFINE= TYPE1 LIBPAPER GUI +OPTIONS_DEFINE= TYPE1 LIBPAPER GUI PRINT OPTIONS_DEFAULT= TYPE1 GUI 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= QT5=buildtools_build,qmake_build,concurrent,core,gui,widgets,printsupport + +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 .include Index: head/graphics/xpdf4/files/patch-aconf.h.in =================================================================== --- head/graphics/xpdf4/files/patch-aconf.h.in (nonexistent) +++ head/graphics/xpdf4/files/patch-aconf.h.in (revision 450077) @@ -0,0 +1,12 @@ +--- 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 Property changes on: head/graphics/xpdf4/files/patch-aconf.h.in ___________________________________________________________________ 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: head/graphics/xpdf4/files/patch-cmake-config.txt =================================================================== --- head/graphics/xpdf4/files/patch-cmake-config.txt (revision 450076) +++ head/graphics/xpdf4/files/patch-cmake-config.txt (revision 450077) @@ -1,49 +1,71 @@ ---- cmake-config.txt.orig 2017-09-02 20:30:45 UTC -+++ cmake-config.txt -@@ -79,6 +79,7 @@ option(USE_EXCEPTIONS "use C++ exception +--- 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 @@ 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 () -@@ -278,10 +279,34 @@ else() +@@ -235,9 +236,7 @@ + if (XPDFWIDGET_PRINTING) + set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}") + set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}") +- if (APPLE) +- set(QT_LIBRARIES Qt5::Widgets Qt5::PrintSupport "-framework ApplicationServices") +- elseif (UNIX) ++ if (CUPS) + set(QT_LIBRARIES Qt5::Widgets Qt5::PrintSupport cups) + else () + set(QT_LIBRARIES Qt5::Widgets Qt5::PrintSupport) +@@ -248,9 +247,7 @@ + set(QT_LIBRARIES Qt5::Widgets) + 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 -) +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) Index: head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc =================================================================== --- head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc (nonexistent) +++ head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc (revision 450077) @@ -0,0 +1,20 @@ +--- xpdf-qt/XpdfWidgetPrint.cc.orig 2017-08-08 16:22:50.000000000 -0700 ++++ xpdf-qt/XpdfWidgetPrint.cc 2017-09-17 21:42:14.242967000 -0700 +@@ -21,7 +21,7 @@ + #elif defined(__APPLE__) + # include + # include +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD_cc_version) + # include "PSOutputDev.h" + # include + #endif +@@ -315,7 +315,7 @@ + // Linux + //------------------------------------------------------------------------ + +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD_cc_version) + + static void fileOut(void *stream, const char *data, int len) { + fwrite(data, 1, len, (FILE *)stream); Property changes on: head/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc ___________________________________________________________________ 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