From nobody Fri Jan 05 17:23:12 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T69Jx2TJnz55NfX; Fri, 5 Jan 2024 17:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T69Jx0p54z55BX; Fri, 5 Jan 2024 17:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704475393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjsIrwFInaDzVYKiDyUmIKP0Ifj1QOj+hPmg15P/zL0=; b=oBCSIjAEaqxnGx45bOB511F6BGpYCfLtG//6Pj/8rJa2pO3U+xVwr8bLGNm9M1njC7PhpM +WV5oVWtnpB2yLZfTWMjS9MHpB6ictBdyENyAVA6Tse4n288pOQmwlKKKjBxer4BlyFh9J JTpcIpWMrKc5Zpeh+b2ty5JS3bpHAZ+s9lOG4De8BotdnY7RhoUbZCPVGZZE7fD5gujFjd ri+TNBt0y0quZLAjTy+g8sUyCZa/9ZqXs97sVDeWyrORiGbq6kCQpZSlcY4kVI+4PMpLvU 8nCOsGIVKbmt1fTLESpg+M4jpNTlKmbMfTX1frGqzTQPXWEtBG4R6QyDCJU/tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704475393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjsIrwFInaDzVYKiDyUmIKP0Ifj1QOj+hPmg15P/zL0=; b=IO8CJtJUDIyzKztIEs57NsIh0JPVirIzO2nznq6n+oOJWyUYwXJ/Jc8XdiBKB9EK+SvNGd WBU+srlwsYyk3+ymCIdH/pZWG9fKH4c98gt+kCoQdqq/MWFAF5FsFJVCAsSijgl3b3B2QM ey0ucAOPE/f24SIR7ol/e4RQKV7ozQmUfRqyOY6Aeocd5gwSZsFx8VcTLjIqvu/rtfD3nC meZFP5lUFldXfX6GeesGf9O+1ysIM3q3J40EpP7PZPwcox0bcKMWlBqWfTNBGNVUE9pCVl L429z6RfCvYcM5C3qz+koFQZDsFXniyTo9S1kjMFFba3vwxQ7nUpK35CHRDwWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704475393; a=rsa-sha256; cv=none; b=Ha0QqF+GB6K3TAShOxXJMbcVBcsP9V9Dq+hoU8U+P7FlNa6pbo+4GScIQEAOwj34Te337u sA+iOqmLxN19PEkC5RcoErDCQupA6eezH4u+5+y4UsZSMtR7/pIg/hbuH9/U3WwBEYnszR 2ZWcd54l8U5w+X+6w7ENjF2Tcq5OehJtTxjg3JLGx1G5nla33lrhK+CJrv2XQE4iSiQENW Nv/vJ6Qkf3JsxhrmbKEPU8vHjjA4ov0ABp3aOdYSS/oUs1t/j0X9rGt5kkgu53xIQzzl22 kKYQU9dAaKmsSvQMVxjG+K0NVammS0aDiuxJzAqi4eSOcSf0/ON5/kD/WRV5jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T69Jw6hvbz167N; Fri, 5 Jan 2024 17:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 405HNCVu042831; Fri, 5 Jan 2024 17:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405HNCFJ042828; Fri, 5 Jan 2024 17:23:12 GMT (envelope-from git) Date: Fri, 5 Jan 2024 17:23:12 GMT Message-Id: <202401051723.405HNCFJ042828@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: cd37364b666c - main - sysutils/signon-ui: revert bad flavorization List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd37364b666c0aa59ad83ac367db9b992d71e39d Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd37364b666c0aa59ad83ac367db9b992d71e39d commit cd37364b666c0aa59ad83ac367db9b992d71e39d Author: Tobias C. Berner AuthorDate: 2024-01-05 17:04:54 +0000 Commit: Tobias C. Berner CommitDate: 2024-01-05 17:06:34 +0000 sysutils/signon-ui: revert bad flavorization - this was premature, unfinished, and unneeded This reverts commit 6d08faea51214414969d21706dead305e9eab673. --- net-im/kaccounts-integration/Makefile | 4 ++-- sysutils/signon-ui/Makefile | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index f3b99dec617a..4494d104be3e 100644 --- a/net-im/kaccounts-integration/Makefile +++ b/net-im/kaccounts-integration/Makefile @@ -1,6 +1,6 @@ PORTNAME= kaccounts-integration DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,7 +10,7 @@ WWW= https://projects.kde.org/projects/kdereview/kaccounts-integration LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \ libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libsignon-qt5.so:sysutils/signond@qt5 -RUN_DEPENDS= signon-ui:sysutils/signon-ui@qt5 +RUN_DEPENDS= signon-ui:sysutils/signon-ui USES= cmake compiler:c++11-lang gettext-tools pkgconfig kde:5 \ qt:5 tar:xz diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile index 8f697ddbc76f..132dbd74d298 100644 --- a/sysutils/signon-ui/Makefile +++ b/sysutils/signon-ui/Makefile @@ -3,10 +3,9 @@ PORTNAME= signon-ui # > git rev-list 0.17+15.10.20150810-0ubuntu1.. --count DISTVERSION= 0.17-355 DISTVERSIONSUFFIX= -g4368bb7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT} -PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Component for handling accounts-sso user interactions @@ -15,16 +14,13 @@ WWW= https://gitlab.com/accounts-sso/signon-ui LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - -LIB_DEPENDS= libaccounts-${FLAVOR}.so:net-im/libaccounts-qt@${FLAVOR} \ +LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libnotify.so:devel/libnotify \ - libsignon-${FLAVOR}.so:sysutils/signond@${FLAVOR} \ + libsignon-qt5.so:sysutils/signond@qt5 \ libproxy.so:net/libproxy USES= compiler:c++11-lang gettext-runtime gl gnome pkgconfig python \ - qmake qt:${FLAVOR:S/qt//} tar:bz2 + qmake qt:5 tar:bz2 USE_GL= gl USE_GNOME= gdkpixbuf2 glib20 USE_QT= core dbus declarative gui location network webchannel webengine widgets xml \