svn commit: r422824 - in head: . sysutils sysutils/android-file-transfer sysutils/android-file-transfer-qt4 sysutils/android-file-transfer-qt5
Jan Beich
jbeich at FreeBSD.org
Tue Sep 27 18:25:19 UTC 2016
Author: jbeich
Date: Tue Sep 27 18:25:17 2016
New Revision: 422824
URL: https://svnweb.freebsd.org/changeset/ports/422824
Log:
sysutils/android-file-transfer: enslave GUI and expose CLI option
Catering package-only users that want Qt4 flavor or just non-GUI parts.
COMMENT and pkg-descr (both plural) can be improved in future.
Added:
head/sysutils/android-file-transfer-qt4/
head/sysutils/android-file-transfer-qt4/Makefile (contents, props changed)
head/sysutils/android-file-transfer-qt5/
head/sysutils/android-file-transfer-qt5/Makefile (contents, props changed)
Modified:
head/UPDATING
head/sysutils/Makefile (contents, props changed)
head/sysutils/android-file-transfer/Makefile (contents, props changed)
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Tue Sep 27 18:25:00 2016 (r422823)
+++ head/UPDATING Tue Sep 27 18:25:17 2016 (r422824)
@@ -5,6 +5,15 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20160927:
+ AFFECTS: sysutils/android-file-transfer
+ AUTHOR: jbeich at FreeBSD.org
+
+ Qt* GUI was split into separate ports:
+
+ sysutils/android-file-transfer-qt4
+ sysutils/android-file-transfer-qt5
+
20160922:
AFFECTS: users of databases/pglogical, databases/pglogical-output
AUTHOR: matthew at FreeBSD.org
Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile Tue Sep 27 18:25:00 2016 (r422823)
+++ head/sysutils/Makefile Tue Sep 27 18:25:17 2016 (r422824)
@@ -32,6 +32,8 @@
SUBDIR += anacron
SUBDIR += and
SUBDIR += android-file-transfer
+ SUBDIR += android-file-transfer-qt4
+ SUBDIR += android-file-transfer-qt5
SUBDIR += ansible
SUBDIR += ansible1
SUBDIR += apachetop
Added: head/sysutils/android-file-transfer-qt4/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/android-file-transfer-qt4/Makefile Tue Sep 27 18:25:17 2016 (r422824)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -qt4
+
+MASTERDIR= ${.CURDIR}/../android-file-transfer
+
+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
+
+.include "${MASTERDIR}/Makefile"
Added: head/sysutils/android-file-transfer-qt5/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/android-file-transfer-qt5/Makefile Tue Sep 27 18:25:17 2016 (r422824)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTREVISION= 0
+PKGNAMESUFFIX= -qt5
+
+MASTERDIR= ${.CURDIR}/../android-file-transfer
+
+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
+
+.include "${MASTERDIR}/Makefile"
Modified: head/sysutils/android-file-transfer/Makefile
==============================================================================
--- head/sysutils/android-file-transfer/Makefile Tue Sep 27 18:25:00 2016 (r422823)
+++ head/sysutils/android-file-transfer/Makefile Tue Sep 27 18:25:17 2016 (r422824)
@@ -4,6 +4,7 @@ PORTNAME= android-file-transfer
DISTVERSIONPREFIX= v
DISTVERSION= 3.0-10
DISTVERSIONSUFFIX= -g40640fb
+PORTREVISION?= 1
CATEGORIES= sysutils
MAINTAINER= jbeich at FreeBSD.org
@@ -15,17 +16,24 @@ USE_GITHUB= yes
GH_ACCOUNT= whoozle
GH_PROJECT= ${PORTNAME}-linux
-USES= cmake compiler:c++11-lib localbase pkgconfig readline
+USES= cmake compiler:c++11-lib localbase pkgconfig
CMAKE_ARGS= -DUSB_BACKEND_LIBUSB=on -DBUILD_QT_UI=off
-PLIST_FILES= bin/aft-mtp-cli
-OPTIONS_DEFINE= FUSE
-OPTIONS_DEFAULT=FUSE QT5
+OPTIONS_DEFAULT=CLI FUSE
+OPTIONS_MULTI= COMP
+OPTIONS_MULTI_COMP= CLI FUSE
OPTIONS_RADIO= GUI
OPTIONS_RADIO_GUI= QT4 QT5
+OPTIONS_EXCLUDE?=${OPTIONS_RADIO_GUI}
# 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
+
FUSE_USES= fuse
FUSE_CMAKE_BOOL=BUILD_FUSE
FUSE_PLIST_FILES=bin/aft-mtp-mount
@@ -44,4 +52,7 @@ QT5_PLIST_FILES=bin/android-file-transfe
CONFIGURE_ENV+= PKG_CONFIG_PATH="${FILESDIR}"
.endif
+post-patch-CLI-off:
+ @${REINPLACE_CMD} '/subdirectory(cli)/d' ${WRKSRC}/CMakeLists.txt
+
.include <bsd.port.mk>
More information about the svn-ports-all
mailing list