From 2036fbe81411b2b47c3784f989b34e89f4031b88 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Mon, 29 May 2017 16:30:38 +0000 Subject: Update x11-themes/adwaita-qt[45] to 1.0 and take maintainership. * make them slave ports of x11-themes/adwaita-common. Reviewed by: rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D10671 --- x11-themes/adwaita-common/Makefile | 32 ++++++++++++++++++++++++++------ x11-themes/adwaita-common/distinfo | 6 +++--- x11-themes/adwaita-qt4/Makefile | 29 ++++------------------------- x11-themes/adwaita-qt5/Makefile | 28 ++++------------------------ 4 files changed, 37 insertions(+), 58 deletions(-) (limited to 'x11-themes') diff --git a/x11-themes/adwaita-common/Makefile b/x11-themes/adwaita-common/Makefile index 43fbe16ab13b..c9f095ab7199 100644 --- a/x11-themes/adwaita-common/Makefile +++ b/x11-themes/adwaita-common/Makefile @@ -2,19 +2,39 @@ # $FreeBSD$ PORTNAME= adwaita -PORTVERSION= 0.98 +PORTVERSION= 1.0 +PORTREVISION?= 0 CATEGORIES= x11-themes -PKGNAMESUFFIX= -common +PKGNAMESUFFIX= -${OPTIONS_SLAVE:tl} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= tcberner@FreeBSD.org COMMENT= Adwaita theme for Qt applications LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi -RUN_DEPENDS= adwaita-qt4>=0.98:x11-themes/adwaita-qt4 \ - adwaita-qt5>=0.98:x11-themes/adwaita-qt5 +OPTIONS_DEFINE= QT4 QT5 COMMON +OPTIONS_EXCLUDE=${OPTIONS_DEFINE} -USES= metaport +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 diff --git a/x11-themes/adwaita-common/distinfo b/x11-themes/adwaita-common/distinfo index dc869c8701cf..88e652f7bc9a 100644 --- a/x11-themes/adwaita-common/distinfo +++ b/x11-themes/adwaita-common/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488228870 -SHA256 (MartinBriza-adwaita-qt-0.98_GH0.tar.gz) = 49292334345878ffd1766c118333fb1e2e1a28fb71e5fe052aad3a9d15d65b0d -SIZE (MartinBriza-adwaita-qt-0.98_GH0.tar.gz) = 564963 +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-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile index f54921146f29..b7415ac0a655 100644 --- a/x11-themes/adwaita-qt4/Makefile +++ b/x11-themes/adwaita-qt4/Makefile @@ -1,31 +1,10 @@ # Created by: Olivier Duchateau # $FreeBSD$ -PORTNAME= adwaita -PORTVERSION= 0.98 -PORTREVISION= 1 -CATEGORIES= x11-themes -PKGNAMESUFFIX= -qt4 +PORTREVISION= 0 -MAINTAINER= ports@FreeBSD.org -COMMENT= Adwaita theme for Qt4 applications +MASTERDIR= ${.CURDIR:H:H}/x11-themes/adwaita-common -LICENSE= GPLv2 LGPL20 -LICENSE_COMB= multi +OPTIONS_SLAVE= QT4 -USE_GITHUB= yes -GH_ACCOUNT= MartinBriza -GH_PROJECT= adwaita-qt - -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 dbus gui - -CMAKE_ARGS+= -DBUILD_EXAMPLE:BOOL=OFF \ - -DUSE_QT4:BOOL=ON - -.include +.include "${MASTERDIR}/Makefile" diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile index 76b4cf145bec..40fd10a8009d 100644 --- a/x11-themes/adwaita-qt5/Makefile +++ b/x11-themes/adwaita-qt5/Makefile @@ -1,30 +1,10 @@ # Created by: Olivier Duchateau # $FreeBSD$ -PORTNAME= adwaita -PORTVERSION= 0.98 -PORTREVISION= 1 -CATEGORIES= x11-themes -PKGNAMESUFFIX= -qt5 +PORTREVISION= 0 -MAINTAINER= ports@FreeBSD.org -COMMENT= Adwaita theme for Qt5 applications +MASTERDIR= ${.CURDIR:H:H}/x11-themes/adwaita-common -LICENSE= GPLv2 LGPL20 -LICENSE_COMB= multi +OPTIONS_SLAVE= QT5 -USE_GITHUB= yes -GH_ACCOUNT= MartinBriza -GH_PROJECT= adwaita-qt - -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 dbus gui widgets - -CMAKE_ARGS+= -DBUILD_EXAMPLE:BOOL=OFF - -.include +.include "${MASTERDIR}/Makefile" -- cgit v1.2.3