diff options
| -rw-r--r-- | MOVED | 3 | ||||
| -rw-r--r-- | x11-themes/Makefile | 4 | ||||
| -rw-r--r-- | x11-themes/adwaita-common/Makefile | 40 | ||||
| -rw-r--r-- | x11-themes/adwaita-common/distinfo | 3 | ||||
| -rw-r--r-- | x11-themes/adwaita-qt/Makefile | 35 | ||||
| -rw-r--r-- | x11-themes/adwaita-qt/distinfo | 3 | ||||
| -rw-r--r-- | x11-themes/adwaita-qt/pkg-descr (renamed from x11-themes/adwaita-common/pkg-descr) | 0 | ||||
| -rw-r--r-- | x11-themes/adwaita-qt4/Makefile | 10 | ||||
| -rw-r--r-- | x11-themes/adwaita-qt5/Makefile | 10 |
9 files changed, 42 insertions, 66 deletions
@@ -10280,3 +10280,6 @@ net-im/imspector||2018-06-16|Has expired: No active upstream, master site disapp 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 diff --git a/x11-themes/Makefile b/x11-themes/Makefile index 79e59be2e4ba..a74ceedeef67 100644 --- a/x11-themes/Makefile +++ b/x11-themes/Makefile @@ -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 diff --git a/x11-themes/adwaita-common/Makefile b/x11-themes/adwaita-common/Makefile deleted file mode 100644 index 4abbfb19a764..000000000000 --- a/x11-themes/adwaita-common/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: Olivier Duchateau -# $FreeBSD$ - -PORTNAME= adwaita -PORTVERSION= 1.0 -PORTREVISION?= 1 -CATEGORIES= x11-themes -PKGNAMESUFFIX= -${OPTIONS_SLAVE:tl} - -MAINTAINER= tcberner@FreeBSD.org -COMMENT= Adwaita theme for Qt applications - -LICENSE= GPLv2 LGPL20 -LICENSE_COMB= multi - -OPTIONS_DEFINE= QT4 QT5 COMMON -OPTIONS_EXCLUDE=${OPTIONS_DEFINE} - -OPTIONS_SLAVE?= COMMON - -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 - -.include <bsd.port.mk> diff --git a/x11-themes/adwaita-common/distinfo b/x11-themes/adwaita-common/distinfo deleted file mode 100644 index 88e652f7bc9a..000000000000 --- a/x11-themes/adwaita-common/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1496037433 -SHA256 (MartinBriza-adwaita-qt-1.0_GH0.tar.gz) = c2c0c71b131d0e3e58ee108570796cf70b35dccaa64ce17915d4486de5e91513 -SIZE (MartinBriza-adwaita-qt-1.0_GH0.tar.gz) = 565625 diff --git a/x11-themes/adwaita-qt/Makefile b/x11-themes/adwaita-qt/Makefile new file mode 100644 index 000000000000..01493c7f3750 --- /dev/null +++ b/x11-themes/adwaita-qt/Makefile @@ -0,0 +1,35 @@ +# Created by: Olivier Duchateau +# $FreeBSD$ + +PORTNAME= adwaita-qt +DISTVERSION= 1.0 +CATEGORIES= x11-themes + +MAINTAINER= tcberner@FreeBSD.org +COMMENT= Adwaita theme for Qt applications + +LICENSE= GPLv2 LGPL20 +LICENSE_COMB= multi + +FLAVORS= qt5 qt4 +FLAVOR?= ${FLAVORS:[1]} +qt4_PKGNAMESUFFIX= 4 +qt5_PKGNAMESUFFIX= 5 + +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 + +USE_GITHUB= yes +GH_ACCOUNT= FedoraQt + +PLIST_FILES= ${QT_PLUGINDIR}/styles/adwaita.so + +.include <bsd.port.mk> diff --git a/x11-themes/adwaita-qt/distinfo b/x11-themes/adwaita-qt/distinfo new file mode 100644 index 000000000000..fb64e3dbe38e --- /dev/null +++ b/x11-themes/adwaita-qt/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1525031614 +SHA256 (FedoraQt-adwaita-qt-1.0_GH0.tar.gz) = c2c0c71b131d0e3e58ee108570796cf70b35dccaa64ce17915d4486de5e91513 +SIZE (FedoraQt-adwaita-qt-1.0_GH0.tar.gz) = 565625 diff --git a/x11-themes/adwaita-common/pkg-descr b/x11-themes/adwaita-qt/pkg-descr index e6dd487e90f0..e6dd487e90f0 100644 --- a/x11-themes/adwaita-common/pkg-descr +++ b/x11-themes/adwaita-qt/pkg-descr diff --git a/x11-themes/adwaita-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile deleted file mode 100644 index b7415ac0a655..000000000000 --- a/x11-themes/adwaita-qt4/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Olivier Duchateau -# $FreeBSD$ - -PORTREVISION= 0 - -MASTERDIR= ${.CURDIR:H:H}/x11-themes/adwaita-common - -OPTIONS_SLAVE= QT4 - -.include "${MASTERDIR}/Makefile" diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile deleted file mode 100644 index 40fd10a8009d..000000000000 --- a/x11-themes/adwaita-qt5/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Olivier Duchateau -# $FreeBSD$ - -PORTREVISION= 0 - -MASTERDIR= ${.CURDIR:H:H}/x11-themes/adwaita-common - -OPTIONS_SLAVE= QT5 - -.include "${MASTERDIR}/Makefile" |