diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 6f526ca07aaa..d30abdb42873 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,68 +1,69 @@ PORTNAME= dbus DISTVERSION= 1.14.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= https://dbus.freedesktop.org/releases/dbus/ MAINTAINER= desktop@FreeBSD.org COMMENT= Message bus system for inter-application communication WWW= https://www.freedesktop.org/Software/dbus LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 USES= cpe gmake libtool localbase pkgconfig python:build shebangfix tar:xz CPE_VENDOR= d-bus_project CPE_PRODUCT= d-bus USE_LDCONFIG= yes USE_RC_SUBR= dbus SHEBANG_FILES= tools/GetAllMatchRules.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-apparmor \ --disable-doxygen-docs \ --disable-selinux \ --disable-systemd \ --with-session-socket-dir=/tmp \ --with-test-socket-dir=${WRKDIR} INSTALL_TARGET= install-strip PORTSCOUT= limitw:1,even USERS= messagebus GROUPS= messagebus _LIBVERSION= 3.32.4 PLIST_SUB= GROUPS=${GROUPS} \ VERSION="1.0" \ LIBVERSION=${_LIBVERSION} OPTIONS_DEFINE= EXAMPLES MANPAGES X11 OPTIONS_DEFAULT= MANPAGES X11 OPTIONS_SUB= yes X11_DESC= Support X11 Desktop Environments MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto MANPAGES_CONFIGURE_ENABLE= xml-docs X11_USES= xorg X11_USE= XORG=ice,sm,x11 X11_CONFIGURE_WITH= x post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/dbus/dbus-sysdeps-util-unix.c post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR} ${RM} -r ${STAGEDIR}${DOCSDIR} .for file in session.conf system.conf @cd ${STAGEDIR}${ETCDIR}-1/ && \ ${MV} ${file} ${file}.sample .endfor .include diff --git a/devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in b/devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in new file mode 100644 index 000000000000..cf9b0e58b41f --- /dev/null +++ b/devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in @@ -0,0 +1,13 @@ +Fix location of pkgconfig directory on FreeBSD. + +--- cmake/DBus1Config.pkgconfig.in.orig 2022-10-02 14:06:53 UTC ++++ cmake/DBus1Config.pkgconfig.in +@@ -8,7 +8,7 @@ + # [1] This variable is not required if DBus1_LIBRARIES is added + # to a target with target_link_libraries + +-get_filename_component(DBus1_PKGCONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}/../../pkgconfig" ABSOLUTE) ++get_filename_component(DBus1_PKGCONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../libdata/pkgconfig" ABSOLUTE) + get_filename_component(DBus1_NEARBY_ARCH_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../dbus-1.0/include" ABSOLUTE) + find_package(PkgConfig) + if(DEFINED ENV{PKG_CONFIG_DIR})