Update to 0.97

8 files changed, 18 insertions, 376 deletions

diff --git a/x11-themes/adwaita-common/Makefile b/x11-themes/adwaita-common/Makefile
index c931065b49b8..c9b3f417634c 100644
--- a/x11-themes/adwaita-common/Makefile
+++ b/x11-themes/adwaita-common/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adwaita
-PORTVERSION=	0.4
+PORTVERSION=	0.97
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-common
 
@@ -12,19 +12,9 @@ COMMENT=	Adwaita theme for Qt applications
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	MartinBriza
-GH_PROJECT=	adwaita-qt
+RUN_DEPENDS=	adwaita-qt4>=0.97:x11-themes/adwaita-qt4 \
+	adwaita-qt5>=0.97:x11-themes/adwaita-qt5
 
-NO_BUILD=	yes
-NO_ARCH=	yes
-
-THEMES_DIR=	themes/Adwaita/qt
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/${THEMES_DIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} assets \
-		${STAGEDIR}${PREFIX}/share/${THEMES_DIR} \
-		"! -name CMakeLists.txt"
+USES=	metaport
 
 .include <bsd.port.mk>
diff --git a/x11-themes/adwaita-common/distinfo b/x11-themes/adwaita-common/distinfo
index 433099e728b3..4c4305193c47 100644
--- a/x11-themes/adwaita-common/distinfo
+++ b/x11-themes/adwaita-common/distinfo
@@ -1,2 +1,3 @@
-SHA256 (MartinBriza-adwaita-qt-0.4_GH0.tar.gz) = 48ccf17088afb77e98fe409f4dc6fdccd035bbdbcb51f0c2f0da00ef204daba0
-SIZE (MartinBriza-adwaita-qt-0.4_GH0.tar.gz) = 871126
+TIMESTAMP = 1484489415
+SHA256 (MartinBriza-adwaita-qt-0.97_GH0.tar.gz) = ed92484d731b4258e01d3924e1748d627c28ed3a10f270288e23e90b4f47918d
+SIZE (MartinBriza-adwaita-qt-0.97_GH0.tar.gz) = 562887
diff --git a/x11-themes/adwaita-common/pkg-plist b/x11-themes/adwaita-common/pkg-plist
deleted file mode 100644
index 34b49f6839aa..000000000000
--- a/x11-themes/adwaita-common/pkg-plist
+++ /dev/null
@@ -1,329 +0,0 @@
-share/themes/Adwaita/qt/assets/checkbox-active-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-active-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-backdrop-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-backdrop-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-active-dark.png
-share/themes/Adwaita/qt/assets/checkbox-checked-active-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-active-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-checked-active-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-active.png
-share/themes/Adwaita/qt/assets/checkbox-checked-active@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-dark.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop.png
-share/themes/Adwaita/qt/assets/checkbox-checked-backdrop@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-dark.png
-share/themes/Adwaita/qt/assets/checkbox-checked-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-hover-dark.png
-share/themes/Adwaita/qt/assets/checkbox-checked-hover-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-hover-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-checked-hover-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-hover.png
-share/themes/Adwaita/qt/assets/checkbox-checked-hover@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-insensitive-dark.png
-share/themes/Adwaita/qt/assets/checkbox-checked-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-insensitive.png
-share/themes/Adwaita/qt/assets/checkbox-checked-insensitive@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-checked-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-checked.png
-share/themes/Adwaita/qt/assets/checkbox-checked@2.png
-share/themes/Adwaita/qt/assets/checkbox-hover-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-hover-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-active-dark.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-active-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-active.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-active@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop-dark.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-backdrop@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-dark.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-hover-dark.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-hover-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-hover.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-hover@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-insensitive-dark.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-insensitive.png
-share/themes/Adwaita/qt/assets/checkbox-mixed-insensitive@2.png
-share/themes/Adwaita/qt/assets/checkbox-mixed.png
-share/themes/Adwaita/qt/assets/checkbox-mixed@2.png
-share/themes/Adwaita/qt/assets/checkbox-selectionmode.png
-share/themes/Adwaita/qt/assets/checkbox-selectionmode@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-active-dark.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-active-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-active.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-active@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop-dark.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-backdrop@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-dark.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-hover-dark.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-hover-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-hover.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-hover@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-insensitive-dark.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-insensitive.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked-insensitive@2.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked.png
-share/themes/Adwaita/qt/assets/checkbox-unchecked@2.png
-share/themes/Adwaita/qt/assets/process-working-symbolic.svg
-share/themes/Adwaita/qt/assets/radio-checked-active-dark.png
-share/themes/Adwaita/qt/assets/radio-checked-active-dark@2.png
-share/themes/Adwaita/qt/assets/radio-checked-active.png
-share/themes/Adwaita/qt/assets/radio-checked-active@2.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop-dark.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop.png
-share/themes/Adwaita/qt/assets/radio-checked-backdrop@2.png
-share/themes/Adwaita/qt/assets/radio-checked-dark.png
-share/themes/Adwaita/qt/assets/radio-checked-dark@2.png
-share/themes/Adwaita/qt/assets/radio-checked-hover-dark.png
-share/themes/Adwaita/qt/assets/radio-checked-hover-dark@2.png
-share/themes/Adwaita/qt/assets/radio-checked-hover.png
-share/themes/Adwaita/qt/assets/radio-checked-hover@2.png
-share/themes/Adwaita/qt/assets/radio-checked-insensitive-dark.png
-share/themes/Adwaita/qt/assets/radio-checked-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/radio-checked-insensitive.png
-share/themes/Adwaita/qt/assets/radio-checked-insensitive@2.png
-share/themes/Adwaita/qt/assets/radio-checked.png
-share/themes/Adwaita/qt/assets/radio-checked@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-active-dark.png
-share/themes/Adwaita/qt/assets/radio-mixed-active-dark@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-active.png
-share/themes/Adwaita/qt/assets/radio-mixed-active@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop-dark.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop.png
-share/themes/Adwaita/qt/assets/radio-mixed-backdrop@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-dark.png
-share/themes/Adwaita/qt/assets/radio-mixed-dark@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-hover-dark.png
-share/themes/Adwaita/qt/assets/radio-mixed-hover-dark@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-hover.png
-share/themes/Adwaita/qt/assets/radio-mixed-hover@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-insensitive-dark.png
-share/themes/Adwaita/qt/assets/radio-mixed-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/radio-mixed-insensitive.png
-share/themes/Adwaita/qt/assets/radio-mixed-insensitive@2.png
-share/themes/Adwaita/qt/assets/radio-mixed.png
-share/themes/Adwaita/qt/assets/radio-mixed@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-active-dark.png
-share/themes/Adwaita/qt/assets/radio-unchecked-active-dark@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-active.png
-share/themes/Adwaita/qt/assets/radio-unchecked-active@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop-dark.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop.png
-share/themes/Adwaita/qt/assets/radio-unchecked-backdrop@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-dark.png
-share/themes/Adwaita/qt/assets/radio-unchecked-dark@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-hover-dark.png
-share/themes/Adwaita/qt/assets/radio-unchecked-hover-dark@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-hover.png
-share/themes/Adwaita/qt/assets/radio-unchecked-hover@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-insensitive-dark.png
-share/themes/Adwaita/qt/assets/radio-unchecked-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked-insensitive.png
-share/themes/Adwaita/qt/assets/radio-unchecked-insensitive@2.png
-share/themes/Adwaita/qt/assets/radio-unchecked.png
-share/themes/Adwaita/qt/assets/radio-unchecked@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-active.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-active@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-backdrop.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-backdrop@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-hover.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-hover@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-insensitive.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked.png
-share/themes/Adwaita/qt/assets/selected-checkbox-checked@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-active.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-active@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-backdrop.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-backdrop@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-hover.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-hover@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-insensitive.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed.png
-share/themes/Adwaita/qt/assets/selected-checkbox-mixed@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-active.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-active@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-backdrop.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-backdrop@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-hover.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-hover@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-insensitive.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked.png
-share/themes/Adwaita/qt/assets/selected-checkbox-unchecked@2.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-active.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-active@2.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-backdrop.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-backdrop@2.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-hover.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-hover@2.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-insensitive.png
-share/themes/Adwaita/qt/assets/selected-radio-checked-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-radio-checked.png
-share/themes/Adwaita/qt/assets/selected-radio-checked@2.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-active.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-active@2.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-backdrop.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-backdrop@2.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-hover.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-hover@2.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-insensitive.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed.png
-share/themes/Adwaita/qt/assets/selected-radio-mixed@2.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-active.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-active@2.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-backdrop.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-backdrop@2.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-hover.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-hover@2.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-insensitive.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked-insensitive@2.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked.png
-share/themes/Adwaita/qt/assets/selected-radio-unchecked@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-active-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-active-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-active.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-active@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-backdrop@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-hover-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-hover-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-hover.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-hover@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-insensitive.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-above@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-active-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-active-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-active.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-active@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-backdrop@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-hover-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-hover-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-hover.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-hover@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-insensitive.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below.png
-share/themes/Adwaita/qt/assets/slider-horz-scale-has-marks-below@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-active-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-active-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-active.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-active@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-backdrop@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-hover-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-hover-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-hover.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-hover@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-insensitive.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-above@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-active-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-active-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-active.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-active@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-backdrop@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-hover-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-hover-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-hover.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-hover@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-insensitive.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below-insensitive@2.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below.png
-share/themes/Adwaita/qt/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/x11-themes/adwaita-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile
index 9f6fff762c42..9467b733514c 100644
--- a/x11-themes/adwaita-qt4/Makefile
+++ b/x11-themes/adwaita-qt4/Makefile
@@ -2,28 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	adwaita
-PORTVERSION=	0.4
+PORTVERSION=	0.97
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt4
 
 MAINTAINER=	olivierd@FreeBSD.org
-COMMENT=	Adwaita theme for Qt5 applications
+COMMENT=	Adwaita theme for Qt4 applications
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	adwaita-common>=0.4:x11-themes/adwaita-common
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	MartinBriza
 GH_PROJECT=	adwaita-qt
 
-DISTINFO_FILE=	${.CURDIR}/../adwaita-common/distinfo
-EXTRA_PATCHES=	${.CURDIR}/../adwaita-qt5/files/patch-CMakeLists.txt
+MASTERDIR=	${.CURDIR}/../adwaita-common
+DISTINFO_FILE=	${MASTERDIR}/distinfo
+DESCR=	${MASTERDIR}/pkg-descr
 PLIST_FILES=	%%QT_PLUGINDIR%%/styles/adwaita.so
 
 USES=	cmake:outsource compiler:c++11-lib localbase pkgconfig
-USE_QT4=	moc_build rcc_build uic_build qmake_build corelib gui
+USE_QT4=	moc_build rcc_build uic_build qmake_build corelib dbus gui
 
 CMAKE_ARGS+=	-DBUILD_EXAMPLE:BOOL=OFF \
 	-DUSE_QT4:BOOL=ON
diff --git a/x11-themes/adwaita-qt4/pkg-descr b/x11-themes/adwaita-qt4/pkg-descr
deleted file mode 100644
index 3e98b011b46f..000000000000
--- a/x11-themes/adwaita-qt4/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A native style to bend Qt4 applications to look like they belong into
-GNOME Shell.
-
-WWW: https://github.com/MartinBriza/adwaita-qt
diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile
index 3d0844405964..7300a919bf1c 100644
--- a/x11-themes/adwaita-qt5/Makefile
+++ b/x11-themes/adwaita-qt5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adwaita
-PORTVERSION=	0.4
+PORTVERSION=	0.97
 CATEGORIES=	x11-themes
 PKGNAMESUFFIX=	-qt5
 
@@ -12,17 +12,17 @@ COMMENT=	Adwaita theme for Qt5 applications
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	adwaita-common>=0.4:x11-themes/adwaita-common
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	MartinBriza
 GH_PROJECT=	adwaita-qt
 
-DISTINFO_FILE=	${.CURDIR}/../adwaita-common/distinfo
+MASTERDIR=	${.CURDIR}/../adwaita-common
+DISTINFO_FILE=	${MASTERDIR}/distinfo
+DESCR=	${MASTERDIR}/pkg-descr
 PLIST_FILES=	%%QT_PLUGINDIR%%/styles/adwaita.so
 
 USES=	cmake:outsource compiler:c++11-lib localbase pkgconfig
-USE_QT5=	buildtools_build qmake_build core gui widgets
+USE_QT5=	buildtools_build qmake_build core dbus gui widgets
 
 CMAKE_ARGS+=	-DBUILD_EXAMPLE:BOOL=OFF
 
diff --git a/x11-themes/adwaita-qt5/files/patch-CMakeLists.txt b/x11-themes/adwaita-qt5/files/patch-CMakeLists.txt
deleted file mode 100644
index 66ea2e6670f1..000000000000
--- a/x11-themes/adwaita-qt5/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2015-07-20 11:19:10 UTC
-+++ CMakeLists.txt
-@@ -51,5 +51,5 @@ if (BUILD_EXAMPLE)
-     endif()
- endif()
- 
--add_subdirectory(assets)
--add_subdirectory(src)
-\ No newline at end of file
-+#add_subdirectory(assets)
-+add_subdirectory(src)
diff --git a/x11-themes/adwaita-qt5/pkg-descr b/x11-themes/adwaita-qt5/pkg-descr
deleted file mode 100644
index 5106b2673893..000000000000
--- a/x11-themes/adwaita-qt5/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A native style to bend Qt5 applications to look like they belong into
-GNOME Shell.
-
-WWW: https://github.com/MartinBriza/adwaita-qt