git: 141df258e73a - main - sysutils/etc_os-release: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 31 Dec 2023 00:08:42 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=141df258e73ad1caf7fc6f7c1981367e2716b07b commit 141df258e73ad1caf7fc6f7c1981367e2716b07b Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-12-30 06:19:56 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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 <bsd.port.pre.mk> - -# 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 <bsd.port.post.mk> +.include <bsd.port.mk> 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 <bsd.port.pre.mk> -# 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 <bsd.port.post.mk> 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 <bsd.port.pre.mk> - -# 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 <bsd.port.post.mk> +.include <bsd.port.mk>