From nobody Fri Feb 24 05:18:39 2023 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 4PNJ8H4pxGz3tGS5; Fri, 24 Feb 2023 05:18:39 +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 4PNJ8H2v5rz4WM2; Fri, 24 Feb 2023 05:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677215919; 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=v9r7iFeyUClnMdSEdv2KEmOsM8jegVWNCl9H+vrhVnc=; b=EW1TzTXWcEGgqpQqcZr1pLQ6EgVPiysWJdVxQhKyynSWeTlnoxcCB4I5U8NDEMZ4/PAm9f ztyzKsSzy0MgxQSVRls6EFQwawpY7SbnN/PgJtTwA2Z/ESXOAil3UfpiOIrkrtMzHwG1tx ZBKBr5+dLIu33nq2Y4mp1D4dWvtLWJPMAJ99WLZ3HWwBEueNPsKtRDx/57VhMUJzvztt6Q 2shmBkYA7wzhjHIsiQvJj9irWC5HHqZa6cWwn1qyK1M6uonVJ4/fSMCy7ITBXiPkj7cENy N/o96klN4vPE1+qPNvz5qAkbh2HVJlA55jT/A+g/OF7w1Lq/uTX0ZPftq3Az0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677215919; 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=v9r7iFeyUClnMdSEdv2KEmOsM8jegVWNCl9H+vrhVnc=; b=L2pPMheT+w61YGN3zJnpUyC7Hjvu52pj0Ivwbw2wbgXfl+ObR4K+l3IkvaGOtDh34yJCl2 8uvfXYbPlKheQSwW9Tt9eWLuQEfUwvg0WBmKYe8ibqZpdLeXVr8kP43vkI5G5WUC2i/nfF OaWwilTC6rABW1BgpCqPWNtQ7/SYM0KfUPYI3QxteC0NJS8eqf+/bHGA8SKrGi4nekRT/8 9a/tfjGj+/emB4vi0UIX/YCEWQeJPnpQ4Du8SS2xrs6bFSkEVQiyAEhZQCxVNndis20kiF Z1IDpayniYqK7vwVcZ6Fi+EkdpFm4cnA20cB+lY/QseOCR3a6qSbIveSIeGtmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677215919; a=rsa-sha256; cv=none; b=QiFzQ0OccVBouwZQ7uHsWXCzNarMgv42WetAaUlgbunrG8QnCdLV4npvVZTCMghs8zaZ1T j5PBGiMyb7RlVcAPkqacaJefkZGWKgIeuR7Amwf+JX1QZ3Bh0i73dxIHdf0nGQm7dhZS9I HUTGB8RcuA42GZq2hJXNmNcKHKQXAjgr6UpFx7fkC+GVap9MyJl1NCi8+xjpwztoHGk7tm nvU+hEGd8w8pNBN8SWzr4qlPD40BR3p5Yd6Ld1d6rOKxLRX09r81z5vebQsJIMWVpVhEOs hAs5PAhDBUGxRXo5tbY4fvplfdJzeRUvyYqYrhSxArteBxgf0Ky3dmsam+7jLw== 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 4PNJ8H1j9Pz19w1; Fri, 24 Feb 2023 05:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31O5Idxm048624; Fri, 24 Feb 2023 05:18:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O5IdLG048623; Fri, 24 Feb 2023 05:18:39 GMT (envelope-from git) Date: Fri, 24 Feb 2023 05:18:39 GMT Message-Id: <202302240518.31O5IdLG048623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jason Helfman Subject: git: dfe31131fa62 - main - sysutils/screenfetch: shift sysutils/screenfetch-nox11 to flavors 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: jgh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfe31131fa62b531b09593db9eb269f9d8359a95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jgh: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfe31131fa62b531b09593db9eb269f9d8359a95 commit dfe31131fa62b531b09593db9eb269f9d8359a95 Author: Jason Helfman AuthorDate: 2023-02-24 05:14:48 +0000 Commit: Jason Helfman CommitDate: 2023-02-24 05:17:15 +0000 sysutils/screenfetch: shift sysutils/screenfetch-nox11 to flavors --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/screenfetch-nox11/Makefile | 9 --------- sysutils/screenfetch/Makefile | 15 ++++++++++----- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/MOVED b/MOVED index 45fdee339c63..25f85655709a 100644 --- a/MOVED +++ b/MOVED @@ -17767,3 +17767,4 @@ databases/mysql-connector-odbc|databases/mysql-connector-odbc-80|2023-02-18|Has devel/yaml-cpp03|devel/yaml-cpp|2023-02-21|Used by blender-lts28 which is EOL'd sysutils/uutils|sysutils/rust-coreutils|2023-02-22|Request by upstream print/harfbuzz-hb-view|print/harfbuzz-cairo|2023-02-23|Match feature and library name +sysutils/screenfetch-nox11|sysutils/screenfetch@nox11|2023-02-23|Converted to flavor diff --git a/sysutils/Makefile b/sysutils/Makefile index b2093586564b..27286768d7fb 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1321,7 +1321,6 @@ SUBDIR += schilyutils SUBDIR += screen SUBDIR += screenfetch - SUBDIR += screenfetch-nox11 SUBDIR += screenie SUBDIR += scterc SUBDIR += sd-agent diff --git a/sysutils/screenfetch-nox11/Makefile b/sysutils/screenfetch-nox11/Makefile deleted file mode 100644 index 5f9cb30dfc14..000000000000 --- a/sysutils/screenfetch-nox11/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PKGNAMESUFFIX= -nox11 - -MASTERDIR= ${.CURDIR}/../screenfetch - -CONFLICTS_INSTALL= screenFetch-[0-9].* - -OPTIONS_EXCLUDE= X11 - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index 0d876836814a..8bf52def095f 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -12,19 +12,24 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash -X11_RUN_DEPENDS= xdpyinfo:x11/xdpyinfo +default_RUN_DEPENDS= xdpyinfo:x11/xdpyinfo -CONFLICTS_INSTALL?= screenFetch-nox11 +FLAVORS= default nox11 +FLAVOR?= ${FLAVORS:[1]} +nox11_PKGNAMESUFFIX= -nox11 -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT= X11 +CONFLICTS_INSTALL= screenFetch-nox11* + +OPTIONS_DEFINE= DOCS NO_BUILD= yes NO_ARCH= yes USE_GITHUB= yes GH_ACCOUNT= KittyKatt -PLIST_FILES= bin/screenFetch bin/screenfetch man/man1/screenfetch.1.gz +PLIST_FILES= bin/screenFetch \ + bin/screenfetch \ + man/man1/screenfetch.1.gz PORTDOCS= CHANGELOG README.mkdn TODO do-install: