From nobody Sun Dec 31 00:08:42 2023 X-Original-To: dev-commits-ports-all@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 4T2fbZ69ytz55c4m; Sun, 31 Dec 2023 00:08:42 +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 4T2fbZ4GXPz3C5V; Sun, 31 Dec 2023 00:08:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981322; 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=KkXRRn9bcqNrErJl9QHZYv9QGM15T3zYiUIFQ6XxnsI=; b=w0S8X6BgWF/WOGlo9x/t6osYSCjzGUZwNC7OudCcvPf71YnkOCfOaQSSpPi1L9t5HMvhNI 5pn+cEa8JH3HluLevurQQDEltQMWGESq7mExnqDlizQMAZQsGbtrgEyvXbVhhrWtmivdh0 A4U7r9FgB18Ndzd0g1IA0Qehbr3qwz8iRppdSoeI8HXehOZo4QDcMS+xS59z971OTNddx2 7CsbvfX5NRPbLfJB6NKzpsGrM1S/R5U2cnFv21NygVyF1LTeE7dDn9tgt2J5FiJsTC5b1B pnmTfoMp2ibXGW2s5Yu/ss509PDTRRoOnbAOqc8BJKZ4WbC9ClMxCbmO4GmUdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703981322; a=rsa-sha256; cv=none; b=QV8Y54IZGS2Izl+Tvsopb63Sc1t0I+4piVUNVXAEt3lHx2WtKKYIZoikg3dN6GAP0OBvqh a2AMjU9Ew6nJn4B48n2bcxvNdigub9RFcMw7I/RFmCzzPIgwx0tiox3fuJV4fIbpcGRcZp +XilNfVm1hKfkEpz7IqNA5dwjjYHzotKBUULQzBerBZ4i7CeT1IF+Ajb0SNimrbG0J4Wge arkyORWPK2WtPMnINk7rlcZyH8kp8ZLJjAPTIwtXJCN4kZl5yUwLaB74fCz3+2ur6WQCQh utr7sx+hs9tMXA06H4sQJSy5h0fd+dSG5b3UdEoEo0E9B4H7ykMrffIYdk0cjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981322; 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=KkXRRn9bcqNrErJl9QHZYv9QGM15T3zYiUIFQ6XxnsI=; b=Or4E/EMIt7OertdvIhq/PYAWo3OPt8JliR3x8aAonYSg9NRUMbLWCiv7qJ9wjcK0x5u/lV 4fW+Vzt9TdFqKih3ziFtih9cUzt15/S4zl9RaBaCXz4b2/DfTZ//vYLZ5m8CMVJNtl7IrG /r7URbb5138dVsEVFpFEaBD4FLGF1Vrjna6Jf1s3JIZ4yImW3BzAfARYaraGioeg7kcv+U aGl1KZKF9m1ZXQe4/z09xVntdy9jrg8u5dCzM2e34afh7LZX+V5p1X33F85jYzdB9CrUPF GG6iuUN3di7UKeTeFNmgK+2TS+IFSx7oPzBa/WGxsIGIKHS/cJz9f6aR2eqDXg== 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 4T2fbZ3Lwkz1B6R; Sun, 31 Dec 2023 00:08:42 +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 3BV08grZ096740; Sun, 31 Dec 2023 00:08:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BV08g3T096737; Sun, 31 Dec 2023 00:08:42 GMT (envelope-from git) Date: Sun, 31 Dec 2023 00:08:42 GMT Message-Id: <202312310008.3BV08g3T096737@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 141df258e73a - main - sysutils/etc_os-release: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 141df258e73ad1caf7fc6f7c1981367e2716b07b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=141df258e73ad1caf7fc6f7c1981367e2716b07b commit 141df258e73ad1caf7fc6f7c1981367e2716b07b Author: Muhammad Moinur Rahman AuthorDate: 2023-12-30 06:19:56 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-31 00:06:33 +0000 sysutils/etc_os-release: Remove expired port 2023-12-31 sysutils/etc_os-release: No longer required after the EOL of 12 --- MOVED | 1 + devel/qt5-core/Makefile | 15 +---------- sysutils/Makefile | 1 - sysutils/etc_os-release/Makefile | 49 ---------------------------------- sysutils/etc_os-release/pkg-descr | 2 -- sysutils/gnome-control-center/Makefile | 15 +---------- 6 files changed, 3 insertions(+), 80 deletions(-) diff --git a/MOVED b/MOVED index da1a2b88d04d..9e98adaa21d0 100644 --- a/MOVED +++ b/MOVED @@ -8272,3 +8272,4 @@ www/py-dj41-django-tables2|www/py-dj42-django-tables2|2023-12-31|Has expired: Ex www/py-httpx013||2023-12-31|Has expired: Old repo-copy needed for deprecated textproc/py-googletrans graphics/drm-fbsd12.0-kmod||2023-12-31|Has expired: Requires soon to reach EOL FreeBSD 12 www/py-dj41-django-taggit|www/py-dj42-django-taggit|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/ +sysutils/etc_os-release||2023-12-31|Has expired: No longer required after the EOL of 12 diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 44d583eb278f..3df6cee5c082 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -38,19 +38,6 @@ QT_CONFIG= glib icu MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr -.include - -# FreeBSD base gained an os-release in r354922, but that does not exist -# always (see Synth bug 191, or PR 255354). Be a little more forgiving: -# assume sufficiently recent base "will have it", and check otherwise -# because 12.2 does, others like 12.1 do not have it. -.if !exists(/etc/rc.d/os-release) && (${OSVERSION} < 1300060) -RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release -post-patch: - ${REINPLACE_CMD} -e '/readEtcFile/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ - ${WRKSRC}/src/corelib/global/qglobal.cpp -.endif - post-configure: .for d in ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} @@ -77,4 +64,4 @@ post-install: ${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h -.include +.include diff --git a/sysutils/Makefile b/sysutils/Makefile index 08663650a918..b76e8df7d85a 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -369,7 +369,6 @@ SUBDIR += epazote SUBDIR += equinix-metal-cli SUBDIR += erdtree - SUBDIR += etc_os-release SUBDIR += etcmerge SUBDIR += ethname SUBDIR += evhz diff --git a/sysutils/etc_os-release/Makefile b/sysutils/etc_os-release/Makefile deleted file mode 100644 index 060bbea7e00b..000000000000 --- a/sysutils/etc_os-release/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -PORTNAME= etc_os-release -PORTVERSION= 0.1 -PORTREVISION= 3 -CATEGORIES= sysutils kde gnome -MASTER_SITES= # -DISTFILES= # -EXTRACT_ONLY= # - -MAINTAINER= tcberner@FreeBSD.org -COMMENT= Operating system identification file -WWW= https://www.freedesktop.org/software/systemd/man/os-release.html - -DEPRECATED= No longer required after the EOL of 12 -EXPIRATION_DATE= 2023-12-31 - -NO_ARCH= yes -NO_BUILD= yes - -PLIST_FILES= etc/os-release - -.if exists(/bin/freebsd-version) -VERSION!= freebsd-version -u -.else -VERSION!= uname -r -.endif -VERSION_ID= ${VERSION:C/^([0-9\.]+).*/\1/} - -CONTENTS= 'NAME=FreeBSD\0'$\ - 'VERSION=${VERSION}\0'$\ - 'VERSION_ID=${VERSION_ID}\0'$\ - 'ID=freebsd\0'$\ - 'ANSI_COLOR="0;31"\0'$\ - 'PRETTY_NAME="FreeBSD ${VERSION}"\0'$\ - 'CPE_NAME=cpe:/o:freebsd:freebsd:${VERSION_ID}\0'$\ - 'HOME_URL=https://freebsd.org/\0'$\ - 'BUG_REPORT_URL=https://bugs.freebsd.org' - -.include -# FreeBSD base gained /etc/os-release in r354922, which -# corresponds to __FreeBSD_version 1300060 -.if ${OSVERSION} >= 1300060 -IGNORE= /etc/os-release is present in base -.endif - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc - ${ECHO} -e ${CONTENTS} | ${XARGS} -0 -n 1 >> ${STAGEDIR}${PREFIX}/${PLIST_FILES} - -.include diff --git a/sysutils/etc_os-release/pkg-descr b/sysutils/etc_os-release/pkg-descr deleted file mode 100644 index d21cca3a220c..000000000000 --- a/sysutils/etc_os-release/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This package installs /usr/local/etc/os-release file which contains version and -other information about installed operating system. diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 7afb28b33fcf..bec5732d9ede 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -59,17 +59,4 @@ OPTIONS_DEFAULT= WAYLAND WAYLAND_MESON_TRUE= wayland WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev -.include - -# FreeBSD base gained an os-release in r354922, but that does not exist -# always (see Synth bug 191, or PR 255354). Be a little more forgiving: -# assume sufficiently recent base "will have it", and check otherwise -# because 12.2 does, others like 12.1 do not have it. -.if !exists(/etc/rc.d/os-release) && (${OSVERSION} < 1300060) -RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release -post-patch: - @${REINPLACE_CMD} -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ - ${WRKSRC}/panels/common/cc-os-release.c -.endif - -.include +.include