svn commit: r495942 - in head: . deskutils/znotes

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 18:53:09 2019
New Revision: 495942
URL: https://svnweb.freebsd.org/changeset/ports/495942

Log:
  deskutils/znotes: remove flavors (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/MOVED
  head/deskutils/znotes/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Mar 16 18:46:13 2019	(r495941)
+++ head/MOVED	Sat Mar 16 18:53:09 2019	(r495942)
@@ -11672,3 +11672,5 @@ sysutils/polkit-qt at qt4||2019-03-16|Qt4 deprecation
 sysutils/polkit-qt at qt5|sysutils/polkit-qt|2019-03-16|Flavor has been removed
 security/qtkeychain at qt4||2019-03-16|Qt4 deprecation
 security/qtkeychain at qt5|security/qtkeychain|2019-03-16|Flavor has been removed
+deskutils/znotes at qt4||2019-03-16|Qt4 deprecation
+deskutils/znotes at qt5|deskutils/znotes|2019-03-16|Flavor has been removed

Modified: head/deskutils/znotes/Makefile
==============================================================================
--- head/deskutils/znotes/Makefile	Sat Mar 16 18:46:13 2019	(r495941)
+++ head/deskutils/znotes/Makefile	Sat Mar 16 18:53:09 2019	(r495942)
@@ -3,9 +3,8 @@
 
 PORTNAME=	znotes
 PORTVERSION=	0.4.5.20150825
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
-PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	rigoletto at FreeBSD.org
 COMMENT=	Simple notes managment application based on Qt
@@ -13,26 +12,16 @@ COMMENT=	Simple notes managment application based on Q
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-
-USES=		compiler:c++11-lang gl qmake
+USES=		compiler:c++11-lang gl qmake qt:5
 USE_GL=		gl
+USE_QT=		buildtools_build linguisttools_build core gui network printsupport widgets xml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	proton
 GH_PROJECT=	zNotes
 GH_TAGNAME=	6423c5e
 
-. if ${FLAVOR} == qt4
-DEPRECATED=	Qt4 has been EOL since december 2015
-EXPIRATION_DATE=2019-03-15
-USES+=		qt:4
-USE_QT=		uic_build moc_build rcc_build linguisttools_build corelib gui network xml
-. else
-USES+=		compiler:c++11-lang qt:5
-USE_QT=		buildtools_build linguisttools_build core gui network printsupport widgets xml
-. endif
+CONFLICTS_INSTALL=	znotes-qt[45]
 
 DESKTOP_ENTRIES="zNotes" "Notes managment" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \