svn commit: r423675 - in head/sysutils: android-file-transfer android-file-transfer-qt4 android-file-transfer-qt5

[Jan Beich]

Author: jbeich
Date: Mon Oct 10 16:22:04 2016
New Revision: 423675
URL: https://svnweb.freebsd.org/changeset/ports/423675

Log:
  sysutils/android-file-transfer: unbreak _OFF helpers after r422824

Modified:
  head/sysutils/android-file-transfer-qt4/Makefile   (contents, props changed)
  head/sysutils/android-file-transfer-qt5/Makefile   (contents, props changed)
  head/sysutils/android-file-transfer/Makefile   (contents, props changed)

Modified: head/sysutils/android-file-transfer-qt4/Makefile
==============================================================================
--- head/sysutils/android-file-transfer-qt4/Makefile	Mon Oct 10 16:21:44 2016	(r423674)
+++ head/sysutils/android-file-transfer-qt4/Makefile	Mon Oct 10 16:22:04 2016	(r423675)
@@ -8,9 +8,6 @@ MASTERDIR=	${.CURDIR}/../android-file-tr
 CONFLICTS_INSTALL=	${PORTNAME}-qt5
 
 OPTIONS_SLAVE=	QT4
-OPTIONS_EXCLUDE=${OPTIONS_MULTI_COMP} ${OPTIONS_RADIO_GUI}
-
-# XXX Why OPTIONS_EXCLUDE doesn't trigger _OFF helpers?
-post-patch-QT4-on:	post-patch-CLI-off
+OPTIONS_EXCLUDE=${OPTIONS_MULTI_COMP}
 
 .include "${MASTERDIR}/Makefile"

Modified: head/sysutils/android-file-transfer-qt5/Makefile
==============================================================================
--- head/sysutils/android-file-transfer-qt5/Makefile	Mon Oct 10 16:21:44 2016	(r423674)
+++ head/sysutils/android-file-transfer-qt5/Makefile	Mon Oct 10 16:22:04 2016	(r423675)
@@ -8,9 +8,6 @@ MASTERDIR=	${.CURDIR}/../android-file-tr
 CONFLICTS_INSTALL=	${PORTNAME}-qt4
 
 OPTIONS_SLAVE=	QT5
-OPTIONS_EXCLUDE=${OPTIONS_MULTI_COMP} ${OPTIONS_RADIO_GUI}
-
-# XXX Why OPTIONS_EXCLUDE doesn't trigger _OFF helpers?
-post-patch-QT5-on:	post-patch-CLI-off
+OPTIONS_EXCLUDE=${OPTIONS_MULTI_COMP}
 
 .include "${MASTERDIR}/Makefile"

Modified: head/sysutils/android-file-transfer/Makefile
==============================================================================
--- head/sysutils/android-file-transfer/Makefile	Mon Oct 10 16:21:44 2016	(r423674)
+++ head/sysutils/android-file-transfer/Makefile	Mon Oct 10 16:22:04 2016	(r423675)
@@ -24,7 +24,7 @@ OPTIONS_MULTI=	COMP
 OPTIONS_MULTI_COMP=	CLI FUSE
 OPTIONS_RADIO=	GUI
 OPTIONS_RADIO_GUI=	QT4 QT5
-OPTIONS_EXCLUDE?=${OPTIONS_RADIO_GUI}
+OPTIONS_EXCLUDE:=	${OPTIONS_EXCLUDE} ${OPTIONS_RADIO_GUI}
 # XXX http://lists.dragonflybsd.org/pipermail/users/2016-September/313064.html
 OPTIONS_EXCLUDE_DragonFly=	FUSE