From owner-svn-ports-all@freebsd.org Mon Oct 10 16:22:06 2016 Return-Path: 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 21A33C0CE94; Mon, 10 Oct 2016 16:22:06 +0000 (UTC) (envelope-from jbeich@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 CB084B01; Mon, 10 Oct 2016 16:22:05 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9AGM47C057968; Mon, 10 Oct 2016 16:22:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9AGM4G8057964; Mon, 10 Oct 2016 16:22:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201610101622.u9AGM4G8057964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 10 Oct 2016 16:22:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423675 - in head/sysutils: android-file-transfer android-file-transfer-qt4 android-file-transfer-qt5 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Oct 2016 16:22:06 -0000 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