svn commit: r518270 - in head: devel/kf5-kcoreaddons devel/qt5-core sysutils/etc_os-release sysutils/gnome-control-center

[Tobias C. Berner]

Author: tcberner
Date: Sat Nov 23 20:19:22 2019
New Revision: 518270
URL: https://svnweb.freebsd.org/changeset/ports/518270

Log:
  sysutils/etc-os-release: use the one provided by base if the system is new enough
  
  PR:		238953
  Reviewed by:	zeising
  Differential Revision:	https://reviews.freebsd.org/D22488

Modified:
  head/devel/kf5-kcoreaddons/Makefile
  head/devel/qt5-core/Makefile
  head/sysutils/etc_os-release/Makefile
  head/sysutils/gnome-control-center/Makefile

Modified: head/devel/kf5-kcoreaddons/Makefile
==============================================================================
--- head/devel/kf5-kcoreaddons/Makefile	Sat Nov 23 20:11:31 2019	(r518269)
+++ head/devel/kf5-kcoreaddons/Makefile	Sat Nov 23 20:19:22 2019	(r518270)
@@ -29,8 +29,13 @@ FAM_DESC=		Filesystem alteration notifications using f
 FAM_USES=		fam
 FAM_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_FAM
 
+.include <bsd.port.pre.mk>
+# FreeBSD base gained /etc/os-release in r354922, which
+# corresponds to __FreeBSD_version 1300060
+.if ${OSVERSION} < 1300060
 post-patch:
 	${REINPLACE_CMD}  -e '/QStringLiteral/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \
 		${WRKSRC}/src/lib/util/kosrelease.cpp
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/qt5-core/Makefile
==============================================================================
--- head/devel/qt5-core/Makefile	Sat Nov 23 20:11:31 2019	(r518269)
+++ head/devel/qt5-core/Makefile	Sat Nov 23 20:19:22 2019	(r518270)
@@ -10,7 +10,6 @@ COMMENT=	Qt core non-graphical module
 
 LIB_DEPENDS=	libicui18n.so:devel/icu \
 		libpcre2-posix.so:devel/pcre2
-RUN_DEPENDS=	etc_os-release>0:sysutils/etc_os-release
 
 USES=		compiler:c++11-lang gnome qmake:no_env qt-dist:5,base
 USE_GNOME=	glib20
@@ -37,10 +36,14 @@ QT_CONFIG=	glib icu
 MORE_WRKSRCS=	src/tools/bootstrap src/tools/qfloat16-tables 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
+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}

Modified: head/sysutils/etc_os-release/Makefile
==============================================================================
--- head/sysutils/etc_os-release/Makefile	Sat Nov 23 20:11:31 2019	(r518269)
+++ head/sysutils/etc_os-release/Makefile	Sat Nov 23 20:19:22 2019	(r518270)
@@ -28,8 +28,15 @@ CONTENTS=	'NAME=FreeBSD\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.mk>
+.include <bsd.port.post.mk>

Modified: head/sysutils/gnome-control-center/Makefile
==============================================================================
--- head/sysutils/gnome-control-center/Makefile	Sat Nov 23 20:11:31 2019	(r518269)
+++ head/sysutils/gnome-control-center/Makefile	Sat Nov 23 20:19:22 2019	(r518270)
@@ -37,7 +37,6 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 RUN_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
 		cantarell-fonts>=0:x11-fonts/cantarell-fonts \
-		etc_os-release>0:sysutils/etc_os-release \
 		gcm-calibrate:graphics/gnome-color-manager
 
 PORTSCOUT=	limitw:1,even
@@ -65,9 +64,16 @@ CHEESE_MESON_TRUE=	cheese
 WAYLAND_MESON_TRUE=	wayland
 WAYLAND_LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
 
+
+.include <bsd.port.pre.mk>
+# FreeBSD base gained /etc/os-release in r354922, which
+# corresponds to __FreeBSD_version 1300060
+.if ${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/privacy/cc-privacy-panel.c \
 		${WRKSRC}/panels/info/cc-info-overview-panel.c
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>