Handle os-release more smartly
The Qt ports, and GNOME control center, can read /etc/os-release, and have patches to read /usr/local/etc/os-release -- however, the two files update differently, and /etc/os-release is preferred. Tighten up the .if to select when to depend on the extra port for /usr/local/etc/os-release (basically: pre 11.4 and 12.1) - Bumps PORTREVISION because dependencies may change. - Note that I used the --author command-line option to set that mikael@ wrote this patch. PR: 251073
This commit is contained in:
parent
c4254019d8
commit
1ef5284b23
2 changed files with 4 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= core
|
||||
DISTVERSION= ${QT5_VERSION}
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= devel
|
||||
PKGNAMEPREFIX= qt5-
|
||||
|
||||
|
@ -39,9 +39,7 @@ QT_CONFIG= glib icu
|
|||
MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
# FreeBSD base gained /etc/os-release in r354922, which
|
||||
# corresponds to __FreeBSD_version 1300060
|
||||
.if ${OSVERSION} < 1300060
|
||||
.if !exists(/etc/rc.d/os-release)
|
||||
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' \
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= gnome-control-center
|
||||
PORTVERSION= 3.38.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= sysutils gnome
|
||||
MASTER_SITES= GNOME
|
||||
DIST_SUBDIR= gnome
|
||||
|
@ -72,9 +73,7 @@ LDFLAGS+= -fuse-ld=lld
|
|||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
# FreeBSD base gained /etc/os-release in r354922, which
|
||||
# corresponds to __FreeBSD_version 1300060
|
||||
.if ${OSVERSION} < 1300060
|
||||
.if !exists(/etc/rc.d/os-release)
|
||||
RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \
|
||||
|
|
Loading…
Reference in a new issue