aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorKoop Mast <kwm@rainbow-runner.nl>2017-09-15 15:12:44 +0800
committerKoop Mast <kwm@rainbow-runner.nl>2017-09-15 15:12:44 +0800
commitab1f40794d9dbcc1388a9257d285362f52f74596 (patch)
tree2a6a7e2dc039c429914eaca76a443556bf403df2 /graphics
parentfd6770ac21bfbaf4055314e3e44262e074d8043b (diff)
parent26f34f6d62441f81a8d0d43f1908a496c283ee05 (diff)
downloadfreebsd-ports-gnome-gnome-3.24.tar.gz
freebsd-ports-gnome-gnome-3.24.tar.zst
freebsd-ports-gnome-gnome-3.24.zip
Merge branch 'master' into gnome-3.24gnome-3.24
Diffstat (limited to 'graphics')
-rw-r--r--graphics/GraphicsMagick/Makefile1
-rw-r--r--graphics/ImageMagick/Makefile1
-rw-r--r--graphics/ImageMagick7/Makefile1
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/OpenEXR/Makefile2
-rw-r--r--graphics/R-cran-gridExtra/Makefile2
-rw-r--r--graphics/R-cran-gridExtra/distinfo6
-rw-r--r--graphics/aaphoto/Makefile2
-rw-r--r--graphics/aeskulap/Makefile1
-rw-r--r--graphics/agave/Makefile2
-rw-r--r--graphics/alembic/Makefile2
-rw-r--r--graphics/animorph/Makefile2
-rw-r--r--graphics/appleseed/Makefile6
-rw-r--r--graphics/argyllcms/Makefile2
-rw-r--r--graphics/aseprite/Makefile2
-rw-r--r--graphics/atril-lite/Makefile8
-rw-r--r--graphics/atril/Makefile10
-rw-r--r--graphics/atril/distinfo6
-rw-r--r--graphics/blender/Makefile2
-rw-r--r--graphics/bugle/Makefile2
-rw-r--r--graphics/caffe/Makefile2
-rw-r--r--graphics/cairo/pkg-descr2
-rw-r--r--graphics/cairomm/Makefile1
-rw-r--r--graphics/cegui/Makefile2
-rw-r--r--graphics/cimg/Makefile1
-rw-r--r--graphics/code-eli/Makefile2
-rw-r--r--graphics/colmap/Makefile1
-rw-r--r--graphics/converseen/Makefile2
-rw-r--r--graphics/copperspice/Makefile2
-rw-r--r--graphics/darktable/Makefile2
-rw-r--r--graphics/dataplot/Makefile2
-rw-r--r--graphics/dcp2icc/Makefile2
-rw-r--r--graphics/delaboratory/Makefile2
-rw-r--r--graphics/dilay/Makefile2
-rw-r--r--graphics/drm-next-kmod/Makefile6
-rw-r--r--graphics/drm-next-kmod/distinfo6
-rw-r--r--graphics/drm-next-kmod/pkg-descr3
-rw-r--r--graphics/drm-next-kmod/pkg-message19
-rw-r--r--graphics/enblend/Makefile2
-rw-r--r--graphics/freeimage/Makefile2
-rw-r--r--graphics/gdtclft/Makefile4
-rw-r--r--graphics/generic_image_decoder/pkg-descr2
-rw-r--r--graphics/geomorph/Makefile2
-rw-r--r--graphics/gimp-beautify-plugin/Makefile2
-rw-r--r--graphics/gimp-gmic-plugin/Makefile2
-rw-r--r--graphics/gimp-refocus-plugin/Makefile2
-rw-r--r--graphics/gimp-resynthesizer/Makefile2
-rw-r--r--graphics/goocanvasmm2/Makefile2
-rw-r--r--graphics/gource/Makefile2
-rw-r--r--graphics/gthumb/Makefile2
-rw-r--r--graphics/gtimelapse/Makefile2
-rw-r--r--graphics/guetzli/Makefile2
-rw-r--r--graphics/gx/Makefile2
-rw-r--r--graphics/hiptext/Makefile2
-rw-r--r--graphics/hugin/Makefile2
-rw-r--r--graphics/inkscape/Makefile2
-rw-r--r--graphics/intel-backlight/Makefile8
-rw-r--r--graphics/intel-backlight/distinfo5
-rw-r--r--graphics/ipe/Makefile2
-rw-r--r--graphics/jogamp-jogl/Makefile2
-rw-r--r--graphics/kf5-kimageformats/Makefile1
-rw-r--r--graphics/kf5-kplotting/Makefile1
-rw-r--r--graphics/kf5-prison/Makefile1
-rw-r--r--graphics/krita/Makefile2
-rw-r--r--graphics/libbpg/Makefile2
-rw-r--r--graphics/libcdr01/Makefile2
-rw-r--r--graphics/libetonyek01/Makefile2
-rw-r--r--graphics/libfreehand/Makefile2
-rw-r--r--graphics/libgltf/Makefile2
-rw-r--r--graphics/libgnomecanvasmm26/Makefile2
-rw-r--r--graphics/libopenraw/Makefile2
-rw-r--r--graphics/libraw/Makefile1
-rw-r--r--graphics/libzmf/Makefile1
-rw-r--r--graphics/lightzone/Makefile2
-rw-r--r--graphics/luxrender/Makefile2
-rw-r--r--graphics/lximage-qt/Makefile2
-rw-r--r--graphics/mahotas/Makefile2
-rw-r--r--graphics/makehuman/Makefile2
-rw-r--r--graphics/mapnik/Makefile2
-rw-r--r--graphics/mapnik/files/patch-icu5939
-rw-r--r--graphics/mhgui/Makefile2
-rw-r--r--graphics/mupdf/Makefile2
-rw-r--r--graphics/mypaint/Makefile2
-rw-r--r--graphics/nomacs/Makefile2
-rw-r--r--graphics/nurbs++/Makefile2
-rw-r--r--graphics/ocaml-lablgl/Makefile4
-rw-r--r--graphics/ogre3d/Makefile2
-rw-r--r--graphics/opencolorio/Makefile2
-rw-r--r--graphics/openimageio/Makefile7
-rw-r--r--graphics/openimageio/distinfo6
-rw-r--r--graphics/openshadinglanguage/Makefile15
-rw-r--r--graphics/openshadinglanguage/distinfo6
-rw-r--r--graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt19
-rw-r--r--graphics/openshadinglanguage/pkg-plist18
-rw-r--r--graphics/oyranos/Makefile2
-rw-r--r--graphics/p5-PGPLOT/Makefile2
-rw-r--r--graphics/pfstmo/Makefile2
-rw-r--r--graphics/pgplot/Makefile2
-rw-r--r--graphics/photivo/Makefile2
-rw-r--r--graphics/piglit/Makefile2
-rw-r--r--graphics/pixie/Makefile2
-rw-r--r--graphics/py-gdal/Makefile1
-rw-r--r--graphics/raster3d/Makefile2
-rw-r--r--graphics/rawtherapee/Makefile1
-rw-r--r--graphics/rubygem-exifr/Makefile2
-rw-r--r--graphics/rubygem-exifr/distinfo6
-rw-r--r--graphics/seexpr/Makefile2
-rw-r--r--graphics/sekrit-twc-zimg/Makefile3
-rw-r--r--graphics/sekrit-twc-zimg/distinfo6
-rw-r--r--graphics/sekrit-twc-zimg/files/patch-no-extra-deps15
-rw-r--r--graphics/sharpconstruct/Makefile2
-rw-r--r--graphics/shotwell/Makefile2
-rw-r--r--graphics/simpleviewer/Makefile1
-rw-r--r--graphics/synfigstudio/Makefile2
-rw-r--r--graphics/tesseract/Makefile1
-rw-r--r--graphics/tiled/Makefile1
-rw-r--r--graphics/tulip/Makefile2
-rw-r--r--graphics/vapoursynth-fmtconv/Makefile1
-rw-r--r--graphics/vapoursynth-waifu2x-w2xc/Makefile2
-rw-r--r--graphics/vigra/Makefile2
-rw-r--r--graphics/waffle/Makefile2
-rw-r--r--graphics/waifu2x-converter-cpp/Makefile2
-rw-r--r--graphics/wayland-protocols/Makefile14
-rw-r--r--graphics/wayland-protocols/distinfo6
-rw-r--r--graphics/wayland-protocols/pkg-plist3
-rw-r--r--graphics/webp/Makefile2
-rw-r--r--graphics/wxsvg/Makefile1
-rw-r--r--graphics/xd3d/Makefile2
-rw-r--r--graphics/xface.el/Makefile2
-rw-r--r--graphics/xournal/Makefile8
-rw-r--r--graphics/xournal/files/patch-Makefile.in19
-rw-r--r--graphics/xournal/files/patch-configure6
-rw-r--r--graphics/xournal/files/patch-src_Makefile.in11
-rw-r--r--graphics/xournal/files/patch-src_main.c11
-rw-r--r--graphics/xpdf/Makefile66
-rw-r--r--graphics/xpdf3/Makefile70
-rw-r--r--graphics/xpdf3/distinfo (renamed from graphics/xpdf/distinfo)0
-rw-r--r--graphics/xpdf3/files/patch-Makefile.in (renamed from graphics/xpdf/files/patch-Makefile.in)0
-rw-r--r--graphics/xpdf3/files/patch-splash_Makefile.in (renamed from graphics/xpdf/files/patch-splash_Makefile.in)0
-rw-r--r--graphics/xpdf3/files/patch-splash_SplashFTFont.cc (renamed from graphics/xpdf/files/patch-splash_SplashFTFont.cc)0
-rw-r--r--graphics/xpdf3/files/patch-xfont (renamed from graphics/xpdf/files/patch-xfont)0
-rw-r--r--graphics/xpdf3/files/patch-xpdf_GlobalParams.cc (renamed from graphics/xpdf/files/patch-xpdf_GlobalParams.cc)0
-rw-r--r--graphics/xpdf3/files/patch-xpdf_GlobalParams.h (renamed from graphics/xpdf/files/patch-xpdf_GlobalParams.h)0
-rw-r--r--graphics/xpdf3/files/patch-xpdf_Stream.cc (renamed from graphics/xpdf/files/patch-xpdf_Stream.cc)0
-rw-r--r--graphics/xpdf3/files/patch-xpdf_XPDFViewer.cc (renamed from graphics/xpdf/files/patch-xpdf_XPDFViewer.cc)0
-rw-r--r--graphics/xpdf3/files/patch-xpdf__Makefile.in (renamed from graphics/xpdf/files/patch-xpdf__Makefile.in)0
-rw-r--r--graphics/xpdf3/files/xpdf-man.conf.in (renamed from graphics/xpdf/files/xpdf-man.conf.in)0
-rw-r--r--graphics/xpdf3/pkg-descr (renamed from graphics/xpdf/pkg-descr)0
-rw-r--r--graphics/xpdf3/pkg-message (renamed from graphics/xpdf/pkg-message)0
-rw-r--r--graphics/xpdf3/pkg-plist (renamed from graphics/xpdf/pkg-plist)0
-rw-r--r--graphics/xpdf4/Makefile54
-rw-r--r--graphics/xpdf4/distinfo3
-rw-r--r--graphics/xpdf4/files/patch-cmake-config.txt49
-rw-r--r--graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt11
-rw-r--r--graphics/xpdf4/files/patch-xpdf_CMakeLists.txt143
-rw-r--r--graphics/xpdf4/files/xpdf-man.conf.in2
-rw-r--r--graphics/xpdf4/pkg-descr8
-rw-r--r--graphics/xpdf4/pkg-message8
-rw-r--r--graphics/xpdf4/pkg-plist24
-rw-r--r--graphics/zathura-cb/Makefile2
-rw-r--r--graphics/zathura-djvu/Makefile2
-rw-r--r--graphics/zathura-pdf-mupdf/Makefile2
-rw-r--r--graphics/zathura-pdf-poppler/Makefile2
-rw-r--r--graphics/zathura-ps/Makefile2
-rw-r--r--graphics/zathura/Makefile2
165 files changed, 689 insertions, 255 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 163ed4e68f37..d02ecab25b66 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -3,6 +3,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.3.26
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF \
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 8558d106ddbf..ff63db7f5cb2 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ImageMagick
DISTVERSION= 6.9.8-9
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 401d9efe4587..53cef4a6694a 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ImageMagick
DISTVERSION= 7.0.5-10
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
http://www.imagemagick.org/download/legacy/ \
diff --git a/graphics/Makefile b/graphics/Makefile
index 2fce8a30ebc5..dc745b2744f3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1095,6 +1095,8 @@
SUBDIR += xournal
SUBDIR += xpaint
SUBDIR += xpdf
+ SUBDIR += xpdf3
+ SUBDIR += xpdf4
SUBDIR += xpeps
SUBDIR += xpx
SUBDIR += xsane
diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index 46274079d3dd..7b36008fb3bd 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenEXR
PORTVERSION= 2.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics devel
MASTER_SITES= SAVANNAH/openexr/:dist \
LOCAL/mandree/:test
diff --git a/graphics/R-cran-gridExtra/Makefile b/graphics/R-cran-gridExtra/Makefile
index 2236e3933775..88345d9d38ee 100644
--- a/graphics/R-cran-gridExtra/Makefile
+++ b/graphics/R-cran-gridExtra/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gridExtra
-PORTVERSION= 2.2.1
+PORTVERSION= 2.3
CATEGORIES= graphics
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/graphics/R-cran-gridExtra/distinfo b/graphics/R-cran-gridExtra/distinfo
index 539c8b92193e..8b6edd5b68fa 100644
--- a/graphics/R-cran-gridExtra/distinfo
+++ b/graphics/R-cran-gridExtra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494231721
-SHA256 (gridExtra_2.2.1.tar.gz) = 44fe455a5bcdf48a4ece7a542f83e7749cf251dc1df6ae7634470240398c6818
-SIZE (gridExtra_2.2.1.tar.gz) = 459488
+TIMESTAMP = 1505083128
+SHA256 (gridExtra_2.3.tar.gz) = 81b60ce6f237ec308555471ae0119158b115463df696d2eca9b177ded8988e3b
+SIZE (gridExtra_2.3.tar.gz) = 1062844
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index 3b26ef2ddbbd..51dbce91016f 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -4,7 +4,7 @@
PORTNAME= aaphoto
PORTVERSION= 0.43.1
DISTVERSIONPREFIX= v
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MAINTAINER= mail@log69.com
diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile
index 5fdf8c146c78..4460929fb4ba 100644
--- a/graphics/aeskulap/Makefile
+++ b/graphics/aeskulap/Makefile
@@ -3,6 +3,7 @@
PORTNAME= aeskulap
PORTVERSION= 0.2.2.20140119
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index e35ebfbf65c8..c04b0c2ea7c4 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -3,7 +3,7 @@
PORTNAME= agave
PORTVERSION= 0.4.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics gnome
MASTER_SITES= http://download.gna.org/colorscheme/releases/
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile
index 4aa5ad89e461..0572f9b9a848 100644
--- a/graphics/alembic/Makefile
+++ b/graphics/alembic/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alembic
PORTVERSION= 1.7.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= danfe@FreeBSD.org
diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile
index 3f42af44fefc..b68fcc78993c 100644
--- a/graphics/animorph/Makefile
+++ b/graphics/animorph/Makefile
@@ -3,7 +3,7 @@
PORTNAME= animorph
PORTVERSION= 0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/makehuman/MakeHuman%20Source/MakeHuman_091
diff --git a/graphics/appleseed/Makefile b/graphics/appleseed/Makefile
index cbbf8f0c468b..dc1caa9ec60c 100644
--- a/graphics/appleseed/Makefile
+++ b/graphics/appleseed/Makefile
@@ -3,7 +3,7 @@
PORTNAME= appleseed
DISTVERSION= 1.5.2-beta
-PORTREVISION= 5
+PORTREVISION= 7
CATEGORIES= graphics
MAINTAINER= danfe@FreeBSD.org
@@ -43,7 +43,7 @@ SUB_FILES= pkg-message
SUB_LIST:= ${PLIST_SUB}
OPTIONS_DEFINE= EXAMPLES OSL DISNEY
-OPTIONS_DEFAULT= OSL DISNEY
+OPTIONS_DEFAULT= DISNEY
OPTIONS_SUB= yes
OSL_DESC= Open Shading Language support
@@ -53,6 +53,8 @@ EXAMPLES_CMAKE_OFF= -DWITH_SAMPLES:BOOL=OFF
OSL_CMAKE_ON= -DWITH_OSL:BOOL=ON
OSL_LIB_DEPENDS= liboslexec.so:graphics/openshadinglanguage
+# src/appleseed/libappleseed.so: undefined reference to `typeinfo for OSL::RendererServices'
+OSL_BROKEN= fails to build against openshadinglanguage-1.8.10
DISNEY_CMAKE_ON= -DWITH_DISNEY_MATERIAL:BOOL=ON
DISNEY_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio \
diff --git a/graphics/argyllcms/Makefile b/graphics/argyllcms/Makefile
index b2027a7e99db..c9668b1c99f1 100644
--- a/graphics/argyllcms/Makefile
+++ b/graphics/argyllcms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= argyllcms
PORTVERSION= 1.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.argyllcms.com/
DISTNAME= Argyll_V${PORTVERSION}_src
diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile
index 1f3db8dff0bf..ef40e3ae8fea 100644
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@@ -4,7 +4,7 @@
PORTNAME= aseprite
PORTVERSION= 1.1.13
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= yuri@rawbw.com
diff --git a/graphics/atril-lite/Makefile b/graphics/atril-lite/Makefile
index e7e4f19ee8ec..5928a4a1fe51 100644
--- a/graphics/atril-lite/Makefile
+++ b/graphics/atril-lite/Makefile
@@ -1,16 +1,16 @@
# Created by: Adam Weinberger <adamw@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION?= 0
PKGNAMESUFFIX= -lite
COMMENT= MATE multi-format document viewer
OPTIONS_EXCLUDE= CAJA DBUS
-MASTERDIR= ${.CURDIR}/../../graphics/atril
-SLAVEPORT= lite
+MASTERDIR= ${.CURDIR}/../../graphics/atril
+SLAVEPORT= lite
DESCR= ${.CURDIR}/pkg-descr
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 737f9f746814..1f4fd0f6d13e 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -4,17 +4,19 @@
# Please update update atril-lite also
PORTNAME= atril
-PORTVERSION= 1.18.0
-PORTREVISION?= 1
+PORTVERSION= 1.18.1
+PORTREVISION?= 0
CATEGORIES= graphics print mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
MAINTAINER= gnome@FreeBSD.org
-COMMENT?= MATE multi-format document viewer
+COMMENT= MATE multi-format document viewer
-BUILD_DEPENDS= itstool:textproc/itstool
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
libsoup-2.4.so:devel/libsoup \
libfontconfig.so:x11-fonts/fontconfig \
diff --git a/graphics/atril/distinfo b/graphics/atril/distinfo
index 7da88437f355..98d375ec7e81 100644
--- a/graphics/atril/distinfo
+++ b/graphics/atril/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491698614
-SHA256 (mate/atril-1.18.0.tar.xz) = c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd
-SIZE (mate/atril-1.18.0.tar.xz) = 1688144
+TIMESTAMP = 1503851121
+SHA256 (mate/atril-1.18.1.tar.xz) = 8504c0164faf9a0763118d444007dd2bc655dd0dcd0c6ecfff163080b61883f2
+SIZE (mate/atril-1.18.1.tar.xz) = 1695280
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 79a1ed1e09ae..dadf12a3c759 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= blender
PORTVERSION= 2.78c
-PORTREVISION= 3
+PORTREVISION= 7
CATEGORIES= graphics games
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index bf998ada8ee5..62a1fc4ed552 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bugle
PORTVERSION= 0.0.20100508
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile
index 2ef06a4aeff4..ec501bdf386d 100644
--- a/graphics/caffe/Makefile
+++ b/graphics/caffe/Makefile
@@ -2,7 +2,7 @@
PORTNAME= caffe
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= eric@camachat.org
diff --git a/graphics/cairo/pkg-descr b/graphics/cairo/pkg-descr
index ee8f61404111..a2737cc6d1f4 100644
--- a/graphics/cairo/pkg-descr
+++ b/graphics/cairo/pkg-descr
@@ -10,4 +10,4 @@ the PDF 1.4 imaging model. Cairo provides operations including stroking
and filling Bezier cubic splines, transforming and compositing translucent
images, and antialiased text rendering.
-WWW: http://www.cairographics.org
+WWW: https://www.cairographics.org/
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 481fbbc41488..3568a428b160 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cairomm
PORTVERSION= 1.12.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index f22102fad8e8..68d25b4a9653 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cegui
PORTVERSION= 0.8.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics devel
MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index 77226204ae86..a8fa65b84431 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cimg
DISTVERSION= 2.0.3
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= graphics devel
diff --git a/graphics/code-eli/Makefile b/graphics/code-eli/Makefile
index 8606ff838bc3..3a2c6bc60e89 100644
--- a/graphics/code-eli/Makefile
+++ b/graphics/code-eli/Makefile
@@ -3,7 +3,7 @@
PORTNAME= code-eli
PORTVERSION= 0.3.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MAINTAINER= fernando.apesteguia@gmail.com
diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile
index de947707ccfe..fdbfd267c49a 100644
--- a/graphics/colmap/Makefile
+++ b/graphics/colmap/Makefile
@@ -2,6 +2,7 @@
PORTNAME= colmap
DISTVERSION= 3.2
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index d0f9a878178d..9f433a034061 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= converseen
PORTVERSION= 0.9.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Converseen/Converseen%20${PORTVERSION:R:R}/
diff --git a/graphics/copperspice/Makefile b/graphics/copperspice/Makefile
index 67125cb8c607..6cd3c38ba15f 100644
--- a/graphics/copperspice/Makefile
+++ b/graphics/copperspice/Makefile
@@ -3,7 +3,7 @@
PORTNAME= copperspice
PORTVERSION= 1.3.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://download.copperspice.com/copperspice/source/
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 2521501ee931..833c1813ef05 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -3,7 +3,7 @@
PORTNAME= darktable
PORTVERSION= 2.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/
diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile
index d75748f5be65..100bf23c4f11 100644
--- a/graphics/dataplot/Makefile
+++ b/graphics/dataplot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dataplot
PORTVERSION= 20132012
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \
LOCAL/beech:source \
diff --git a/graphics/dcp2icc/Makefile b/graphics/dcp2icc/Makefile
index 6ad6e83fd346..65a623369ed8 100644
--- a/graphics/dcp2icc/Makefile
+++ b/graphics/dcp2icc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dcp2icc
PORTVERSION= 0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics converters
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
diff --git a/graphics/delaboratory/Makefile b/graphics/delaboratory/Makefile
index 665fb4154849..f73992e45fa5 100644
--- a/graphics/delaboratory/Makefile
+++ b/graphics/delaboratory/Makefile
@@ -3,7 +3,7 @@
PORTNAME= delaboratory
PORTVERSION= 0.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://BSDforge.com/projects/source/graphics/delaboratory/
diff --git a/graphics/dilay/Makefile b/graphics/dilay/Makefile
index 7efce5a452b2..0f2a269c3d4d 100644
--- a/graphics/dilay/Makefile
+++ b/graphics/dilay/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dilay
PORTVERSION= 1.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= yuri@rawbw.com
diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-next-kmod/Makefile
index 8a8322b89ebd..3931f0eb62f7 100644
--- a/graphics/drm-next-kmod/Makefile
+++ b/graphics/drm-next-kmod/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= drm-next-kmod
-PORTVERSION= g20170829
+PORTVERSION= g20170912
CATEGORIES= graphics
MAINTAINER= jmd@FreeBSD.org
@@ -23,11 +23,11 @@ USES= kmod uidfix
USE_GITHUB= yes
GH_ACCOUNT= FreeBSDDesktop
GH_PROJECT= kms-drm
-GH_TAGNAME= fc90953
+GH_TAGNAME= 5b5d651
.include <bsd.port.options.mk>
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200039
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200043
IGNORE= not supported on 11.x or older, no kernel support
.endif
.if ${OPSYS} != FreeBSD
diff --git a/graphics/drm-next-kmod/distinfo b/graphics/drm-next-kmod/distinfo
index d19bb3cd47b6..333571bbfdee 100644
--- a/graphics/drm-next-kmod/distinfo
+++ b/graphics/drm-next-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504057443
-SHA256 (FreeBSDDesktop-kms-drm-g20170829-fc90953_GH0.tar.gz) = 81ab0b075727f824fafea5e61a868cedbce2f8003819dd65811e3ad363c3d729
-SIZE (FreeBSDDesktop-kms-drm-g20170829-fc90953_GH0.tar.gz) = 6678672
+TIMESTAMP = 1505271981
+SHA256 (FreeBSDDesktop-kms-drm-g20170912-5b5d651_GH0.tar.gz) = 97a4a54db9b276f430aee956d59ed667cf8968fdde9eb12bd3a502ea28035bb3
+SIZE (FreeBSDDesktop-kms-drm-g20170912-5b5d651_GH0.tar.gz) = 6678618
diff --git a/graphics/drm-next-kmod/pkg-descr b/graphics/drm-next-kmod/pkg-descr
index 5ac130d1e325..b03ccc34052e 100644
--- a/graphics/drm-next-kmod/pkg-descr
+++ b/graphics/drm-next-kmod/pkg-descr
@@ -1,4 +1,5 @@
amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
-Currently corresponding to Linux 4.9 DRM.
+Currently corresponding to Linux 4.9 DRM. Experimental state. amdgpu and
+radeonkms are known to fail with EFI boot.
WWW: https://github.com/FreeBSDDesktop/kms-drm
diff --git a/graphics/drm-next-kmod/pkg-message b/graphics/drm-next-kmod/pkg-message
index 5553f495df39..88023d035271 100644
--- a/graphics/drm-next-kmod/pkg-message
+++ b/graphics/drm-next-kmod/pkg-message
@@ -1,10 +1,15 @@
-The drm-next-kmod port requires explicit loading of its drm.ko kernel
-module prior to loading either amdgpu (for AMD GPUs starting with
-the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
-HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf.
+The experimental drm-next-kmod port can be enabled for amdgpu (for AMD
+GPUs starting with the HD7000 series / Tahiti) or i915kms (for Intel
+APUs starting with HD3000 / Sandy Bridge) through kld_list in
+/etc/rc.conf. radeomkms for older AMD GPUs can be loaded and there are
+some positive reports if EFI boot is NOT enabled (similar to amdgpu).
-For example: kld_list="/boot/modules/drm.ko /boot/modules/amdgpu.ko"
-or kld_list="/boot/modules/drm.ko /boot/modules/i915kms.ko"
+For amdgpu: kld_list="amdgpu"
+For Intel: kld_list="/boot/modules/i915kms.ko"
+For radeonkms: kld_list="/boot/modules/radeonkms.ko"
-Older generations are supported by the kms modules (radeonkms /
+Please ensure that all users requiring graphics are members of the
+"video" group.
+
+Older generations are supported by the stable kms modules (radeonkms /
i915kms) in base.
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index df1a6d00e395..78d83433858b 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -3,7 +3,7 @@
PORTNAME= enblend
PORTVERSION= 4.1.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R}
DISTNAME= enblend-enfuse-${PORTVERSION}
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index e1dd6a5fe068..0256a7f23672 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freeimage
PORTVERSION= 3.16.0
-PORTREVISION= 2
+PORTREVISION= 3
# Version 3.17.0 is available, but does not build on i386 (and probably
# other 32-bit arches) without some not-quite-trivial patching. If one
# decides to update the port, please make sure 32-bit builds are tested!
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index b1ac60441c4e..5d6355cb8199 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Gdtclft
PORTVERSION= 2.2.5
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= graphics tcl
MASTER_SITES= http://BSDforge.com/projects/source/graphics/gdtclft/
DISTNAME= ${PORTNAME}${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT= TCL interface to the Thomas Boutell's Gd library
LIB_DEPENDS= libgd.so:graphics/gd
-USES= tcl:84+ uidfix
+USES= tcl:85+ uidfix
MAKEFILE= ${FILESDIR}/Makefile.bsd
MAKE_ENV= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
diff --git a/graphics/generic_image_decoder/pkg-descr b/graphics/generic_image_decoder/pkg-descr
index da3f8a917777..187b1ffc8168 100644
--- a/graphics/generic_image_decoder/pkg-descr
+++ b/graphics/generic_image_decoder/pkg-descr
@@ -1,6 +1,6 @@
The Generic Image Decoder (GID) is an Ada package for decoding a broad
variety on image formats from any data stream to any kind of medium.
-Examples include in-memory bitmap, a GUI objecct, another stream, floating
+Examples include in-memory bitmap, a GUI object, another stream, floating
point data for scientific calculations, a browser element or a device.
Animations are also supported. GID features:
diff --git a/graphics/geomorph/Makefile b/graphics/geomorph/Makefile
index 8609f0f32c2d..3a5ad8791e3c 100644
--- a/graphics/geomorph/Makefile
+++ b/graphics/geomorph/Makefile
@@ -3,7 +3,7 @@
PORTNAME= geomorph
PORTVERSION= 0.60.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.60/
diff --git a/graphics/gimp-beautify-plugin/Makefile b/graphics/gimp-beautify-plugin/Makefile
index 9e66f13de40f..212f557b9b16 100644
--- a/graphics/gimp-beautify-plugin/Makefile
+++ b/graphics/gimp-beautify-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= beautify
PORTVERSION= 2012.08.12.00
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
PKGNAMEPREFIX= gimp-
PKGNAMESUFFIX= -plugin
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index e92a43b61ed7..09c4373cf823 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gmic
PORTVERSION= 1.6.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://gmic.eu/files/source/
PKGNAMEPREFIX= gimp-
diff --git a/graphics/gimp-refocus-plugin/Makefile b/graphics/gimp-refocus-plugin/Makefile
index 489cc2b9e92c..e8e4967263ba 100644
--- a/graphics/gimp-refocus-plugin/Makefile
+++ b/graphics/gimp-refocus-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= refocus
PORTVERSION= 0.9.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= SF
PKGNAMEPREFIX= gimp-
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index f359b6d164da..446031e58005 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= resynthesizer
PORTVERSION= 2.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
PKGNAMEPREFIX= gimp-
diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile
index 4cd81b955a8b..b50d1fe3c8be 100644
--- a/graphics/goocanvasmm2/Makefile
+++ b/graphics/goocanvasmm2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= goocanvasmm
PORTVERSION= 1.90.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2
diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile
index f8fb202aa076..60f558219df7 100644
--- a/graphics/gource/Makefile
+++ b/graphics/gource/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gource
PORTVERSION= 0.43
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= https://github.com/acaudwell/Gource/releases/download/${PORTNAME}-${PORTVERSION}/
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 2fcabea29f8a..6c5bc23a0413 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gthumb
PORTVERSION= 3.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile
index 189a6b0d4fc6..587f451cda15 100644
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtimelapse
DISTVERSION= 0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Relase # yes, this is not a typo (here)
diff --git a/graphics/guetzli/Makefile b/graphics/guetzli/Makefile
index 9d66a2d7f571..b52593520aeb 100644
--- a/graphics/guetzli/Makefile
+++ b/graphics/guetzli/Makefile
@@ -3,7 +3,7 @@
PORTNAME= guetzli
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= graphics
diff --git a/graphics/gx/Makefile b/graphics/gx/Makefile
index dfa712fe9825..0fb09353a077 100644
--- a/graphics/gx/Makefile
+++ b/graphics/gx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gx
PORTVERSION= 0.4.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics
MASTER_SITES= http://BSDforge.com/projects/source/graphics/gx/
diff --git a/graphics/hiptext/Makefile b/graphics/hiptext/Makefile
index 6a35d9e9608c..d5322d2655d5 100644
--- a/graphics/hiptext/Makefile
+++ b/graphics/hiptext/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hiptext
PORTVERSION= 0.0.s20160621
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MAINTAINER= yuri@rawbw.com
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 9fce5bd831a0..b9fb6f6a117f 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hugin
PORTVERSION= 2017.0.0
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 9eb2b7d56651..c709d360a5c1 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
PORTNAME= inkscape
PORTVERSION= 0.92.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= https://launchpadlibrarian.net/306309537/ \
LOCAL/kwm
diff --git a/graphics/intel-backlight/Makefile b/graphics/intel-backlight/Makefile
index b189e706f63e..8e6afeb6330e 100644
--- a/graphics/intel-backlight/Makefile
+++ b/graphics/intel-backlight/Makefile
@@ -2,19 +2,19 @@
# $FreeBSD$
PORTNAME= intel-backlight
-PORTVERSION= 20150706
+PORTVERSION= 20170831
CATEGORIES= graphics
-MAINTAINER= freebsd@grem.de
+MAINTAINER= jmd@freebsd.org
COMMENT= Control backlight on various modern Intel(R) GPUs
LIB_DEPENDS= libdrm.so:graphics/libdrm \
libpciaccess.so:devel/libpciaccess
USE_GITHUB= yes
-GH_ACCOUNT= grembo
+GH_ACCOUNT= FreeBSDDesktop
GH_PROJECT= intel_backlight_fbsd
-GH_TAGNAME= 93e1fe4
+GH_TAGNAME= baba3e6
PLIST_FILES= bin/intel_backlight
PORTEXAMPLES= isl_backlight.sh
diff --git a/graphics/intel-backlight/distinfo b/graphics/intel-backlight/distinfo
index b1b68ffb5122..f66ed42584f6 100644
--- a/graphics/intel-backlight/distinfo
+++ b/graphics/intel-backlight/distinfo
@@ -1,2 +1,3 @@
-SHA256 (grembo-intel_backlight_fbsd-20150706-93e1fe4_GH0.tar.gz) = bf2d8d082edbdaf8f89913532cd2620ba49a6dfebbc276fa86d806b63993c852
-SIZE (grembo-intel_backlight_fbsd-20150706-93e1fe4_GH0.tar.gz) = 40402
+TIMESTAMP = 1504227150
+SHA256 (FreeBSDDesktop-intel_backlight_fbsd-20170831-baba3e6_GH0.tar.gz) = 909bcd0ad981ad3e198ea2ae8fb59f5fd0a42f18cf47eb80cd23a4bcf6639092
+SIZE (FreeBSDDesktop-intel_backlight_fbsd-20170831-baba3e6_GH0.tar.gz) = 41192
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 9481f584c205..146f23f51680 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ipe
PORTVERSION= 7.2.7
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= -src
CATEGORIES= graphics
MASTER_SITES= https://dl.bintray.com/otfried/generic/ipe/${PORTVERSION:R}/
diff --git a/graphics/jogamp-jogl/Makefile b/graphics/jogamp-jogl/Makefile
index dd17efc3e061..8b19ce43cc5c 100644
--- a/graphics/jogamp-jogl/Makefile
+++ b/graphics/jogamp-jogl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jogamp-jogl
PORTVERSION= 2.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel java
MASTER_SITES= http://jogamp.org/deployment/jogamp-current/archive/Sources/ \
http://jogamp.org/deployment/v${PORTVERSION}/archive/Sources/
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
index a5194ea3ff87..ab8b5fb59c04 100644
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kimageformats
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/graphics/kf5-kplotting/Makefile b/graphics/kf5-kplotting/Makefile
index 0b50240c87e2..a689ca786eb0 100644
--- a/graphics/kf5-kplotting/Makefile
+++ b/graphics/kf5-kplotting/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kplotting
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/graphics/kf5-prison/Makefile b/graphics/kf5-prison/Makefile
index 9a9a79930b8a..926d4fc0a0b8 100644
--- a/graphics/kf5-prison/Makefile
+++ b/graphics/kf5-prison/Makefile
@@ -3,6 +3,7 @@
PORTNAME= prison
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 17f5bbdc72c6..8a0817d43096 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -2,7 +2,7 @@
PORTNAME= krita
PORTVERSION= 3.1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/3.1.2
DIST_SUBDIR= KDE/${PORTNAME}
diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile
index a37fce095fd1..735660cbd5bc 100644
--- a/graphics/libbpg/Makefile
+++ b/graphics/libbpg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libbpg
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://bellard.org/bpg/
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index 0d2fa9905b26..8cd819ce6a2b 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libcdr
PORTVERSION= 0.1.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics devel
MASTER_SITES= LODEV
PKGNAMESUFFIX= 01
diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile
index 4d43c63d1772..64de2f83cd8e 100644
--- a/graphics/libetonyek01/Makefile
+++ b/graphics/libetonyek01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libetonyek
PORTVERSION= 0.1.6
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
diff --git a/graphics/libfreehand/Makefile b/graphics/libfreehand/Makefile
index 0d38c7ebd4c5..bae7c61b3ad7 100644
--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libfreehand
PORTVERSION= 0.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/libgltf/Makefile b/graphics/libgltf/Makefile
index 96feaaba2043..6fc52746c4d6 100644
--- a/graphics/libgltf/Makefile
+++ b/graphics/libgltf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libgltf
PORTVERSION= 0.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics devel
MASTER_SITES= LODEV
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index 8952fa916ea7..a3f2e58b1d19 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomecanvasmm
PORTVERSION= 2.26.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile
index f5a7615039c0..c4cd5fb70e5d 100644
--- a/graphics/libopenraw/Makefile
+++ b/graphics/libopenraw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libopenraw
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://libopenraw.freedesktop.org/download/
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index 442f91ad4c30..f74f50ede0f6 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libraw
PORTVERSION= 0.18.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.libraw.org/data/
DISTNAME= LibRaw-${PORTVERSION}
diff --git a/graphics/libzmf/Makefile b/graphics/libzmf/Makefile
index 9bf304c8096e..627af0cf0040 100644
--- a/graphics/libzmf/Makefile
+++ b/graphics/libzmf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libzmf
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile
index 0b6906977d53..c5e210813dbf 100644
--- a/graphics/lightzone/Makefile
+++ b/graphics/lightzone/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lightzone
PORTVERSION= 4.1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics java
DIST_SUBDIR= ${PORTNAME}
diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile
index 84e0967d4e6a..eda390a5a7df 100644
--- a/graphics/luxrender/Makefile
+++ b/graphics/luxrender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= luxrender
DISTVERSION?= 1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \
https://bitbucket.org/luxrender/luxrays/get/:lr
diff --git a/graphics/lximage-qt/Makefile b/graphics/lximage-qt/Makefile
index 7e95900af73f..0b32eaf3acae 100644
--- a/graphics/lximage-qt/Makefile
+++ b/graphics/lximage-qt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lximage-qt
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= LXQT/${PORTNAME}
diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile
index 9aac13447575..f4682d43b80f 100644
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mahotas
PORTVERSION= 0.9.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index ed22287edcb3..6b20e1589049 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -3,7 +3,7 @@
PORTNAME= makehuman
DISTVERSION= 0.9.1-rc1a
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/MakeHuman%20Source/MakeHuman_091
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 9c850cedf150..3e709a703c52 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mapnik
PORTVERSION= 3.0.9
DISTVERSIONPREFIX= v
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics geography
MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
diff --git a/graphics/mapnik/files/patch-icu59 b/graphics/mapnik/files/patch-icu59
new file mode 100644
index 000000000000..01bcdd6d76d0
--- /dev/null
+++ b/graphics/mapnik/files/patch-icu59
@@ -0,0 +1,39 @@
+https://github.com/mapnik/mapnik/commit/9e58c890430d
+https://github.com/mapnik/mapnik/commit/093fcee6d1ba
+
+--- include/mapnik/text/harfbuzz_shaper.hpp.orig 2015-11-26 14:32:15 UTC
++++ include/mapnik/text/harfbuzz_shaper.hpp
+@@ -41,6 +41,7 @@
+ #include <harfbuzz/hb-ft.h>
+
+ // icu
++#include <unicode/uvernum.h>
+ #include <unicode/uscript.h>
+
+ namespace mapnik
+@@ -55,7 +56,8 @@ static inline hb_script_t _icu_script_to_script(UScrip
+ static inline const uint16_t * uchar_to_utf16(const UChar* src)
+ {
+ static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59)
++ // ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
+ return reinterpret_cast<const uint16_t *>(src);
+ #else
+ return src;
+--- include/mapnik/unicode.hpp.orig 2015-11-26 14:32:15 UTC
++++ include/mapnik/unicode.hpp
+@@ -31,6 +31,13 @@
+ // std
+ #include <cstdint>
+ #include <string>
++// icu
++#if (U_ICU_VERSION_MAJOR_NUM >= 59)
++#pragma GCC diagnostic push
++#include <mapnik/warning_ignore.hpp>
++#include <unicode/unistr.h>
++#pragma GCC diagnostic pop
++#endif
+
+ struct UConverter;
+
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 50f4f84ca636..27c65a33abf3 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mhgui
PORTVERSION= 0.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= SF/makehuman/MakeHuman%20Source/MakeHuman_091
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 99cd1a357be0..dd382f995216 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mupdf
PORTVERSION= 1.11
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= -source
PORTEPOCH= 1
CATEGORIES= graphics
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 8be3c11ac534..b942c940c8d4 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mypaint
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index fea42002e970..63882e1c7f9a 100644
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@@ -12,6 +12,8 @@ COMMENT= Small, fast, and free image viewer
LICENSE= GPLv3
+BROKEN= Does not build with CMake 3.9, needs update
+
LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libsysinfo.so:devel/libsysinfo \
libopencv_core.so:graphics/opencv-core
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index 9637ee446255..069a970beb6d 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nurbs++
PORTVERSION= 3.0.11
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/libnurbs/nurbs%2B%2B/${PORTVERSION}
diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile
index f99521440b33..2c3880bc3663 100644
--- a/graphics/ocaml-lablgl/Makefile
+++ b/graphics/ocaml-lablgl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lablgl
PORTVERSION= 1.05
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
@@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE
CONFLICTS= ocaml-nox11-[0-9]*
-USES= gmake tk:84,85
+USES= gmake tk:85
USE_XORG= x11 xext xmu
USE_GL= glut
USE_OCAML= yes
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index fea878127dea..f297e0a55632 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ogre3d
PORTVERSION= 1.9.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics devel
MASTER_SITES= https://bitbucket.org/sinbad/ogre/get/
DISTNAME= v1-9-0
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index a76d4b374650..31be0fa48efd 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opencolorio
PORTVERSION= 1.0.9
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 939c392391a3..617fdca7f055 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= openimageio
-PORTVERSION= 1.7.10
+PORTVERSION= 1.7.17
+PORTREVISION= 1
DISTVERSIONPREFIX= Release-
CATEGORIES?= graphics multimedia
@@ -107,9 +108,9 @@ post-patch:
post-install:
.if ${SLAVE_PORT} == no
- ${LN} -sf libOpenImageIO.so.1.6 \
+ ${LN} -sf libOpenImageIO.so.1.7 \
${STAGEDIR}${PREFIX}/lib/libOpenImageIO.so.1
- ${LN} -sf libOpenImageIO_Util.so.1.6 \
+ ${LN} -sf libOpenImageIO_Util.so.1.7 \
${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.1
.endif
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 38ccf08cb739..1ca55c82c9a2 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484843803
-SHA256 (OpenImageIO-oiio-Release-1.7.10_GH0.tar.gz) = ec5c567b6b4078d17df22262b764ebb7c09ce5b69f0bc2095b51e56c7070f5b7
-SIZE (OpenImageIO-oiio-Release-1.7.10_GH0.tar.gz) = 26188475
+TIMESTAMP = 1504403179
+SHA256 (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 669c59d06399dd882c3e2469bb3a4b33d537db150f6fe056495c3429b5c3838f
+SIZE (OpenImageIO-oiio-Release-1.7.17_GH0.tar.gz) = 27164765
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 911d84ea4ebd..c1629171d611 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= openshadinglanguage
-PORTVERSION= 1.7.5
+PORTVERSION= 1.8.10
+PORTREVISION= 1
DISTVERSIONPREFIX= Release-
-PORTREVISION= 2
CATEGORIES= graphics devel
MAINTAINER= FreeBSD@Shaneware.biz
@@ -12,21 +12,20 @@ COMMENT= Advanced shading language for production GI renderers
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= llvm-config34:devel/llvm34 \
- clang34>=3.4_1:lang/clang34
+BUILD_DEPENDS= llvm-config40:devel/llvm40
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libIlmImf.so:graphics/OpenEXR \
libImath.so:graphics/ilmbase \
libOpenImageIO.so:graphics/openimageio
-RUN_DEPENDS= llvm-config34:devel/llvm34
+RUN_DEPENDS= llvm-config40:devel/llvm40
-USES= bison cmake:outsource compiler:c++11-lib ncurses
+USES= bison cmake:outsource compiler:c++11-lang ncurses
USE_GITHUB= yes
GH_ACCOUNT= imageworks
GH_PROJECT= OpenShadingLanguage
-CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config34" \
- -DENABLERTTI:BOOL=ON
+CMAKE_ARGS= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config40" \
+ -DENABLERTTI:BOOL=OFF -DUSE_BOOST_WAVE:BOOL=OFF
USE_LDCONFIG= yes
post-patch:
diff --git a/graphics/openshadinglanguage/distinfo b/graphics/openshadinglanguage/distinfo
index cd713a89871a..a15fbfcbb141 100644
--- a/graphics/openshadinglanguage/distinfo
+++ b/graphics/openshadinglanguage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478806482
-SHA256 (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 46226af0592297172e856635eac50327255f1a307244162c1feb47581e72a109
-SIZE (imageworks-OpenShadingLanguage-Release-1.7.5_GH0.tar.gz) = 13739852
+TIMESTAMP = 1503300284
+SHA256 (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 5b9ad6814fd55e68f4ac50e4214120629ab9175142dc93aac350d0f54bea745a
+SIZE (imageworks-OpenShadingLanguage-Release-1.8.10_GH0.tar.gz) = 14572479
diff --git a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
index f8c0de05658e..2838db711e47 100644
--- a/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
+++ b/graphics/openshadinglanguage/files/patch-src_doc_CMakeLists.txt
@@ -1,16 +1,21 @@
---- src/doc/CMakeLists.txt.orig 2015-03-10 21:57:05 UTC
+--- src/doc/CMakeLists.txt.orig 2017-07-01 03:52:54 UTC
+++ src/doc/CMakeLists.txt
-@@ -1,11 +1,11 @@
- set (public_docs osl-languagespec.pdf)
- # Some day: CLA-INDIVIDUAL CLA-CORPORATE
+@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
+ markdeep.min.js
+ )
-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
+install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage COMPONENT documentation)
install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
- "${PROJECT_SOURCE_DIR}/INSTALL"
- "${PROJECT_SOURCE_DIR}/CHANGES"
+ "${PROJECT_SOURCE_DIR}/INSTALL.md"
+ "${PROJECT_SOURCE_DIR}/CHANGES.md"
"${PROJECT_SOURCE_DIR}/README.md"
-- DESTINATION . )
+- DESTINATION doc )
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage )
+
+ file (GLOB testshade_figures "Figures/testshade/*.jpg")
+ install (FILES ${testshade_figures}
+- DESTINATION doc/Figures/testshade )
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openshadinglanguage/Figures/testshade )
diff --git a/graphics/openshadinglanguage/pkg-plist b/graphics/openshadinglanguage/pkg-plist
index abeddf8d70f2..8c0ce53e1e70 100644
--- a/graphics/openshadinglanguage/pkg-plist
+++ b/graphics/openshadinglanguage/pkg-plist
@@ -16,20 +16,31 @@ include/OSL/oslclosure.h
include/OSL/oslcomp.h
include/OSL/oslconfig.h
include/OSL/oslexec.h
+include/OSL/oslnoise.h
include/OSL/oslquery.h
include/OSL/oslversion.h
include/OSL/rendererservices.h
include/OSL/shaderglobals.h
lib/liboslcomp.so
lib/liboslexec.so
+lib/liboslnoise.so
lib/liboslquery.so
lib/libtestshade.so
lib/osl.imageio.so
-%%DATADIR%%/CHANGES
-%%DATADIR%%/INSTALL
+%%DATADIR%%/CHANGES.md
+%%DATADIR%%/Figures/testshade/fBm_default.jpg
+%%DATADIR%%/Figures/testshade/fBm_freq.jpg
+%%DATADIR%%/Figures/testshade/fBm_gain.jpg
+%%DATADIR%%/Figures/testshade/fBm_lac.jpg
+%%DATADIR%%/Figures/testshade/fBm_octaves.jpg
+%%DATADIR%%/Figures/testshade/makenoise.jpg
+%%DATADIR%%/Figures/testshade/noisetex.jpg
+%%DATADIR%%/Figures/testshade/show_uv.jpg
+%%DATADIR%%/INSTALL.md
%%DATADIR%%/LICENSE
-%%DATADIR%%/README.md
+%%DATADIR%%/markdeep.min.js
%%DATADIR%%/osl-languagespec.pdf
+%%DATADIR%%/README.md
%%DATADIR%%/shaders/emitter.osl
%%DATADIR%%/shaders/emitter.oso
%%DATADIR%%/shaders/glass.osl
@@ -44,3 +55,4 @@ lib/osl.imageio.so
%%DATADIR%%/shaders/stdosl.h
%%DATADIR%%/shaders/ubersurface.osl
%%DATADIR%%/shaders/ubersurface.oso
+%%DATADIR%%/testshade.md.html
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index fc6e26810cdf..1dda81ebf646 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -2,7 +2,7 @@
PORTNAME= oyranos
PORTVERSION= 0.9.6
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= bsam@FreeBSD.org
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 16113366bc0a..4860335f4363 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -3,7 +3,7 @@
PORTNAME= PGPLOT
PORTVERSION= 2.21
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:KGB
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index bea494a63bb5..6451dbc23132 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pfstmo
PORTVERSION= 1.5
-PORTREVISION= 6
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF/pfstools/${PORTNAME}_depreciated/${PORTVERSION}
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index dff7005b12fa..ebc4ebf0ba0a 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pgplot
PORTVERSION= 5.2.2
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/
DISTNAME= ${PORTNAME}${PORTVERSION:R}
diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
index 0d3063ec5912..68ce7d30088d 100644
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= photivo
PORTVERSION= 0.0.2015.03.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/
DISTNAME= source-archive
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index bf7e1d4b7670..1ce6955ac80e 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= piglit
PORTVERSION= 20160809
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= x11@FreeBSD.org
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 48645836948f..2360cece4ddf 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pixie
PORTVERSION= 2.2.6
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
DISTNAME= Pixie-src-${PORTVERSION}
diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile
index df6bc117c8af..563f2010887f 100644
--- a/graphics/py-gdal/Makefile
+++ b/graphics/py-gdal/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gdal
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \
ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 6914576a541f..74e7ef27e95b 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -3,7 +3,7 @@
PORTNAME= raster3d
PORTVERSION= 3.0.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics biology
MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/
DISTNAME= Raster3D_${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 66c636f8703a..a3215ab04306 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rawtherapee
PORTVERSION= 5.2
+PORTREVISION= 1
#DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}${DISTVERSIONSUFFIX}
CATEGORIES= graphics
MASTER_SITES= http://rawtherapee.com/shared/source/
diff --git a/graphics/rubygem-exifr/Makefile b/graphics/rubygem-exifr/Makefile
index d24c0c35744e..f88a3a6b4c18 100644
--- a/graphics/rubygem-exifr/Makefile
+++ b/graphics/rubygem-exifr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= exifr
-PORTVERSION= 1.3.1
+PORTVERSION= 1.3.2
CATEGORIES= graphics rubygems
MASTER_SITES= RG
diff --git a/graphics/rubygem-exifr/distinfo b/graphics/rubygem-exifr/distinfo
index 10f6f88e2060..3cdc80b50967 100644
--- a/graphics/rubygem-exifr/distinfo
+++ b/graphics/rubygem-exifr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499518813
-SHA256 (rubygem/exifr-1.3.1.gem) = 7c88679c8b3b9075fa696ce70e4e9fbaa2c991f63590981c5771bffb14f3c08b
-SIZE (rubygem/exifr-1.3.1.gem) = 226304
+TIMESTAMP = 1505229709
+SHA256 (rubygem/exifr-1.3.2.gem) = 69a1d3cc84917166d8289eee285546d0ee331e60fc0e33361256e45cd49ba17a
+SIZE (rubygem/exifr-1.3.2.gem) = 226304
diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile
index df4d029792e2..9f9c7722e04b 100644
--- a/graphics/seexpr/Makefile
+++ b/graphics/seexpr/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seexpr
DISTVERSIONPREFIX= v
PORTVERSION= 2.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics math
MAINTAINER= danfe@FreeBSD.org
diff --git a/graphics/sekrit-twc-zimg/Makefile b/graphics/sekrit-twc-zimg/Makefile
index 33a548f31e11..2664ed46c644 100644
--- a/graphics/sekrit-twc-zimg/Makefile
+++ b/graphics/sekrit-twc-zimg/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= zimg
-PORTVERSION= 2.5.1
+PORTVERSION= 2.6.1
+PORTREVISION= 1
DISTVERSIONPREFIX= release-
CATEGORIES= graphics
PKGNAMEPREFIX= ${GH_ACCOUNT}-
diff --git a/graphics/sekrit-twc-zimg/distinfo b/graphics/sekrit-twc-zimg/distinfo
index 4ebf42b5f6ff..ad95dc5da2e6 100644
--- a/graphics/sekrit-twc-zimg/distinfo
+++ b/graphics/sekrit-twc-zimg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492296140
-SHA256 (sekrit-twc-zimg-release-2.5.1_GH0.tar.gz) = deb85887081cab7fa9c492b588900d60d6466e61ee8ea51a84ca280688d93de9
-SIZE (sekrit-twc-zimg-release-2.5.1_GH0.tar.gz) = 213083
+TIMESTAMP = 1504621137
+SHA256 (sekrit-twc-zimg-release-2.6.1_GH0.tar.gz) = 3f380898b4bf71c20cfedf9b2f87ba30612520c28b57c344c538dd56b1a5ea62
+SIZE (sekrit-twc-zimg-release-2.6.1_GH0.tar.gz) = 238285
diff --git a/graphics/sekrit-twc-zimg/files/patch-no-extra-deps b/graphics/sekrit-twc-zimg/files/patch-no-extra-deps
index 3a6402523ecc..b7c8f501217e 100644
--- a/graphics/sekrit-twc-zimg/files/patch-no-extra-deps
+++ b/graphics/sekrit-twc-zimg/files/patch-no-extra-deps
@@ -1,13 +1,13 @@
---- Makefile.am.orig 2016-08-17 04:57:11 UTC
+--- Makefile.am.orig 2017-09-05 14:18:57 UTC
+++ Makefile.am
-@@ -250,30 +250,12 @@ endif # TESTAPP
+@@ -280,31 +280,13 @@ endif # TESTAPP
if UNIT_TEST
TESTS = test/unit_test
-check_LTLIBRARIES = test/libmusl_m.la
check_PROGRAMS = test/unit_test
--test_libmusl_m_la_CFLAGS = $(AM_CFLAGS) -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable
+-test_libmusl_m_la_CFLAGS = $(AM_CFLAGS) -std=c99 -Wno-sign-compare -Wno-unused-variable -Wno-unused-but-set-variable
-
-test_libmusl_m_la_SOURCES = \
- test/extra/musl-libm/__cos.c \
@@ -24,6 +24,7 @@
- test/extra/musl-libm/sin.c
-
test_unit_test_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
-I$(srcdir)/src/zimg \
-I$(srcdir)/test \
- -I$(srcdir)/test/extra \
@@ -32,8 +33,8 @@
test_unit_test_SOURCES = \
test/main.cpp \
-@@ -272,9 +255,6 @@ test_unit_test_SOURCES = \
- test/colorspace/colorspace_test.cpp \
+@@ -313,9 +295,6 @@ test_unit_test_SOURCES = \
+ test/colorspace/gamma_test.cpp \
test/depth/depth_convert_test.cpp \
test/depth/dither_test.cpp \
- test/extra/sha1/config.h \
@@ -42,8 +43,8 @@
test/graph/audit_buffer.cpp \
test/graph/audit_buffer.h \
test/graph/basic_filter_test.cpp \
-@@ -302,7 +282,6 @@ test_unit_test_SOURCES += \
- endif #X86SIMD
+@@ -355,7 +334,6 @@ test_unit_test_SOURCES += \
+ endif # X86SIMD_AVX512
test_unit_test_LDADD = \
- test/extra/googletest/googletest/lib/libgtest.la \
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index 7ff069ac4a6c..a37f161dbf98 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sharpconstruct
PORTVERSION= 0.11
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= SF/sharp3d/SharpConstruct/${PORTVERSION}
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 1baf10f7e066..e7bbf4a30f79 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -3,7 +3,7 @@
PORTNAME= shotwell
PORTVERSION= 0.26.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics gnome
MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index 8edfe6462162..02c865b13be3 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= simpleviewer
PORTVERSION= 2.92
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= https://bitbucket.org/andreyu/simple-viewer-gl/get/
DISTNAME= v${PORTVERSION} # version tag, thus no embedded ${PORTNAME}
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 7cd6252ef1b2..a34679234946 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= synfigstudio
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics multimedia
MASTER_SITES= SF/synfig/releases/${PORTVERSION}/source
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index f6ffe2eb6674..4fa4851613fb 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tesseract
PORTVERSION= 3.05.01
+PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= pkubaj@anongoth.pl
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index f48aed90696f..48fe0445580a 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tiled
PORTVERSION= 1.0.3
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= graphics editors games
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 842af168689e..e28e0aa56780 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tulip
PORTVERSION= 4.10.0
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= _src
CATEGORIES= graphics
MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/vapoursynth-fmtconv/Makefile b/graphics/vapoursynth-fmtconv/Makefile
index 11c8b863a6e9..f3f54ef6ad12 100644
--- a/graphics/vapoursynth-fmtconv/Makefile
+++ b/graphics/vapoursynth-fmtconv/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fmtconv
PORTVERSION= r20
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= vapoursynth-
diff --git a/graphics/vapoursynth-waifu2x-w2xc/Makefile b/graphics/vapoursynth-waifu2x-w2xc/Makefile
index 54e1643cb7f9..b4b5acac7294 100644
--- a/graphics/vapoursynth-waifu2x-w2xc/Makefile
+++ b/graphics/vapoursynth-waifu2x-w2xc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= waifu2x-w2xc
DISTVERSION= r6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
PKGNAMEPREFIX= vapoursynth-
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index f73ea8316248..1a14723c9557 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vigra
DISTVERSION= 1.11.0
-PORTREVISION= 11
+PORTREVISION= 13
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile
index 53faa759d2e5..0dc19da4c3a7 100644
--- a/graphics/waffle/Makefile
+++ b/graphics/waffle/Makefile
@@ -3,7 +3,7 @@
PORTNAME= waffle
PORTVERSION= 1.5.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.waffle-gl.org/files/release/waffle-${PORTVERSION}/
diff --git a/graphics/waifu2x-converter-cpp/Makefile b/graphics/waifu2x-converter-cpp/Makefile
index 28d598159c1f..55ceca19da96 100644
--- a/graphics/waifu2x-converter-cpp/Makefile
+++ b/graphics/waifu2x-converter-cpp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= waifu2x-converter-cpp
DISTVERSION= 1.0.0-410
DISTVERSIONSUFFIX= -g5e5ac35
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME:C/-.*//}.1.gz?h=${PORTNAME:C/-.*//}-git&id=5c150a5&/:manpage
DISTFILES= ${PORTNAME:C/-.*//}.1.gz:manpage
diff --git a/graphics/wayland-protocols/Makefile b/graphics/wayland-protocols/Makefile
index b2f102c5fa3c..d6f9e3304dca 100644
--- a/graphics/wayland-protocols/Makefile
+++ b/graphics/wayland-protocols/Makefile
@@ -1,23 +1,21 @@
# $FreeBSD$
PORTNAME= wayland-protocols
-PORTVERSION= 1.7
+PORTVERSION= 1.10
CATEGORIES= graphics wayland
MASTER_SITES= https://wayland.freedesktop.org/releases/
MAINTAINER= kwm@FreeBSD.org
COMMENT= Wayland protocols
-BUILD_DEPENDS= wayland-scanner:graphics/wayland
-
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:xz pathfix
-GNU_CONFIGURE= yes
+BUILD_DEPENDS= wayland-scanner:graphics/wayland
-post-patch:
- @${REINPLACE_CMD} -e 's|$${datadir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
- ${WRKSRC}/configure
+USES= tar:xz
+NO_ARCH= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-noarch-pkgconfigdir='$${prefix}/libdata/pkgconfig'
.include <bsd.port.mk>
diff --git a/graphics/wayland-protocols/distinfo b/graphics/wayland-protocols/distinfo
index b65aa5fb1e19..446d7c805aa9 100644
--- a/graphics/wayland-protocols/distinfo
+++ b/graphics/wayland-protocols/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486828668
-SHA256 (wayland-protocols-1.7.tar.xz) = 635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f
-SIZE (wayland-protocols-1.7.tar.xz) = 113220
+TIMESTAMP = 1499756006
+SHA256 (wayland-protocols-1.10.tar.xz) = 5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a
+SIZE (wayland-protocols-1.10.tar.xz) = 117652
diff --git a/graphics/wayland-protocols/pkg-plist b/graphics/wayland-protocols/pkg-plist
index afd9c3c92eba..0449e8354bd9 100644
--- a/graphics/wayland-protocols/pkg-plist
+++ b/graphics/wayland-protocols/pkg-plist
@@ -4,6 +4,7 @@ libdata/pkgconfig/wayland-protocols.pc
%%DATADIR%%/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml
%%DATADIR%%/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
%%DATADIR%%/unstable/input-method/input-method-unstable-v1.xml
+%%DATADIR%%/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
%%DATADIR%%/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
%%DATADIR%%/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
%%DATADIR%%/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
@@ -12,5 +13,7 @@ libdata/pkgconfig/wayland-protocols.pc
%%DATADIR%%/unstable/tablet/tablet-unstable-v2.xml
%%DATADIR%%/unstable/text-input/text-input-unstable-v1.xml
%%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml
+%%DATADIR%%/unstable/xdg-output/xdg-output-unstable-v1.xml
%%DATADIR%%/unstable/xdg-shell/xdg-shell-unstable-v5.xml
%%DATADIR%%/unstable/xdg-shell/xdg-shell-unstable-v6.xml
+%%DATADIR%%/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml
diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile
index c33550f64ced..e195e1024eb2 100644
--- a/graphics/webp/Makefile
+++ b/graphics/webp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webp
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://downloads.webmproject.org/releases/webp/
DISTNAME= lib${PORTNAME}-${PORTVERSION}
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 5184f533d235..5faf8a05f3b3 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -3,6 +3,7 @@
PORTNAME= wxsvg
PORTVERSION= 1.5.12
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 833534d7f26b..72ec1eae237a 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xd3d
PORTVERSION= 8.3.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics math
MASTER_SITES= http://www.cmap.polytechnique.fr/~jouve/xd3d/
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index 381d0db80af5..80e806286f8e 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xface.el
PORTVERSION= 1.3.6.24
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= graphics elisp
MASTER_SITES= http://www.jpl.org/ftp/pub/elisp/ \
ftp://ftp.jpl.org/pub/elisp/
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index d2fbc717a78a..20b7d115d99c 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= pkgconfig
+USES= pkgconfig desktop-file-utils shared-mime-info
USE_GNOME= cairo libgnomecanvas
USE_XORG= x11
GNU_CONFIGURE= yes
@@ -29,6 +29,7 @@ GHOSTSCRIPT_DESC= Install ghostscript (PS/PDF as bitmap bg)
OPTIONS_DEFAULT= GHOSTSCRIPT
GHOSTSCRIPT_USES= ghostscript:run
+MAKE_ENV+= DATADIR=${DATADIR}
PORTDOCS_MAIN= AUTHORS \
ChangeLog \
@@ -68,11 +69,6 @@ PORTDOCS= ${PORTDOCS_MAIN} \
html-doc/pixmaps/black.png \
html-doc/pixmaps/text-tool.png
-post-patch:
- @${REINPLACE_CMD} \
- -e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \
- ${WRKSRC}/Makefile.in
-
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS_MAIN:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/xournal/files/patch-Makefile.in b/graphics/xournal/files/patch-Makefile.in
index 69fd92721e57..bf675f78355b 100644
--- a/graphics/xournal/files/patch-Makefile.in
+++ b/graphics/xournal/files/patch-Makefile.in
@@ -1,6 +1,15 @@
---- Makefile.in.orig 2014-06-29 08:53:20.000000000 +0200
-+++ Makefile.in 2015-02-23 22:51:49.000000000 +0100
-@@ -796,31 +796,29 @@
+--- Makefile.in.orig 2017-07-20 18:30:27 UTC
++++ Makefile.in
+@@ -809,38 +809,36 @@ uninstall-am:
+ install-data-local:
+ @$(NORMAL_INSTALL)
+ if test -d $(srcdir)/pixmaps; then \
+- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
++ $(mkinstalldirs) $(DESTDIR)$(DATADIR)/pixmaps; \
+ for pixmap in $(srcdir)/pixmaps/*; do \
+ if test -f $$pixmap; then \
+- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
++ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(DATADIR)/pixmaps; \
fi \
done \
fi; \
@@ -33,7 +42,7 @@
- else \
- desktopdir=/usr/local/share; \
- fi; \
-+ desktopdir=$(pkgdatadir); \
++ desktopdir=$(DATADIR); \
$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
@@ -43,7 +52,7 @@
$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
-@@ -828,7 +826,7 @@
+@@ -851,7 +849,7 @@ desktop-install:
fi; \
$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
diff --git a/graphics/xournal/files/patch-configure b/graphics/xournal/files/patch-configure
index 25d8b47efd97..9b2b3e4b3c48 100644
--- a/graphics/xournal/files/patch-configure
+++ b/graphics/xournal/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2017-07-20 18:30:25.000000000 +0000
-+++ configure 2017-08-01 14:05:24.637135000 +0000
-@@ -5605,6 +5605,8 @@
+--- configure.orig 2017-07-20 18:30:25 UTC
++++ configure
+@@ -5605,6 +5605,8 @@ fi
case "$host" in
*-*-linux*)
os_linux=yes;;
diff --git a/graphics/xournal/files/patch-src_Makefile.in b/graphics/xournal/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..aaeb25339077
--- /dev/null
+++ b/graphics/xournal/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig 2017-08-20 23:55:48 UTC
++++ src/Makefile.in
+@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
+ @WIN32_FALSE@SUBDIRS = ttsubset
+ @WIN32_TRUE@SUBDIRS = ttsubset win32
+ INCLUDES = \
+- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
++ -DPACKAGE_DATA_DIR=\""$(DATADIR)/pixmaps"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ @PACKAGE_CFLAGS@
+
diff --git a/graphics/xournal/files/patch-src_main.c b/graphics/xournal/files/patch-src_main.c
new file mode 100644
index 000000000000..cfaac9b4a744
--- /dev/null
+++ b/graphics/xournal/files/patch-src_main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig 2015-10-25 04:26:29 UTC
++++ src/main.c
+@@ -360,7 +360,7 @@ main (int argc, char *argv[])
+ g_free(path);
+ g_free(path1);
+ g_free(path2);
+- add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
++ add_pixmap_directory (PACKAGE_DATA_DIR);
+
+ /*
+ * The following code was added by Glade to create one of each component
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 715d0de23eba..33919e0c5e59 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,66 +1,8 @@
# $FreeBSD$
-PORTNAME= xpdf
-PORTVERSION= 3.04
-PORTREVISION= 7
-CATEGORIES= graphics print
-MASTER_SITES= http://mirrors.rit.edu/zi/ \
- ftp://ftp.foolabs.com/pub/xpdf/ \
- TEX_CTAN/support/xpdf \
- http://komquats.com/distfiles/
+VERSIONS= 3 4
+XPDF_VERSION?= 4
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Display PDF files and convert them to other formats
+MASTERDIR= ${.CURDIR}/../xpdf${XPDF_VERSION}
-LICENSE= GPLv2
-
-LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libpng.so:graphics/png
-
-GNU_CONFIGURE= yes
-USES= gmake cpe localbase
-CPE_VENDOR= foolabs
-CONFIGURE_ARGS= --enable-opi \
- --with-freetype2-library="${LOCALBASE}/lib" \
- --with-freetype2-includes="${LOCALBASE}/include/freetype2" \
- --bindir="${PREFIX}/libexec/xpdf" \
- --mandir="${PREFIX}/share/xpdf/man"
-
-MANPREFIX= ${PREFIX}/share/xpdf
-
-OPTIONS_DEFINE= LIBPAPER TYPE1 X11 DOCS
-LIBPAPER_DESC= Enable libpaper
-TYPE1_DESC= Ghostscript type1 fonts
-OPTIONS_DEFAULT= TYPE1 X11
-OPTIONS_SUB= yes
-
-SUB_FILES= xpdf-man.conf
-
-TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
-
-LIBPAPER_LIB_DEPENDS= libpaper.so:print/libpaper
-LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
- --with-libpaper-includes="${LOCALBASE}/include"
-LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
-
-.if defined(A4)
-CONFIGURE_ARGS+= --enable-a4-paper
-.endif
-
-X11_CONFIGURE_WITH= x
-X11_USES= motif
-
-post-patch:
- ${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
- ${WRKSRC}/xpdf/XPDFViewer.h
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ANNOUNCE CHANGES README misc/hello.pdf
- ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
- ${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
- ${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
- ${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/xpdf3/Makefile b/graphics/xpdf3/Makefile
new file mode 100644
index 000000000000..2eb5789619fa
--- /dev/null
+++ b/graphics/xpdf3/Makefile
@@ -0,0 +1,70 @@
+# $FreeBSD$
+
+PORTNAME= xpdf
+PORTVERSION= 3.04
+PORTREVISION= 9
+CATEGORIES= graphics print
+MASTER_SITES= http://mirrors.rit.edu/zi/ \
+ ftp://ftp.foolabs.com/pub/xpdf/ \
+ TEX_CTAN/support/xpdf \
+ http://komquats.com/distfiles/
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX= 3
+.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
+
+GNU_CONFIGURE= yes
+USES= gmake cpe localbase
+CPE_VENDOR= foolabs
+CONFIGURE_ARGS= --enable-opi \
+ --with-freetype2-library="${LOCALBASE}/lib" \
+ --with-freetype2-includes="${LOCALBASE}/include/freetype2" \
+ --bindir="${PREFIX}/libexec/xpdf" \
+ --mandir="${PREFIX}/share/xpdf/man"
+
+MANPREFIX= ${PREFIX}/share/xpdf
+
+OPTIONS_DEFINE= LIBPAPER TYPE1 X11 DOCS
+LIBPAPER_DESC= Enable libpaper
+TYPE1_DESC= Ghostscript type1 fonts
+OPTIONS_DEFAULT= TYPE1 X11
+OPTIONS_SUB= yes
+
+SUB_FILES= xpdf-man.conf
+
+TYPE1_RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:print/gsfonts
+
+LIBPAPER_LIB_DEPENDS= libpaper.so:print/libpaper
+LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
+ --with-libpaper-includes="${LOCALBASE}/include"
+LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
+
+.if defined(A4)
+CONFIGURE_ARGS+= --enable-a4-paper
+.endif
+
+X11_CONFIGURE_WITH= x
+X11_USES= motif
+
+post-patch:
+ ${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
+ ${WRKSRC}/xpdf/XPDFViewer.h
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in ANNOUNCE CHANGES README misc/hello.pdf
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+.endfor
+ @cd ${STAGEDIR}${PREFIX}; \
+ ${LN} -sf ../libexec/xpdf/xpdf bin/xpdf
+ ${INSTALL_DATA} ${WRKDIR}/xpdf-man.conf \
+ ${STAGEDIR}${PREFIX}/etc/man.d/xpdf.conf
+
+.include <bsd.port.mk>
diff --git a/graphics/xpdf/distinfo b/graphics/xpdf3/distinfo
index 8e5c949df70a..8e5c949df70a 100644
--- a/graphics/xpdf/distinfo
+++ b/graphics/xpdf3/distinfo
diff --git a/graphics/xpdf/files/patch-Makefile.in b/graphics/xpdf3/files/patch-Makefile.in
index 6df513c49f4d..6df513c49f4d 100644
--- a/graphics/xpdf/files/patch-Makefile.in
+++ b/graphics/xpdf3/files/patch-Makefile.in
diff --git a/graphics/xpdf/files/patch-splash_Makefile.in b/graphics/xpdf3/files/patch-splash_Makefile.in
index 280cadcca468..280cadcca468 100644
--- a/graphics/xpdf/files/patch-splash_Makefile.in
+++ b/graphics/xpdf3/files/patch-splash_Makefile.in
diff --git a/graphics/xpdf/files/patch-splash_SplashFTFont.cc b/graphics/xpdf3/files/patch-splash_SplashFTFont.cc
index 48049df5edc6..48049df5edc6 100644
--- a/graphics/xpdf/files/patch-splash_SplashFTFont.cc
+++ b/graphics/xpdf3/files/patch-splash_SplashFTFont.cc
diff --git a/graphics/xpdf/files/patch-xfont b/graphics/xpdf3/files/patch-xfont
index 57a127450f3a..57a127450f3a 100644
--- a/graphics/xpdf/files/patch-xfont
+++ b/graphics/xpdf3/files/patch-xfont
diff --git a/graphics/xpdf/files/patch-xpdf_GlobalParams.cc b/graphics/xpdf3/files/patch-xpdf_GlobalParams.cc
index ceab23673ba1..ceab23673ba1 100644
--- a/graphics/xpdf/files/patch-xpdf_GlobalParams.cc
+++ b/graphics/xpdf3/files/patch-xpdf_GlobalParams.cc
diff --git a/graphics/xpdf/files/patch-xpdf_GlobalParams.h b/graphics/xpdf3/files/patch-xpdf_GlobalParams.h
index 9d6349e4d487..9d6349e4d487 100644
--- a/graphics/xpdf/files/patch-xpdf_GlobalParams.h
+++ b/graphics/xpdf3/files/patch-xpdf_GlobalParams.h
diff --git a/graphics/xpdf/files/patch-xpdf_Stream.cc b/graphics/xpdf3/files/patch-xpdf_Stream.cc
index 0804c26b55bc..0804c26b55bc 100644
--- a/graphics/xpdf/files/patch-xpdf_Stream.cc
+++ b/graphics/xpdf3/files/patch-xpdf_Stream.cc
diff --git a/graphics/xpdf/files/patch-xpdf_XPDFViewer.cc b/graphics/xpdf3/files/patch-xpdf_XPDFViewer.cc
index 65c3faca7da6..65c3faca7da6 100644
--- a/graphics/xpdf/files/patch-xpdf_XPDFViewer.cc
+++ b/graphics/xpdf3/files/patch-xpdf_XPDFViewer.cc
diff --git a/graphics/xpdf/files/patch-xpdf__Makefile.in b/graphics/xpdf3/files/patch-xpdf__Makefile.in
index 756c8da6e991..756c8da6e991 100644
--- a/graphics/xpdf/files/patch-xpdf__Makefile.in
+++ b/graphics/xpdf3/files/patch-xpdf__Makefile.in
diff --git a/graphics/xpdf/files/xpdf-man.conf.in b/graphics/xpdf3/files/xpdf-man.conf.in
index a7e2ad6b6dca..a7e2ad6b6dca 100644
--- a/graphics/xpdf/files/xpdf-man.conf.in
+++ b/graphics/xpdf3/files/xpdf-man.conf.in
diff --git a/graphics/xpdf/pkg-descr b/graphics/xpdf3/pkg-descr
index b6a0b3056a0b..b6a0b3056a0b 100644
--- a/graphics/xpdf/pkg-descr
+++ b/graphics/xpdf3/pkg-descr
diff --git a/graphics/xpdf/pkg-message b/graphics/xpdf3/pkg-message
index e8baf67674ee..e8baf67674ee 100644
--- a/graphics/xpdf/pkg-message
+++ b/graphics/xpdf3/pkg-message
diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf3/pkg-plist
index 724f3f9360bc..724f3f9360bc 100644
--- a/graphics/xpdf/pkg-plist
+++ b/graphics/xpdf3/pkg-plist
diff --git a/graphics/xpdf4/Makefile b/graphics/xpdf4/Makefile
new file mode 100644
index 000000000000..75b745a5496e
--- /dev/null
+++ b/graphics/xpdf4/Makefile
@@ -0,0 +1,54 @@
+# $FreeBSD$
+
+PORTNAME= xpdf
+PORTVERSION= 4.02
+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_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
+
+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 <bsd.port.mk>
diff --git a/graphics/xpdf4/distinfo b/graphics/xpdf4/distinfo
new file mode 100644
index 000000000000..70113e77772f
--- /dev/null
+++ b/graphics/xpdf4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1505380050
+SHA256 (xpdf-4.02.tar.gz) = ff3d92c42166e35b1ba6aec9b5f0adffb5fc05a3eb95dc49505b6e344e4216d6
+SIZE (xpdf-4.02.tar.gz) = 854175
diff --git a/graphics/xpdf4/files/patch-cmake-config.txt b/graphics/xpdf4/files/patch-cmake-config.txt
new file mode 100644
index 000000000000..ece77c523e1d
--- /dev/null
+++ b/graphics/xpdf4/files/patch-cmake-config.txt
@@ -0,0 +1,49 @@
+--- cmake-config.txt.orig 2017-09-02 20:30:45 UTC
++++ cmake-config.txt
+@@ -79,6 +79,7 @@ option(USE_EXCEPTIONS "use C++ exception
+ 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()
+ 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)
diff --git a/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt b/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
new file mode 100644
index 000000000000..d7e91fe26916
--- /dev/null
+++ b/graphics/xpdf4/files/patch-xpdf-qt_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..dc31866fc386
--- /dev/null
+++ b/graphics/xpdf4/files/patch-xpdf_CMakeLists.txt
@@ -0,0 +1,143 @@
+--- 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)
diff --git a/graphics/xpdf4/files/xpdf-man.conf.in b/graphics/xpdf4/files/xpdf-man.conf.in
new file mode 100644
index 000000000000..2fd81b7bd6d1
--- /dev/null
+++ b/graphics/xpdf4/files/xpdf-man.conf.in
@@ -0,0 +1,2 @@
+MANPATH %%PREFIX%%/share/xpdf/man
+
diff --git a/graphics/xpdf4/pkg-descr b/graphics/xpdf4/pkg-descr
new file mode 100644
index 000000000000..a09c117e2541
--- /dev/null
+++ b/graphics/xpdf4/pkg-descr
@@ -0,0 +1,8 @@
+Xpdf is a viewer for Portable Document Format (PDF) files. These are
+also sometimes also called 'Acrobat' files, from the name of Adobe's
+PDF software.
+
+It can also convert PDF input to ps, text, and info formats; and
+split out fonts and images.
+
+WWW: http://www.xpdfreader.com/
diff --git a/graphics/xpdf4/pkg-message b/graphics/xpdf4/pkg-message
new file mode 100644
index 000000000000..e8baf67674ee
--- /dev/null
+++ b/graphics/xpdf4/pkg-message
@@ -0,0 +1,8 @@
+Please note: The binaries in this package -- pdffonts, pdfimages, pdfinfo,
+pdfdetach, pdftohtml, pdftopng, pdftoppm, pdftops, pdftotext -- are
+installed in ${LOCALBASE}/libexec/xpdf. The reason for this is to not
+conflict with the poppler-utils package, which is a prerequisite of many
+other packages. If you need to use any of these utilites,
+
+a) create symlinks in ${LOCALBASE}/bin or some other directory in $PATH, or
+b) install graphics/poppler-utils.
diff --git a/graphics/xpdf4/pkg-plist b/graphics/xpdf4/pkg-plist
new file mode 100644
index 000000000000..664c9f1b270e
--- /dev/null
+++ b/graphics/xpdf4/pkg-plist
@@ -0,0 +1,24 @@
+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
+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/man5/xpdfrc.5.gz
+@sample etc/xpdfrc.sample
diff --git a/graphics/zathura-cb/Makefile b/graphics/zathura-cb/Makefile
index b83a6e495df9..ade97f78a061 100644
--- a/graphics/zathura-cb/Makefile
+++ b/graphics/zathura-cb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zathura-cb
PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://pwmt.org/projects/zathura-cb/download/ \
http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile
index 75041cc3b636..4a9bd56a59b2 100644
--- a/graphics/zathura-djvu/Makefile
+++ b/graphics/zathura-djvu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zathura-djvu
PORTVERSION= 0.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://pwmt.org/projects/zathura/plugins/download/ \
http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile
index 803f6756901c..b474d6ca77a5 100644
--- a/graphics/zathura-pdf-mupdf/Makefile
+++ b/graphics/zathura-pdf-mupdf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zathura-pdf-mupdf
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index 8f8b785e7863..492d23319714 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zathura-pdf-poppler
PORTVERSION= 0.2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= https://pwmt.org/projects/zathura/plugins/download/ \
http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura-ps/Makefile b/graphics/zathura-ps/Makefile
index e2916af5988b..d281e348726a 100644
--- a/graphics/zathura-ps/Makefile
+++ b/graphics/zathura-ps/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zathura-ps
PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= https://pwmt.org/projects/zathura-ps/download/ \
http://www.madpilot.net/~mad/pwmt.org/
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 885bb1f3f77c..47ef47ef5cc9 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zathura
PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics print
MASTER_SITES= https://pwmt.org/projects/zathura/download/ \
http://www.madpilot.net/~mad/pwmt.org/