--- Makefile	(revision 456949)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	fet
-DISTVERSION=	5.34.0
+DISTVERSION=	5.34.3
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://lalescu.ro/liviu/fet/download/ \
 		http://lalescu.ro/liviu/fet/download/old/ \
@@ -15,46 +15,51 @@ 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		qmake tar:bzip2
+USES=		tar:bzip2
 
 PORTEXAMPLES=	*
 
-DESKTOP_ENTRIES="FET" \
-		"Free timetable software" \
-		"" \
-		"fet" \
-		"Education;Qt;" \
-		true
-
-OPTIONS_DEFINE=	EXAMPLES NLS ONLYCL
+OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SINGLE=	QTVER
 OPTIONS_SINGLE_QTVER=	QT4 QT5
-OPTIONS_DEFAULT=	QT4
+OPTIONS_DEFAULT=	EXAMPLES QT4
 ONLYCL_DESC=	Build only command line version (without Qt GUI)
 
+FLAVORS=	gui cli
+cli_PKGNAMESUFFIX=	-cli
+
 OPTIONS_SUB=	yes
 
-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>
 
+USES+=	qmake
+.	if ${FLAVOR:U} == cli
+PLIST_SUB+=	CLI="" EXAMPLES="" GUI="@comment "
 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
+.		if ${PORT_OPTIONS:MQT4}
+USE_QT4+=corelib moc_build rcc_build uic_build xml
+.		else
+USE_QT5+=	buildtools_build core xml
+USE_GL=	gl
+.		endif
+.	else
+DESKTOP_ENTRIES="FET" \
+		"Free timetable software" \
+		"" \
+		"fet" \
+		"Education;Qt;" \
+		true
+PLIST_SUB+=	CLI="@comment " EXAMPLES="" GUI=""
+INSTALL_TARGET=	${WRKSRC}/fet
+.		if ${PORT_OPTIONS:MQT4}
+USE_QT4+=gui network corelib moc_build rcc_build uic_build xml
+.		else
+USE_QT5+=	buildtools_build core xml
+USE_GL=	gl
 USE_QT5+=gui network printsupport widgets
-.endif
-.endif
+.		endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
-		${WRKSRC}/src/interface/fet.cpp
-
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_TARGET} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin
@@ -62,6 +67,12 @@ 
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	cd ${WRKSRC}/translations && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}/translations
 
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \
+		${WRKSRC}/src/interface/fet.cpp
+
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
--- distinfo	(revision 456949)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1509887144
-SHA256 (fet-5.34.0.tar.bz2) = a049cd89d7a6ed73e67758d1a01ee740fdaa245943be2911c0a9002dda27a836
-SIZE (fet-5.34.0.tar.bz2) = 11200465
+TIMESTAMP = 1514279195
+SHA256 (fet-5.34.3.tar.bz2) = 6580321142f39f983282a2416258b865c4044d728e0654c047063e4fe01adbfe
+SIZE (fet-5.34.3.tar.bz2) = 11186223
--- pkg-plist	(revision 456949)
+++ pkg-plist	(working copy)
@@ -1,39 +1,39 @@ 
-%%NO_ONLYCL%%bin/fet
-bin/fet-cl
-man/man1/fet.1.gz
-man/man1/fet-cl.1.gz
-%%NLS%%%%DATADIR%%/translations/fet_ar.qm
-%%NLS%%%%DATADIR%%/translations/fet_ca.qm
-%%NLS%%%%DATADIR%%/translations/fet_cs.qm
-%%NLS%%%%DATADIR%%/translations/fet_da.qm
-%%NLS%%%%DATADIR%%/translations/fet_de.qm
-%%NLS%%%%DATADIR%%/translations/fet_el.qm
-%%NLS%%%%DATADIR%%/translations/fet_en_GB.qm
-%%NLS%%%%DATADIR%%/translations/fet_es.qm
-%%NLS%%%%DATADIR%%/translations/fet_eu.qm
-%%NLS%%%%DATADIR%%/translations/fet_fa.qm
-%%NLS%%%%DATADIR%%/translations/fet_fr.qm
-%%NLS%%%%DATADIR%%/translations/fet_gl.qm
-%%NLS%%%%DATADIR%%/translations/fet_he.qm
-%%NLS%%%%DATADIR%%/translations/fet_hu.qm
-%%NLS%%%%DATADIR%%/translations/fet_id.qm
-%%NLS%%%%DATADIR%%/translations/fet_it.qm
-%%NLS%%%%DATADIR%%/translations/fet_lt.qm
-%%NLS%%%%DATADIR%%/translations/fet_mk.qm
-%%NLS%%%%DATADIR%%/translations/fet_ms.qm
-%%NLS%%%%DATADIR%%/translations/fet_nl.qm
-%%NLS%%%%DATADIR%%/translations/fet_pl.qm
-%%NLS%%%%DATADIR%%/translations/fet_pt_BR.qm
-%%NLS%%%%DATADIR%%/translations/fet_ro.qm
-%%NLS%%%%DATADIR%%/translations/fet_ru.qm
-%%NLS%%%%DATADIR%%/translations/fet_si.qm
-%%NLS%%%%DATADIR%%/translations/fet_sk.qm
-%%NLS%%%%DATADIR%%/translations/fet_sr.qm
-%%NLS%%%%DATADIR%%/translations/fet_sq.qm
-%%NLS%%%%DATADIR%%/translations/fet_tr.qm
-%%NLS%%%%DATADIR%%/translations/fet_uk.qm
-%%NLS%%%%DATADIR%%/translations/fet_untranslated.qm
-%%NLS%%%%DATADIR%%/translations/fet_uz.qm
-%%NLS%%%%DATADIR%%/translations/fet_vi.qm
-%%NLS%%%%DATADIR%%/translations/fet_zh_CN.qm
-%%NLS%%%%DATADIR%%/translations/fet_zh_TW.qm
+%%GUI%%bin/fet
+%%CLI%%bin/fet-cl
+%%GUI%%man/man1/fet.1.gz
+%%CLI%%man/man1/fet-cl.1.gz
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ar.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ca.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_cs.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_da.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_de.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_el.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_en_GB.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_es.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_eu.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_fa.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_fr.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_gl.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_he.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_hu.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_id.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_it.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_lt.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_mk.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ms.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_nl.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_pl.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_pt_BR.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ro.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_ru.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_si.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sk.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sr.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_sq.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_tr.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_uk.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_untranslated.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_uz.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_vi.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_zh_CN.qm
+%%NLS%%%%GUI%%%%DATADIR%%/translations/fet_zh_TW.qm