Page MenuHomeFreeBSD
Files F131539856

D15228.id43888.diff
No OneTemporary
Actions

D15228.id43888.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10276,3 +10276,6 @@
textproc/elasticsearch2-plugin-hq||2018-06-15|Removed, depends on expired textproc/elasticsearch2
textproc/elasticsearch2-plugin-migration||2018-06-15|Removed, depends on expired textproc/elasticsearch2
textproc/elasticsearch2||2018-06-15|Has expired: Elastic 2.4 EoL is 2018-02-28
+x11-themes/adwaita-common|x11-themes/adwaita-qt|2018-06-16|Move to flavored version
+x11-themes/adwaita-qt4|x11-themes/adwaita-qt|2018-06-16|Move to flavored version
+x11-themes/adwaita-qt5|x11-themes/adwaita-qt|2018-06-16|Move to flavored version
Index: x11-themes/Makefile
===================================================================
--- x11-themes/Makefile
+++ 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
Index: x11-themes/adwaita-common/Makefile
===================================================================
--- x11-themes/adwaita-common/Makefile
+++ x11-themes/adwaita-common/Makefile
@@ -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>
Index: x11-themes/adwaita-common/distinfo
===================================================================
--- x11-themes/adwaita-common/distinfo
+++ x11-themes/adwaita-common/distinfo
@@ -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
Index: x11-themes/adwaita-common/pkg-descr
===================================================================
--- x11-themes/adwaita-common/pkg-descr
+++ x11-themes/adwaita-common/pkg-descr
@@ -1,4 +0,0 @@
-A native style to bend Qt applications to look like they belong into
-GNOME Shell.
-
-WWW: https://github.com/MartinBriza/adwaita-qt
Index: x11-themes/adwaita-qt/Makefile
===================================================================
--- x11-themes/adwaita-qt/Makefile
+++ x11-themes/adwaita-qt/Makefile
@@ -1,11 +1,10 @@
# 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}
+PKGNAMESUFFIX= ${FLAVOR:C/qt//}
MAINTAINER= tcberner@FreeBSD.org
COMMENT= Adwaita theme for Qt applications
@@ -13,28 +12,23 @@
LICENSE= GPLv2 LGPL20
LICENSE_COMB= multi
-OPTIONS_DEFINE= QT4 QT5 COMMON
-OPTIONS_EXCLUDE=${OPTIONS_DEFINE}
+FLAVORS= qt5 qt4
+FLAVOR?= ${FLAVORS:[1]}
-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>
Index: x11-themes/adwaita-qt/distinfo
===================================================================
--- x11-themes/adwaita-qt/distinfo
+++ x11-themes/adwaita-qt/distinfo
@@ -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
Index: x11-themes/adwaita-qt4/Makefile
===================================================================
--- x11-themes/adwaita-qt4/Makefile
+++ x11-themes/adwaita-qt4/Makefile
@@ -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"
Index: x11-themes/adwaita-qt5/Makefile
===================================================================
--- x11-themes/adwaita-qt5/Makefile
+++ x11-themes/adwaita-qt5/Makefile
@@ -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"

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 10, 2:06 AM (21 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23513968
Default Alt Text
D15228.id43888.diff (6 KB)

Event Timeline