Date: Tue, 19 Jun 2018 14:07:02 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472790 - in head: . x11-themes x11-themes/adwaita-common x11-themes/adwaita-qt x11-themes/adwaita-qt4 x11-themes/adwaita-qt5 Message-ID: <201806191407.w5JE72ZV006434@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Tue Jun 19 14:07:01 2018 New Revision: 472790 URL: https://svnweb.freebsd.org/changeset/ports/472790 Log: x11-themes/adwaita-qt[45] move to a flavored version * x11-themes/adwaita-qt4 -> adwaita-qt@qt4 * x11-themes/adwaita-qt5 -> adwaita-qt@qt5 * x11-themes/adwaita-common -> gone. Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D15228 Added: head/x11-themes/adwaita-qt/ - copied from r472789, head/x11-themes/adwaita-common/ Deleted: head/x11-themes/adwaita-common/ head/x11-themes/adwaita-qt4/ head/x11-themes/adwaita-qt5/ Modified: head/MOVED head/x11-themes/Makefile head/x11-themes/adwaita-qt/Makefile head/x11-themes/adwaita-qt/distinfo Modified: head/MOVED ============================================================================== --- head/MOVED Tue Jun 19 14:00:07 2018 (r472789) +++ head/MOVED Tue Jun 19 14:07:01 2018 (r472790) @@ -10280,3 +10280,6 @@ net-im/imspector||2018-06-16|Has expired: No active up net/syncthing-discosrv|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now net/syncthing-inotify|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now net/syncthing-cli|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now +x11-themes/adwaita-common||2018-06-19|Move to flavored version +x11-themes/adwaita-qt4|x11-themes/adwaita-qt@qt4|2018-06-19|Move to flavored version +x11-themes/adwaita-qt5|x11-themes/adwaita-qt@qt5|2018-06-19|Move to flavored version Modified: head/x11-themes/Makefile ============================================================================== --- head/x11-themes/Makefile Tue Jun 19 14:00:07 2018 (r472789) +++ head/x11-themes/Makefile Tue Jun 19 14:07:01 2018 (r472790) @@ -5,10 +5,8 @@ SUBDIR += adapta-backgrounds SUBDIR += adapta-gtk-theme - SUBDIR += adwaita-common SUBDIR += adwaita-icon-theme - SUBDIR += adwaita-qt4 - SUBDIR += adwaita-qt5 + SUBDIR += adwaita-qt SUBDIR += arc-gruvbox-theme SUBDIR += audacious-skins SUBDIR += beastie Modified: head/x11-themes/adwaita-qt/Makefile ============================================================================== --- head/x11-themes/adwaita-common/Makefile Tue Jun 19 14:00:07 2018 (r472789) +++ head/x11-themes/adwaita-qt/Makefile Tue Jun 19 14:07:01 2018 (r472790) @@ -1,11 +1,9 @@ # Created by: Olivier Duchateau # $FreeBSD$ -PORTNAME= adwaita -PORTVERSION= 1.0 -PORTREVISION?= 1 +PORTNAME= adwaita-qt +DISTVERSION= 1.0 CATEGORIES= x11-themes -PKGNAMESUFFIX= -${OPTIONS_SLAVE:tl} MAINTAINER= tcberner@FreeBSD.org COMMENT= Adwaita theme for Qt applications @@ -13,28 +11,25 @@ COMMENT= Adwaita theme for Qt applications LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi -OPTIONS_DEFINE= QT4 QT5 COMMON -OPTIONS_EXCLUDE=${OPTIONS_DEFINE} +FLAVORS= qt5 qt4 +FLAVOR?= ${FLAVORS:[1]} +qt4_PKGNAMESUFFIX= 4 +qt5_PKGNAMESUFFIX= 5 -OPTIONS_SLAVE?= COMMON +USES= cmake:outsource compiler:c++11-lib localbase pkgconfig +. if ${FLAVOR} == qt4 +USE_QT4= corelib dbus gui \ + moc_build rcc_build uic_build qmake_build +CMAKE_ON= USE_QT4 +. else +USE_QT5= core dbus gui widgets \ + buildtools_build qmake_build +CMAKE_OFF= USE_QT4 +. endif -COMMON_RUN_DEPENDS= adwaita-qt4>=${PORTVERSION}:x11-themes/adwaita-qt4 \ - adwaita-qt5>=${PORTVERSION}:x11-themes/adwaita-qt5 -COMMON_USES= metaport -COMMON_PLIST_FILES= # none - -# Set the values for the QT[45] slave ports -- COMMON is ignored, as it is already set. -${OPTIONS_SLAVE}_USES?= cmake:outsource compiler:c++11-lib localbase pkgconfig -${OPTIONS_SLAVE}_PLIST_FILES?= %%QT_PLUGINDIR%%/styles/adwaita.so - -QT4_USE= QT4=moc_build,rcc_build,uic_build,qmake_build,corelib,dbus,gui -QT4_CMAKE_BOOL= USE_QT4 - -QT5_USE= QT5=buildtools_build,qmake_build,core,dbus,gui,widgets -QT5_CMAKE_BOOL_OFF= USE_QT4 - USE_GITHUB= yes -GH_ACCOUNT= MartinBriza -GH_PROJECT= adwaita-qt +GH_ACCOUNT= FedoraQt + +PLIST_FILES= ${QT_PLUGINDIR}/styles/adwaita.so .include <bsd.port.mk> Modified: head/x11-themes/adwaita-qt/distinfo ============================================================================== --- head/x11-themes/adwaita-common/distinfo Tue Jun 19 14:00:07 2018 (r472789) +++ head/x11-themes/adwaita-qt/distinfo Tue Jun 19 14:07:01 2018 (r472790) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496037433 -SHA256 (MartinBriza-adwaita-qt-1.0_GH0.tar.gz) = c2c0c71b131d0e3e58ee108570796cf70b35dccaa64ce17915d4486de5e91513 -SIZE (MartinBriza-adwaita-qt-1.0_GH0.tar.gz) = 565625 +TIMESTAMP = 1525031614 +SHA256 (FedoraQt-adwaita-qt-1.0_GH0.tar.gz) = c2c0c71b131d0e3e58ee108570796cf70b35dccaa64ce17915d4486de5e91513 +SIZE (FedoraQt-adwaita-qt-1.0_GH0.tar.gz) = 565625
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806191407.w5JE72ZV006434>