Index: head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp =================================================================== --- head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp (revision 502158) +++ head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp (nonexistent) @@ -1,27 +0,0 @@ ---- src/lib/util/kosrelease.cpp.orig 2019-05-08 08:27:20 UTC -+++ src/lib/util/kosrelease.cpp -@@ -76,13 +76,18 @@ static QStringList splitEntry(const QString &line) - - static QString defaultFilePath() - { -- if (QFile::exists(QStringLiteral("/etc/os-release"))) { -- return QStringLiteral("/etc/os-release"); -- } else if (QFile::exists(QStringLiteral("/usr/lib/os-release"))) { -- return QStringLiteral("/usr/lib/os-release"); -- } else { -- return QString(); -+ for (const auto& path : { -+#ifdef Q_OS_FREEBSD -+ QStringLiteral("/usr/local/etc/os-release"), -+#endif -+ QStringLiteral("/etc/os-release"), -+ QStringLiteral("/usr/lib/os-release") -+ }) { -+ if (QFile::exists(path)) { -+ return path; -+ } - } -+ return QString(); - } - - class Q_DECL_HIDDEN KOSRelease::Private Property changes on: head/devel/kf5-kcoreaddons/files/patch-src_lib_util_kosrelease.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/kf5-kcoreaddons/Makefile =================================================================== --- head/devel/kf5-kcoreaddons/Makefile (revision 502158) +++ head/devel/kf5-kcoreaddons/Makefile (revision 502159) @@ -1,33 +1,37 @@ # $FreeBSD$ PORTNAME= kcoreaddons DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 addons to QtCore LICENSE= LGPL21+ BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE_LGPL21+= ${WRKSRC}/COPYING.LIB LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS USES= cmake compiler:c++11-lib kde:5 qt:5 shared-mime-info tar:xz USE_KDE= ecm USE_QT= buildtools_build core linguisttools qmake_build OPTIONS_DEFINE= FAM INOTIFY OPTIONS_DEFAULT= INOTIFY OPTIONS_SUB= yes INOTIFY_DESC= Filesystem alteration notifications using inotify INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify INOTIFY_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_INOTIFY # TODO: FAM is broken, and hangs on NFS FAM_DESC= Filesystem alteration notifications using fam (broken: hangs on NFS) FAM_USES= fam FAM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_FAM + +post-patch: + ${REINPLACE_CMD} -e '/QStringLiteral/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ + ${WRKSRC}/src/lib/util/kosrelease.cpp .include