From owner-svn-ports-all@freebsd.org Sat Mar 16 19:23:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5439E153998B; Sat, 16 Mar 2019 19:23:56 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EFC4170CEC; Sat, 16 Mar 2019 19:23:55 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC96B2673B; Sat, 16 Mar 2019 19:23:55 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GJNtG0091507; Sat, 16 Mar 2019 19:23:55 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GJNtdJ091505; Sat, 16 Mar 2019 19:23:55 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161923.x2GJNtdJ091505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 19:23:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495948 - in head: . graphics/photivo X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . graphics/photivo X-SVN-Commit-Revision: 495948 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EFC4170CEC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 19:23:56 -0000 Author: tcberner Date: Sat Mar 16 19:23:55 2019 New Revision: 495948 URL: https://svnweb.freebsd.org/changeset/ports/495948 Log: graphics/photivo: remove flavors (Qt4 deprecation) Approved by: portmgr (implicit) Modified: head/MOVED head/graphics/photivo/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Mar 16 19:17:36 2019 (r495947) +++ head/MOVED Sat Mar 16 19:23:55 2019 (r495948) @@ -11676,3 +11676,5 @@ net-im/telepathy-qt@qt4||2019-03-16|Qt4 deprecation net-im/telepathy-qt@qt5|net-im/telepathy-qt|2019-03-16|Flavor has been removed graphics/fracplanet@qt4||2019-03-16|Qt4 deprecation graphics/fracplanet@qt5|graphics/fracplanet|2019-03-16|Flavor has been removed +graphics/photivo@qt4||2019-03-16|Qt4 deprecation +graphics/photivo@qt5|graphics/photivo|2019-03-16|Flavor has been removed Modified: head/graphics/photivo/Makefile ============================================================================== --- head/graphics/photivo/Makefile Sat Mar 16 19:17:36 2019 (r495947) +++ head/graphics/photivo/Makefile Sat Mar 16 19:23:55 2019 (r495948) @@ -3,7 +3,7 @@ PORTNAME= photivo PORTVERSION= 0.0.2015.03.21 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/ DISTNAME= source-archive @@ -23,29 +23,15 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libfftw3.so:math/fftw3 USES= cmake compiler:c++11-lib desktop-file-utils dos2unix \ - gettext-runtime gnome jpeg pkgconfig zip + gettext-runtime gnome jpeg pkgconfig qt:5 zip USE_GNOME= glib20 +USE_QT= qmake_build buildtools_build core gui network widgets DOS2UNIX_FILES= Sources/ptImage.cpp Sources/ptCheck.cpp Sources/filemgmt/ptFileMgrWindow.h \ Sources/ptImageHelper.h Sources/ptMainWindow.h WRKSRC= ${WRKDIR}/${PORTNAME} -FLAVORS= qt5 qt4 - -qt4_CONFLICTS_INSTALL= ${PORTNAME} -qt4_PKGNAMESUFFIX= -qt4 -qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt4 - -.if ${FLAVOR:U} == qt4 -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE=2019-03-15 -USES+= qt:4 -USE_QT= qmake_build moc_build rcc_build uic_build corelib gui network -CMAKE_ON= FORCE_QT4 -.else -USES+= qt:5 -USE_QT= qmake_build buildtools_build core gui network widgets -.endif +CONFLICTS_INSTALL= ${PORTNAME}-qt4 post-patch: @${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \