From owner-svn-ports-all@freebsd.org  Tue Feb  7 23:46:24 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 485C8CD56BB;
 Tue,  7 Feb 2017 23:46:24 +0000 (UTC)
 (envelope-from danfe@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 mx1.freebsd.org (Postfix) with ESMTPS id 0FA5217C3;
 Tue,  7 Feb 2017 23:46:23 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v17NkNc0039965;
 Tue, 7 Feb 2017 23:46:23 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17NkNQ8039964;
 Tue, 7 Feb 2017 23:46:23 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201702072346.v17NkNQ8039964@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 7 Feb 2017 23:46:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r433626 - head/graphics/photivo
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Feb 2017 23:46:24 -0000

Author: danfe
Date: Tue Feb  7 23:46:22 2017
New Revision: 433626
URL: https://svnweb.freebsd.org/changeset/ports/433626

Log:
  Allow to build `graphics/photivo' against Qt 4, but keep Qt 5 enabled by
  default to avoid needless package rebuilds.  (I was not able to reproduce
  the build failure originally mentioned in r428684.)

Modified:
  head/graphics/photivo/Makefile

Modified: head/graphics/photivo/Makefile
==============================================================================
--- head/graphics/photivo/Makefile	Tue Feb  7 22:54:12 2017	(r433625)
+++ head/graphics/photivo/Makefile	Tue Feb  7 23:46:22 2017	(r433626)
@@ -24,11 +24,20 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 
 USES=		cmake compiler:c++11-lib desktop-file-utils dos2unix \
 		gettext-runtime jpeg pkgconfig zip
 USE_GNOME=	glib20
-USE_QT5=	qmake_build buildtools_build core gui network widgets
 DOS2UNIX_FILES=	Sources/ptImage.cpp Sources/ptCheck.cpp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+_QT4_DEPS=	qmake_build moc_build rcc_build uic_build corelib gui network
+_QT5_DEPS=	qmake_build buildtools_build core gui network widgets
+
+OPTIONS_DEFINE=	QT4
+QT4_DESC=	Build against Qt 4 instead of Qt 5
+
+QT4_USE=	QT4=${_QT4_DEPS:ts,}
+QT4_USE_OFF=	QT5=${_QT5_DEPS:ts,}
+QT4_CMAKE_ON=	-DFORCE_QT4:BOOL=true
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \
 		${WRKSRC}/Sources/ptCimg.cpp \