From nobody Fri Apr 18 09:01:27 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zf7zX024Kz5sSpF; Fri, 18 Apr 2025 09:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zf7zW3ZnPz3D0v; Fri, 18 Apr 2025 09:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744966887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AeXf9GaY0IYUO51qKKZP3j3aGQA6qxJUMrrcZ8zstE=; b=cPw8GyoZXS4mVe7ScSz1vxeqeYHlBCGy3r97tZ9/PDUvd1Hxi4BVPp6oNghkkabAnsj1Ey UHAMEUdHpc2a92akpfOouYHXo1Yzolt8XUKVb9q6LVEcI8YNhC+RdqI3SQ8N2Vx8DK2LNv z+XOZIePGz6KFZDfV+/6Ko/pnsqt5IaE/jenjFOtCR7KecQrCzoGQNpOKPY5+OLcs0Rnm5 SqRYfZhutyEpvoj7LtaJlvXH9cEQ83ArnPFJPp8Oi5f6udD+eZiqDmUWKIN11GwCmGbXT2 bYNvC6SPgk3O9q202yeQ+mfcP0MVGvCUmAiXOqDDbyQPYZutA3rmy3OVoAVX/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744966887; a=rsa-sha256; cv=none; b=dtEZo99NFlYn4SdfvGVue/CUDoVPpKDThGjadZVLXNt4jUZthAKpML3mEZ6cbz8FWGWlz/ qauQJlH5tmwtaphK9izp7Nf/I5jty8pRyeTv9LsotWFtV5YJ4ByJl/acR0HbOAMvZi9xm4 f70AQTx0gm4PnooZeZfq9rN8Msyf/C5mgP5flta7g8P9++qhDNtENJdPMNEJX+Udx/B3xt 8hi8Tk/2eyafpkgqIm7se0Oy7i6G+qaLOzsWftmlODvRqm0TauqS8qhsxzWVOflMwtLcFm Yvoa6QA6nMEPdXTONuEg376f0joNHuYlYTms75V6BQIokQB/x3H10gzvM06YlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744966887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3AeXf9GaY0IYUO51qKKZP3j3aGQA6qxJUMrrcZ8zstE=; b=x5lJPxuowCvxavvLSkYK809LlgJj7MVhfduh3wkwgKBLxAqXj0eL4yx0bDNsKtoJAAMy4V bDhwb00UWLbm4g42rJ4uTVdn/+hWzNGBHBytLQo9nD9efrpNsNHqp4P4PIljgKjT9eLoaR LY72hNh7sz37CXCPtrZHyyeWwznBfKRw+js+u04QDFIbNOpEGU2sF2bIlaF5/rUC6DRn+s gofXLRIvVNc/ysh4IMcpna89ptmJZBmGVlk4vgD8F8vXDYKH7Bn44qJltRBC03+Q9Jysyt 6SVH3WyHS42HAbDB3t84eTs8mHYf9vBNnt8YqR+TTJH65BPf/9YRduyFCGlytw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zf7zW2txxzBgk; Fri, 18 Apr 2025 09:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53I91RME066867; Fri, 18 Apr 2025 09:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53I91R1h066864; Fri, 18 Apr 2025 09:01:27 GMT (envelope-from git) Date: Fri, 18 Apr 2025 09:01:27 GMT Message-Id: <202504180901.53I91R1h066864@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: e051160d5026 - main - sysutils/dunst: Improving port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e051160d50269fb3006f3cea2e69925e9955ec36 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e051160d50269fb3006f3cea2e69925e9955ec36 commit e051160d50269fb3006f3cea2e69925e9955ec36 Author: Zsolt Udvari AuthorDate: 2025-04-18 08:49:18 +0000 Commit: Zsolt Udvari CommitDate: 2025-04-18 08:54:53 +0000 sysutils/dunst: Improving port Add TEST_TARGET and TEST_DEPENDS. The textproc/jq is runtime dependency. Use MAKE_ENV handle DUNSTIFY option instead of patching. Use OPTIONS_SUB. --- sysutils/dunst/Makefile | 20 +++++++++++--------- sysutils/dunst/pkg-plist | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile index 0d3d79494dad..073bf1c8bf10 100644 --- a/sysutils/dunst/Makefile +++ b/sysutils/dunst/Makefile @@ -1,6 +1,7 @@ PORTNAME= dunst DISTVERSIONPREFIX= v DISTVERSION= 1.12.2 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= uzsolt@FreeBSD.org @@ -13,6 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto LIB_DEPENDS= libdbus-1.so:devel/dbus \ libharfbuzz.so:print/harfbuzz +# textproc/jq required by completions +RUN_DEPENDS= jq:textproc/jq +TEST_DEPENDS= bash:shells/bash \ + valgrind:devel/valgrind USES= gmake gnome perl5 pkgconfig xorg @@ -23,16 +28,19 @@ USE_GNOME= cairo gdkpixbuf pango USE_PERL5= build USE_XORG= x11 xext xinerama xrandr xscrnsaver -MAKE_ARGS= MANPREFIX="${PREFIX}/share/man" SYSCONFDIR="${PREFIX}/etc" \ +MAKE_ARGS= MANPREFIX="${PREFIX}/share/man" \ + SYSCONFDIR="${PREFIX}/etc" \ SYSTEMD=0 +TEST_TARGET= test -OPTIONS_DEFINE= DUNSTIFY WAYLAND +OPTIONS_DEFINE= DUNSTIFY WAYLAND OPTIONS_DEFAULT= DUNSTIFY WAYLAND +OPTIONS_SUB= yes DUNSTIFY_DESC= Install dunstify (alternative to the notify-send) DUNSTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify -DUNSTIFY_PLIST_FILES= bin/dunstify +DUNSTIFY_MAKE_ENV_OFF= DUNSTIFY=0 WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols @@ -49,12 +57,6 @@ post-patch: ${WRKSRC}/src/settings_data.h \ ${WRKSRC}/src/icon-lookup.c -post-patch-DUNSTIFY-off: - @${REINPLACE_CMD} -e '/^all:/s/dunstify//' \ - -e '/^install:/s/install-dunstify//' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} '/libnotify/d' ${WRKSRC}/config.mk - pre-install: @${MKDIR} ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/services/ diff --git a/sysutils/dunst/pkg-plist b/sysutils/dunst/pkg-plist index a4c49e917358..77f179623987 100644 --- a/sysutils/dunst/pkg-plist +++ b/sysutils/dunst/pkg-plist @@ -1,12 +1,13 @@ bin/dunst bin/dunstctl +%%DUNSTIFY%%bin/dunstify @sample %%ETCDIR%%/dunstrc.sample share/bash-completion/completions/dunst share/bash-completion/completions/dunstctl share/dbus-1/services/org.knopwob.dunst.service share/fish/vendor_completions.d/dunst.fish share/fish/vendor_completions.d/dunstctl.fish -share/fish/vendor_completions.d/dunstify.fish +%%DUNSTIFY%%share/fish/vendor_completions.d/dunstify.fish share/man/man1/dunst.1.gz share/man/man1/dunstctl.1.gz share/man/man1/dunstify.1.gz