From owner-svn-ports-all@freebsd.org Sat Nov 23 20:19:23 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 86E5E1BDF33; Sat, 23 Nov 2019 20:19:23 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47L4QM3010z4QCc; Sat, 23 Nov 2019 20:19:23 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A8531936B; Sat, 23 Nov 2019 20:19:23 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xANKJNTq074225; Sat, 23 Nov 2019 20:19:23 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xANKJMmF074221; Sat, 23 Nov 2019 20:19:22 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201911232019.xANKJMmF074221@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 23 Nov 2019 20:19:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518270 - in head: devel/kf5-kcoreaddons devel/qt5-core sysutils/etc_os-release sysutils/gnome-control-center X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: devel/kf5-kcoreaddons devel/qt5-core sysutils/etc_os-release sysutils/gnome-control-center X-SVN-Commit-Revision: 518270 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Nov 2019 20:19:23 -0000 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 +# 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 +.include 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 - +# 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 +# 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 +.include 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 +# 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 +.include