Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Aug 2016 13:50:27 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r419684 - head/deskutils/fet
Message-ID:  <201608051350.u75DoR9Y081892@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Fri Aug  5 13:50:27 2016
New Revision: 419684
URL: https://svnweb.freebsd.org/changeset/ports/419684

Log:
  Update to upstream version 5.30.2, add QT5 support via OPTION knob
  
  PR:		211539
  Submitted by:	udvzsolt@gmail.com (maintainer)

Modified:
  head/deskutils/fet/Makefile
  head/deskutils/fet/distinfo

Modified: head/deskutils/fet/Makefile
==============================================================================
--- head/deskutils/fet/Makefile	Fri Aug  5 13:38:42 2016	(r419683)
+++ head/deskutils/fet/Makefile	Fri Aug  5 13:50:27 2016	(r419684)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fet
-PORTVERSION=	5.30.1
+PORTVERSION=	5.30.2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
 		http://lalescu.ro/liviu/fet/download/old/ \
@@ -16,8 +16,6 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		qmake tar:bzip2
-USE_QT4=	corelib xml \
-		moc_build rcc_build uic_build
 
 PORTEXAMPLES=	*
 
@@ -29,14 +27,29 @@ DESKTOP_ENTRIES="FET" \
 		true
 
 OPTIONS_DEFINE=	EXAMPLES NLS ONLYCL
-ONLYCL_DESC=	Build only command line version (without Qt4 GUI)
+OPTIONS_SINGLE=	QTVER
+OPTIONS_SINGLE_QTVER=	QT4 QT5
+OPTIONS_DEFAULT=	EXAMPLES NLS QT4
+ONLYCL_DESC=	Build only command line version (without Qt GUI)
 
 OPTIONS_SUB=	yes
 
-ONLYCL_INSTALL_TARGET=	${WRKSRC}/fet-cl
-ONLYCL_VARS=	QMAKE_SOURCE_PATH=${WRKSRC}/src/src-cl.pro
-ONLYCL_USE_OFF=	qt4=gui,network
-ONLYCL_INSTALL_TARGET_OFF=	${WRKSRC}/fet
+QT4_USE=	QT4=corelib,moc_build,rcc_build,uic_build,xml
+QT5_USE=	QT5=buildtools_build,core,xml GL=gl
+
+.include <bsd.port.options.mk>
+
+INSTALL_TARGET=	${WRKSRC}/fet-cl
+.if ${PORT_OPTIONS:MONLYCL}
+QMAKE_SOURCE_PATH=	${WRKSRC}/src/src-cl.pro
+.else
+INSTALL_TARGET+=	${WRKSRC}/fet
+.if ${PORT_OPTIONS:MQT4}
+USE_QT4+=gui network
+.else
+USE_QT5+=gui network printsupport widgets
+.endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \

Modified: head/deskutils/fet/distinfo
==============================================================================
--- head/deskutils/fet/distinfo	Fri Aug  5 13:38:42 2016	(r419683)
+++ head/deskutils/fet/distinfo	Fri Aug  5 13:50:27 2016	(r419684)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468911589
-SHA256 (fet-5.30.1.tar.bz2) = c9ee88081ba08a4832509f5898d17da599608fbabc57ecec4cb6a0a2a2647404
-SIZE (fet-5.30.1.tar.bz2) = 10183864
+TIMESTAMP = 1470143851
+SHA256 (fet-5.30.2.tar.bz2) = d045824d44999ae7714ba20d8d29e8fb6bc86adad0e60a67a50b85048613b36b
+SIZE (fet-5.30.2.tar.bz2) = 10189378



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608051350.u75DoR9Y081892>