diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile index 7f422ac63552..d635d2134e31 100644 --- a/devel/libsigrok/Makefile +++ b/devel/libsigrok/Makefile @@ -1,45 +1,39 @@ PORTNAME= libsigrok PORTVERSION= 0.5.2 PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://sigrok.org/download/source/libsigrok/ MAINTAINER= bofh@FreeBSD.org COMMENT= Framework for hardware logic analyzers, core library WWW= https://sigrok.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= doxygen:devel/doxygen LIB_DEPENDS= libcheck.so:devel/check \ libftdi1.so:devel/libftdi1 \ libhidapi.so:comms/hidapi \ libserialport.so:devel/libserialport \ libvisa.so:devel/librevisa \ libzip.so:archivers/libzip USES= compiler:c11 gnome libtool pathfix pkgconfig python:-3.9,build \ shared-mime-info USE_GNOME= glibmm USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097 -CFLAGS+= -D__BSD_VISIBLE -D__XSI_VISIBLE -.endif - post-patch: # libusb can be disabled via src.conf(5), so detect via pkg-config @${REINPLACE_CMD} -e 's/\(libusb-1\.0\) >= 1\.0\.[0-9]*/\1/' \ -e '/\*freebsd\*/,/;;/d' \ ${WRKSRC}/configure .include diff --git a/devel/p5-IO-AIO/files/patch-AIO.xs b/devel/p5-IO-AIO/files/patch-AIO.xs index b1df75c1ed23..cf26e3bbb7a5 100644 --- a/devel/p5-IO-AIO/files/patch-AIO.xs +++ b/devel/p5-IO-AIO/files/patch-AIO.xs @@ -1,23 +1,11 @@ ---- AIO.xs.orig 2022-09-28 08:22:50 UTC +--- AIO.xs.orig 2022-09-25 16:29:50 UTC +++ AIO.xs -@@ -169,9 +169,11 @@ - # include - #endif - -+#define cv condvar_cv - #if HAVE_TIMERFD - # include - #endif -+#undef cv - - #if HAVE_RLIMITS - #include -@@ -2926,7 +2928,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef) +@@ -2924,7 +2924,7 @@ fexecve (SV *fh, SV *args, SV *envs = &PL_sv_undef) OUTPUT: RETVAL int -mount (octet_string special, octet_string path, octet_string fstype, UV flags = 0, octet_string_ornull data = 0) +mount (octet_string special, octet_string path, UV flags = 0, octet_string_ornull data = 0) CODE: #if HAVE_MOUNT RETVAL = mount (special, path, fstype, flags, data); diff --git a/x11/libinput/files/patch-tools_libinput-record.c b/x11/libinput/files/patch-tools_libinput-record.c deleted file mode 100644 index 0b67efceed08..000000000000 --- a/x11/libinput/files/patch-tools_libinput-record.c +++ /dev/null @@ -1,20 +0,0 @@ ---- tools/libinput-record.c.orig 2023-03-25 17:59:47 UTC -+++ tools/libinput-record.c -@@ -2577,7 +2577,7 @@ enum fposition { - - enum fposition { - ERROR, -- NOFILE, -+ NO_FILE, - FIRST, - LAST, - }; -@@ -2633,7 +2633,7 @@ find_output_file(int argc, char *argv[], const char ** - return ERROR; - } - #undef _m -- return NOFILE; -+ return NO_FILE; - } - - enum options { diff --git a/x11/mako/Makefile b/x11/mako/Makefile index 90ee554be7fa..e34c522d0167 100644 --- a/x11/mako/Makefile +++ b/x11/mako/Makefile @@ -1,52 +1,46 @@ PORTNAME= mako DISTVERSIONPREFIX= v DISTVERSION= 1.8.0 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Lightweight Wayland notification daemon WWW= https://github.com/emersion/mako LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.21:graphics/wayland-protocols LIB_DEPENDS= libbasu.so:devel/basu \ libepoll-shim.so:devel/libepoll-shim \ libwayland-client.so:graphics/wayland USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo pango GH_ACCOUNT= emersion MESON_ARGS= -Dsd-bus-provider=basu PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}ctl \ share/dbus-1/services/fr.emersion.mako.service OPTIONS_DEFINE= MANPAGES PIXBUF OPTIONS_DEFAULT=MANPAGES PIXBUF MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz \ man/man1/${PORTNAME}ctl.1.gz \ man/man5/${PORTNAME}.5.gz PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ENABLED= icons -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097 -CFLAGS+= -D__BSD_VISIBLE -D__XSI_VISIBLE -.endif - post-patch: # Respect PREFIX for icons @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},g' \ ${WRKSRC}/icon.c \ ${WRKSRC}/${PORTNAME}.5.scd .include diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile index 3732aac874ed..120c871b57c7 100644 --- a/x11/swayimg/Makefile +++ b/x11/swayimg/Makefile @@ -1,93 +1,87 @@ PORTNAME= swayimg DISTVERSIONPREFIX= v DISTVERSION= 1.12 PORTREVISION= 2 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Image viewer for Sway/Wayland WWW= https://github.com/artemsen/swayimg LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libwayland-client.so:graphics/wayland \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libxkbcommon.so:x11/libxkbcommon USES= meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= artemsen MESON_ARGS= -Dversion="${DISTVERSIONFULL}" PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz \ man/man5/${PORTNAME}rc.5.gz \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/64x64/apps/${PORTNAME}.png \ ${NULL} # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif OPTIONS_DEFINE= BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH OPTIONS_DEFAULT=BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/} BASH_BUILD_DEPENDS= bash-completion>0:shells/bash-completion BASH_MESON_ENABLED= bash BASH_PLIST_FILES= share/bash-completion/completions/${PORTNAME} GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_USES= localbase:ldflags GIF_MESON_ENABLED= gif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_MESON_ENABLED= heif JPEG_USES= jpeg JPEG_MESON_ENABLED= jpeg JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_MESON_ENABLED= jxl LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif LIBEXIF_MESON_ENABLED= exif LIBRSVG2_USES= gnome LIBRSVG2_USE= GNOME=cairo,librsvg2 LIBRSVG2_MESON_ENABLED= svg OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr OPENEXR_MESON_ENABLED= exr PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MESON_ENABLED= png TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MESON_ENABLED= tiff WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_MESON_ENABLED= webp ZSH_MESON_ENABLED= zsh ZSH_PLIST_FILES= share/zsh/site-functions/_${PORTNAME} -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097 -CFLAGS+= -D__BSD_VISIBLE -D__XSI_VISIBLE -.endif - post-patch: # Respect PREFIX for system-wide config @${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \ ${WRKSRC}/extra/${PORTNAME}rc.5 \ ${WRKSRC}/src/config.c .include diff --git a/x11/sxmo-wayout/Makefile b/x11/sxmo-wayout/Makefile index ba76da8c22db..103d4b125b8e 100644 --- a/x11/sxmo-wayout/Makefile +++ b/x11/sxmo-wayout/Makefile @@ -1,44 +1,38 @@ PORTNAME= wayout DISTVERSION= 0.1.4 CATEGORIES= x11 wayland MASTER_SITES= https://git.sr.ht/~proycon/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ PKGNAMEPREFIX= sxmo- MAINTAINER= jbeich@FreeBSD.org COMMENT= Output simple text to a Wayland desktop widget WWW= https://git.sr.ht/~proycon/wayout LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland USES= compiler:c11 gnome meson pkgconfig USE_GNOME= cairo pango CFLAGS+= -Wno-error=strict-prototypes # Clang 15, similar to wlclock PLIST_FILES= bin/${PKGBASE} OPTIONS_DEFINE= EPOLL MANPAGES OPTIONS_DEFAULT=EPOLL MANPAGES EPOLL_DESC= Handle signals via epoll-shim EPOLL_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim EPOLL_MESON_ENABLED= handle-signals MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097 -CFLAGS+= -D__BSD_VISIBLE -D__XSI_VISIBLE -.endif - post-install: # Rename to avoid conflict with x11/wayout ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PKGBASE} .include diff --git a/x11/wmenu/Makefile b/x11/wmenu/Makefile index 277d9948eef3..8764a8ffe766 100644 --- a/x11/wmenu/Makefile +++ b/x11/wmenu/Makefile @@ -1,38 +1,32 @@ PORTNAME= wmenu DISTVERSION= 0.1.4 CATEGORIES= x11 wayland MASTER_SITES= https://git.sr.ht/~adnano/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ MAINTAINER= o.hushchenkov@gmail.com COMMENT= Efficient dynamic menu for Wayland WWW= https://sr.ht/~adnano/wmenu/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= scdoc:textproc/scdoc \ wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig USE_GNOME= cairo pango # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim CPPFLAGS+= `pkg-config --cflags epoll-shim` LDFLAGS+= `pkg-config --libs epoll-shim` .endif PLIST_FILES= bin/wmenu \ man/man1/wmenu.1.gz -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097 -CFLAGS+= -D__BSD_VISIBLE -D__XSI_VISIBLE -.endif - .include diff --git a/x11/xdg-desktop-portal-wlr/Makefile b/x11/xdg-desktop-portal-wlr/Makefile index 0007c79c55e4..73f5f4d78183 100644 --- a/x11/xdg-desktop-portal-wlr/Makefile +++ b/x11/xdg-desktop-portal-wlr/Makefile @@ -1,58 +1,52 @@ PORTNAME= xdg-desktop-portal-wlr DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 PORTREVISION= 1 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 8453779cf394.patch:-p1 # https://github.com/emersion/xdg-desktop-portal-wlr/pull/279 MAINTAINER= jbeich@FreeBSD.org COMMENT= xdg-desktop-portal backend for wlroots WWW= https://github.com/emersion/xdg-desktop-portal-wlr LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libbasu.so:devel/basu \ libinih.so:devel/inih \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire RUN_DEPENDS= grim:x11/grim \ slurp:x11/slurp USES= compiler:c11 gl meson pkgconfig USE_GITHUB= yes USE_GL= gbm GH_ACCOUNT= emersion MESON_ARGS= -Dsd-bus-provider=basu -Dsystemd=disabled PLIST_FILES= libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.wlr.service \ share/xdg-desktop-portal/portals/wlr.portal # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= scdoc:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages MANPAGES_PLIST_FILES= man/man5/${PORTNAME}.5.gz -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400097 -CFLAGS+= -D__BSD_VISIBLE -D__XSI_VISIBLE -.endif - post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/${PORTNAME}.5.scd .include