diff --git a/deskutils/dmenu-wayland/Makefile b/deskutils/dmenu-wayland/Makefile index d0576b55b527..925d0fdd8b36 100644 --- a/deskutils/dmenu-wayland/Makefile +++ b/deskutils/dmenu-wayland/Makefile @@ -1,32 +1,32 @@ PORTNAME= dmenu-wayland PORTVERSION= 0.1 DISTVERSIONPREFIX= v CATEGORIES= deskutils wayland PATCH_SITES= https://github.com/nyyManni/dmenu-wayland/commit/ PATCHFILES= b646f4d14c627d9a4300d9d015fb8e9b5cb2abef.patch:-p1 MAINTAINER= bapt@FreeBSD.org COMMENT= Efficient dynamic menu for wayland WWW= https://github.com/nyyManni/dmenu-wayland LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= gnome meson pkgconfig -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols +BUILD_DEPENDS= ${LOCALBASE}/share/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USE_GITHUB= yes GH_ACCOUNT= nyyManni USE_GNOME= cairo glib20 pango PLIST_FILES= bin/dmenu-wl \ bin/dmenu-wl_path \ bin/dmenu-wl_run \ man/man1/dmenu-wl.1.gz .include diff --git a/graphics/wayland-protocols/Makefile b/graphics/wayland-protocols/Makefile index c27b929edaf5..bf1693744792 100644 --- a/graphics/wayland-protocols/Makefile +++ b/graphics/wayland-protocols/Makefile @@ -1,19 +1,20 @@ PORTNAME= wayland-protocols PORTVERSION= 1.32 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://gitlab.freedesktop.org/wayland/${PORTNAME}/-/releases/${DISTVERSION}/downloads/ MAINTAINER= x11@FreeBSD.org COMMENT= Wayland protocols WWW= https://wayland.freedesktop.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= wayland-scanner:graphics/wayland USES= meson pkgconfig tar:xz MESON_ARGS= -Dtests=false NO_ARCH= yes .include diff --git a/graphics/wayland-protocols/files/patch-meson.build b/graphics/wayland-protocols/files/patch-meson.build deleted file mode 100644 index 541eba6d6cca..000000000000 --- a/graphics/wayland-protocols/files/patch-meson.build +++ /dev/null @@ -1,14 +0,0 @@ -devel/pkgconfig removed share/pkgconfig from PKG_DEFAULT_PATH -via --with-pkg-config-dir override. Similar to lib/pkgconfig. - ---- meson.build.orig 2021-11-26 04:47:33 UTC -+++ meson.build -@@ -91,7 +91,7 @@ pkgconfig_configuration.set('abs_top_srcdir', wayland_ - pkgconfig_configuration.set('PACKAGE', 'wayland-protocols') - pkgconfig_configuration.set('WAYLAND_PROTOCOLS_VERSION', wayland_protocols_version) - --pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig') -+pkg_install_dir = join_paths(get_option('prefix'), 'libdata/pkgconfig') - configure_file( - input: 'wayland-protocols.pc.in', - output: 'wayland-protocols.pc', diff --git a/graphics/wayland-protocols/pkg-plist b/graphics/wayland-protocols/pkg-plist index f019c6dbd173..503bb887b9dc 100644 --- a/graphics/wayland-protocols/pkg-plist +++ b/graphics/wayland-protocols/pkg-plist @@ -1,38 +1,38 @@ -libdata/pkgconfig/wayland-protocols.pc +share/pkgconfig/wayland-protocols.pc %%DATADIR%%/stable/presentation-time/presentation-time.xml %%DATADIR%%/stable/viewporter/viewporter.xml %%DATADIR%%/stable/xdg-shell/xdg-shell.xml %%DATADIR%%/staging/content-type/content-type-v1.xml %%DATADIR%%/staging/cursor-shape/cursor-shape-v1.xml %%DATADIR%%/staging/drm-lease/drm-lease-v1.xml %%DATADIR%%/staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml %%DATADIR%%/staging/ext-idle-notify/ext-idle-notify-v1.xml %%DATADIR%%/staging/ext-session-lock/ext-session-lock-v1.xml %%DATADIR%%/staging/fractional-scale/fractional-scale-v1.xml %%DATADIR%%/staging/security-context/security-context-v1.xml %%DATADIR%%/staging/single-pixel-buffer/single-pixel-buffer-v1.xml %%DATADIR%%/staging/tearing-control/tearing-control-v1.xml %%DATADIR%%/staging/xdg-activation/xdg-activation-v1.xml %%DATADIR%%/staging/xwayland-shell/xwayland-shell-v1.xml %%DATADIR%%/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml %%DATADIR%%/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml %%DATADIR%%/unstable/input-method/input-method-unstable-v1.xml %%DATADIR%%/unstable/input-timestamps/input-timestamps-unstable-v1.xml %%DATADIR%%/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml %%DATADIR%%/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml %%DATADIR%%/unstable/linux-explicit-synchronization/linux-explicit-synchronization-unstable-v1.xml %%DATADIR%%/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml %%DATADIR%%/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml %%DATADIR%%/unstable/primary-selection/primary-selection-unstable-v1.xml %%DATADIR%%/unstable/relative-pointer/relative-pointer-unstable-v1.xml %%DATADIR%%/unstable/tablet/tablet-unstable-v1.xml %%DATADIR%%/unstable/tablet/tablet-unstable-v2.xml %%DATADIR%%/unstable/text-input/text-input-unstable-v1.xml %%DATADIR%%/unstable/text-input/text-input-unstable-v3.xml %%DATADIR%%/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml %%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml %%DATADIR%%/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml %%DATADIR%%/unstable/xdg-output/xdg-output-unstable-v1.xml %%DATADIR%%/unstable/xdg-shell/xdg-shell-unstable-v5.xml %%DATADIR%%/unstable/xdg-shell/xdg-shell-unstable-v6.xml %%DATADIR%%/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml