Date: Sat, 16 Mar 2019 23:20:52 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495988 - in head/sysutils: android-file-transfer android-file-transfer-qt5 Message-ID: <201903162320.x2GNKqCO021510@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Mar 16 23:20:52 2019 New Revision: 495988 URL: https://svnweb.freebsd.org/changeset/ports/495988 Log: sysutils/android-file-transfer: clean up after r495936 + r495967 Drop QT (common), RADIO and MULTI and move QT5 to DEFAULT. Modified: 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-qt5/Makefile ============================================================================== --- head/sysutils/android-file-transfer-qt5/Makefile Sat Mar 16 23:18:34 2019 (r495987) +++ head/sysutils/android-file-transfer-qt5/Makefile Sat Mar 16 23:20:52 2019 (r495988) @@ -8,6 +8,6 @@ MASTERDIR= ${.CURDIR}/../android-file-transfer CONFLICTS_INSTALL= ${PORTNAME}-qt4 OPTIONS_SLAVE= QT5 -OPTIONS_EXCLUDE=${OPTIONS_MULTI_COMP} +OPTIONS_EXCLUDE=CLI FUSE .include "${MASTERDIR}/Makefile" Modified: head/sysutils/android-file-transfer/Makefile ============================================================================== --- head/sysutils/android-file-transfer/Makefile Sat Mar 16 23:18:34 2019 (r495987) +++ head/sysutils/android-file-transfer/Makefile Sat Mar 16 23:20:52 2019 (r495988) @@ -19,18 +19,12 @@ USES= cmake compiler:c++11-lib localbase:ldflags pkgc CMAKE_ON= USB_BACKEND_LIBUSB PLIST_FILES= "@comment lib/libmtp-ng-static.a" -OPTIONS_DEFAULT=CLI FUSE -OPTIONS_MULTI= COMP -OPTIONS_MULTI_COMP= CLI FUSE -OPTIONS_RADIO= GUI -OPTIONS_RADIO_GUI= QT QT5 -OPTIONS_SLAVE:= ${OPTIONS_SLAVE} ${OPTIONS_SLAVE:MQT*:C/.+/QT/} # XXX ports/202701 -OPTIONS_EXCLUDE:= ${OPTIONS_EXCLUDE} ${OPTIONS_RADIO_GUI} +OPTIONS_DEFINE= CLI FUSE QT5 +OPTIONS_DEFAULT=CLI FUSE QT5 +OPTIONS_EXCLUDE?= QT5 # enslaved until subpackaging # XXX http://lists.dragonflybsd.org/pipermail/users/2016-September/313064.html OPTIONS_EXCLUDE_DragonFly= FUSE -COMP_DESC= Components - CLI_DESC= CLI (Command-Line Interface) support CLI_USES= readline CLI_PLIST_FILES=bin/aft-mtp-cli @@ -39,16 +33,14 @@ FUSE_USES= fuse FUSE_CMAKE_BOOL=BUILD_FUSE FUSE_PLIST_FILES=bin/aft-mtp-mount -QT_CMAKE_BOOL= BUILD_QT_UI -QT_PLIST_FILES= bin/android-file-transfer \ - share/applications/android-file-transfer.desktop \ - share/icons/hicolor/512x512/apps/android-file-transfer.png \ - share/metainfo/android-file-transfer.appdata.xml - QT5_USES= qt:5 QT5_USE= QT=qmake_build,buildtools_build,core,gui,widgets +QT5_CMAKE_BOOL= BUILD_QT_UI QT5_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=5 -QT5_IMPLIES= QT +QT5_PLIST_FILES= bin/android-file-transfer \ + share/applications/android-file-transfer.desktop \ + share/icons/hicolor/512x512/apps/android-file-transfer.png \ + share/metainfo/android-file-transfer.appdata.xml post-patch: @${REINPLACE_CMD} '/set.*AFT_VERSION/s/".*"/"${GH_TAGNAME}"/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903162320.x2GNKqCO021510>