Index: head/devel/kf5-kcoreaddons/Makefile =================================================================== --- head/devel/kf5-kcoreaddons/Makefile (revision 518269) +++ head/devel/kf5-kcoreaddons/Makefile (revision 518270) @@ -1,36 +1,41 @@ # $FreeBSD$ PORTNAME= kcoreaddons DISTVERSION= ${KDE_FRAMEWORKS_VERSION} 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 +.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 Index: head/devel/qt5-core/Makefile =================================================================== --- head/devel/qt5-core/Makefile (revision 518269) +++ head/devel/qt5-core/Makefile (revision 518270) @@ -1,71 +1,74 @@ # $FreeBSD$ PORTNAME= core DISTVERSION= ${QT5_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org 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 USE_QT= qmake_build buildtools_build HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. # -no-feature-* adds QT_NO_* (for features which have no switch or # that need to be detected). CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-opengl \ -no-egl -no-evdev \ -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ -no-libudev -no-xcb -no-xkb -no-xcb-xlib \ -no-xkbcommon -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= GLIB 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} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: # Allow qconfig.h to be customized by single ports. ${AWK} 'BEGIN{print "#include "}{print}' \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h # Manually install qlalr cd ${WRKSRC}/src/tools/qlalr && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} # Cleanup qconfig.h and remove stray '#define QT_NO_FOO' ${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include Index: head/sysutils/etc_os-release/Makefile =================================================================== --- head/sysutils/etc_os-release/Makefile (revision 518269) +++ head/sysutils/etc_os-release/Makefile (revision 518270) @@ -1,35 +1,42 @@ # $FreeBSD$ PORTNAME= etc_os-release PORTVERSION= 0.1 PORTREVISION= 2 CATEGORIES= sysutils kde gnome MASTER_SITES= # DISTFILES= # EXTRACT_ONLY= # MAINTAINER= tcberner@FreeBSD.org COMMENT= Operating system identification file NO_BUILD= yes PLIST_FILES= etc/os-release VERSION!= freebsd-version -u 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 +# 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 Index: head/sysutils/gnome-control-center/Makefile =================================================================== --- head/sysutils/gnome-control-center/Makefile (revision 518269) +++ head/sysutils/gnome-control-center/Makefile (revision 518270) @@ -1,73 +1,79 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= gnome-control-center PORTVERSION= 3.28.2 PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 3 project LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas #\ # docbook-xsl>=0:textproc/docbook-xsl LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libcups.so:print/cups \ libpulse.so:audio/pulseaudio \ libfontconfig.so:x11-fonts/fontconfig \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libupower-glib.so:sysutils/upower \ libaccountsservice.so:sysutils/accountsservice \ libcolord.so:graphics/colord \ libcolord-gtk.so:graphics/colord-gtk \ libibus-1.0.so:textproc/ibus \ libsoup-2.4.so:devel/libsoup \ libgoa-1.0.so:net/gnome-online-accounts \ libpwquality.so:security/libpwquality \ libgtop-2.0.so:devel/libgtop \ libgrilo-0.3.so:net/grilo \ libpolkit-gobject-1.so:sysutils/polkit 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 USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \ pkgconfig python:3.6+,build samba:lib tar:xz xorg USE_GNOME= cairo gnomedesktop3 libxml2 USE_XORG= x11 xi #USE_GSTREAMER1= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_VERSION} GLIB_SCHEMAS= org.gnome.ControlCenter.gschema.xml OPTIONS_SUB= yes OPTIONS_DEFINE= WAYLAND CHEESE OPTIONS_DEFAULT=WAYLAND CHEESE CHEESE_DESC= Cheese webcam support CHEESE_LIB_DEPENDS= libcheese.so:multimedia/cheese 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