svn commit: r496061 - in head: . graphics graphics/oyranos

[Tobias C. Berner]

Author: tcberner
Date: Sun Mar 17 14:14:27 2019
New Revision: 496061
URL: https://svnweb.freebsd.org/changeset/ports/496061

Log:
  graphics/oyranos: reinstate with Qt5 support
  
  - the port was removed in r495967
  - reinstate using Qt5 components
  
  Approved by:	portmgr (implicit)

Added:
  head/graphics/oyranos/
     - copied from r495966, head/graphics/oyranos/
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/oyranos/Makefile
  head/graphics/oyranos/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Mar 17 13:28:57 2019	(r496060)
+++ head/MOVED	Sun Mar 17 14:14:27 2019	(r496061)
@@ -11844,7 +11844,6 @@ graphics/lprof-devel||2019-03-16|Has expired: Qt4 has 
 graphics/luminance||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 graphics/meshviewer||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 graphics/natron||2019-03-16|Has expired: Qt4 has been EOL since december 2015
-graphics/oyranos||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 graphics/pencil||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 graphics/prison||2019-03-16|Has expired: Qt4 has been EOL since december 2015
 graphics/py-qt4-svg||2019-03-16|Has expired: Qt4 has been EOL since december 2015

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sun Mar 17 13:28:57 2019	(r496060)
+++ head/graphics/Makefile	Sun Mar 17 14:14:27 2019	(r496061)
@@ -611,6 +611,7 @@
     SUBDIR += osg-devel
     SUBDIR += osgearth
     SUBDIR += ossim
+    SUBDIR += oyranos
     SUBDIR += p5-Acme-Steganography-Image-Png
     SUBDIR += p5-Algorithm-Line-Bresenham
     SUBDIR += p5-Alien-Gimp

Modified: head/graphics/oyranos/Makefile
==============================================================================
--- head/graphics/oyranos/Makefile	Sat Mar 16 21:52:35 2019	(r495966)
+++ head/graphics/oyranos/Makefile	Sun Mar 17 14:14:27 2019	(r496061)
@@ -2,7 +2,7 @@
 
 PORTNAME=	oyranos
 PORTVERSION=	0.9.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 
 MAINTAINER=	bsam at FreeBSD.org
@@ -10,9 +10,6 @@ COMMENT=	Colour Management System (CMS)
 
 LICENSE=	BSD3CLAUSE
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-
 RUN_DEPENDS=	${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \
 		${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \
 		xcalib:x11/xcalib
@@ -33,12 +30,13 @@ LIB_DEPENDS=	libraw.so:graphics/libraw \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	oyranos-cms
-USES=		cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig qt:4
+USES=		cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig qt:5
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
-USE_QT=		corelib gui moc_build qmake_build rcc_build uic_build
-USE_XORG=	ice sm x11 xcursor xext xfixes xinerama xrandr xft xxf86vm
+USE_QT=		core gui widgets x11extras \
+		buildtools_build qmake_build
+USE_XORG=	ice sm x11 xcursor xext xfixes xinerama xrandr xrender xft xxf86vm
 CMAKE_ARGS+=	-DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MAKE_JOBS_UNSAFE=yes

Modified: head/graphics/oyranos/pkg-plist
==============================================================================
--- head/graphics/oyranos/pkg-plist	Sat Mar 16 21:52:35 2019	(r495966)
+++ head/graphics/oyranos/pkg-plist	Sun Mar 17 14:14:27 2019	(r496061)
@@ -12,7 +12,7 @@ bin/oyranos-profiles
 bin/oyranos-xforms
 bin/oyranos-xforms-fltk
 bin/oyranos-xforms-modules
-bin/qcmsevents-qt4
+bin/qcmsevents
 etc/xdg/autostart/oyranos-monitor-setup.desktop
 include/oyranos/alpha/oyranos_alpha.h
 include/oyranos/icc34.h
@@ -72,8 +72,8 @@ include/oyranos/oyranos_types.h
 include/oyranos/oyranos_version.h
 lib/cmake/oyranos/OyranosConfig.cmake
 lib/color/modules/liboyranos_CUPS_cmm_module.so
-lib/color/modules/liboyranos_lcms_cmm_module.so
 lib/color/modules/liboyranos_lcm2_cmm_module.so
+lib/color/modules/liboyranos_lcms_cmm_module.so
 lib/color/modules/liboyranos_lraw_cmm_module.so
 lib/color/modules/liboyranos_oJPG_cmm_module.so
 lib/color/modules/liboyranos_oPNG_cmm_module.so
@@ -121,7 +121,7 @@ man/man3/oyranos-config.3.gz
 man/man3/oyranos.3.gz
 share/applications/oyranos-image-display.desktop
 share/applications/oyranos-profile-install.desktop
-share/applications/qcmsevents-qt4-applet.desktop
+share/applications/qcmsevents-applet.desktop
 share/color/rank-map/config.icc_profile.monitor.oyX1.qarz.json
 share/color/rank-map/config.icc_profile.printer.CUPS.json
 share/color/rank-map/config.icc_profile.raw-image.oyRE.json
@@ -140,4 +140,4 @@ share/man/man1/oyranos-xforms-fltk.1
 share/man/man1/oyranos-xforms-modules.1
 share/pixmaps/lcms_logo2.png
 share/pixmaps/oyranos_logo.png
-share/pixmaps/qcmsevents-qt4.svg
+share/pixmaps/qcmsevents.svg