From nobody Wed Jun 29 16:09:16 2022 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 2796487CD0C; Wed, 29 Jun 2022 16:09:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LY5xn0cshz3DFC; Wed, 29 Jun 2022 16:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656518957; 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=ST9a9qM+TqQWBg+rABDctgJMY0xHqMphqbZp1Jhrm1Q=; b=V9jZ7MWQpEc87NuxO2DJn+A7Qv+brR3yA/9wJ6P56qmZrOu4PHrebUSi4Gu+kYUS055hkH Jq0lKInvMpEmN15TrYLleygfXn8ABJEh0lEOU9kVw28ojz/kDT8yRW9m8lTW+xha5T10CA sIiO9ms52HQTa18OgTIyEQXf8AAc41Btalr74npdCrhGH2w27Cte3LeWRYrIvpSILk3wbu gXPfTNfvnPDUq/2IDkloEtSRm0sXcGXBdtgxtHkgz+2V7TDiW6/ubvVw/l8Cop0s2y20/b bYC/mmt6qAlE9m2jQsTB7izfgSSPhvWYqzWlbpmMzWEkPaCSj50vVRniQ9CL6w== 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 E93B814CA2; Wed, 29 Jun 2022 16:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25TG9GXO044694; Wed, 29 Jun 2022 16:09:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TG9GgQ044693; Wed, 29 Jun 2022 16:09:16 GMT (envelope-from git) Date: Wed, 29 Jun 2022 16:09:16 GMT Message-Id: <202206291609.25TG9GgQ044693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 1d3149ef6ef4 - main - Fix CONFLICTS_INSTALL in the deskutils category 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d3149ef6ef4928d4138ad4511c3e7c48aadd57a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656518957; 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=ST9a9qM+TqQWBg+rABDctgJMY0xHqMphqbZp1Jhrm1Q=; b=tsjTh6mlesCL+vMXY2lVMXi8m6j0zFVlRyohE5D0jmIYyd1AXOuoxXLIwO9VDFP8UY4SCx fll2CC9RA4/YKuFa0RSrd/bKYfKTNUyn+SAJxHHpJRdxAts183Gatzou5suUttnh83R5S+ 5OFjDGbCO15bI0/TjfkgquwbFbkuzZmZU3QaRA91GNrzqM5lHEryGcTB4BjzzNw9KjREcm dfcleJYOKvZ2hiji8Oc5ua4LJdmh1vhZkHJx+NhZOeTKBZ1LDfAHnbxKr75erbk9n8v1ax f5/khpNLUbqj2GJdm/8ZfMFAmGiiS+FUo4iw9I7U1WnzaNo0XYW92TdK2c9o7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656518957; a=rsa-sha256; cv=none; b=WdBK2nYDQ8lpojaF0I3ucaTQMvsMG5xFAMBusBU1djjR4QxDO+3ED5teq0lH0IvNxd4ITo X4XJkY85pJjoIj13MieX92l9CNLPZzFjlGeRDgLQoIyRnGjGo4fVePkTJy0WxWgxeM/fSf dLo9iRo71Rvek0+oM1Im7EA6m2BmEs54yS7SmOMCRXvJrCimRgmmOO/wn3bwOy4RPISBdv UeD7dKDP8LSJiX+mFu7dA+WqgPMHgScwHJTxx5YJxKqsOqtYkIw3yZfHHPSNXGKz05DvhT yJOMaKl29wcL7ObAV7ufDWFNu628zIIbd5RBz+Jylkw0LHIque52lCiYVc7T5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d3149ef6ef4928d4138ad4511c3e7c48aadd57a commit 1d3149ef6ef4928d4138ad4511c3e7c48aadd57a Author: Stefan Eßer AuthorDate: 2022-06-29 16:08:51 +0000 Commit: Stefan Eßer CommitDate: 2022-06-29 16:08:51 +0000 Fix CONFLICTS_INSTALL in the deskutils category Approved by: portmgr (implicit) --- deskutils/deforaos-todo/Makefile | 2 +- deskutils/dfshow/Makefile | 2 ++ deskutils/howm/Makefile | 2 ++ deskutils/notification-daemon/Makefile | 2 ++ deskutils/notify-osd/Makefile | 2 +- deskutils/presage/Makefile | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/deskutils/deforaos-todo/Makefile b/deskutils/deforaos-todo/Makefile index fed638510b31..aacde88b24d4 100644 --- a/deskutils/deforaos-todo/Makefile +++ b/deskutils/deforaos-todo/Makefile @@ -23,7 +23,7 @@ MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV= MANDIR=${STAGEDIR}${MANPREFIX}/man -CONFLICTS_INSTALL= devtodo todo +CONFLICTS_INSTALL= devtodo # man/man1/todo.1.gz OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes diff --git a/deskutils/dfshow/Makefile b/deskutils/dfshow/Makefile index 5fb13e196b12..72aef70bf4dc 100644 --- a/deskutils/dfshow/Makefile +++ b/deskutils/dfshow/Makefile @@ -18,6 +18,8 @@ GH_ACCOUNT= roberthawdon GNU_CONFIGURE= yes +CONFLICTS_INSTALL= ja-mh mmh nmh nmh-devel # man/man1/show.1.gz + post-patch: @${REINPLACE_CMD} 's/-lncursesw/${NCURSESLIBS}/g' ${WRKSRC}/Makefile.am diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile index 6c90f331d16f..586f16b60036 100644 --- a/deskutils/howm/Makefile +++ b/deskutils/howm/Makefile @@ -19,6 +19,8 @@ USES= emacs GNU_CONFIGURE= yes +CONFLICTS_INSTALL= howm howm-emacs_* # share/doc/howm/README-j.html + PORTDOCS= *.html *.png PORTEXAMPLES= en/0000-00-00-000000.txt ja/0000-00-00-000000.txt diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile index c3cbe2736336..2b0428a4e231 100644 --- a/deskutils/notification-daemon/Makefile +++ b/deskutils/notification-daemon/Makefile @@ -20,6 +20,8 @@ USE_GNOME= cairo gnomeprefix gtk30 USE_XORG= x11 GNU_CONFIGURE= yes +CONFLICTS_INSTALL= notify-osd # share/dbus-1/services/org.freedesktop.Notifications.service + PORTSCOUT= limitw:1,even SUB_FILES= org.freedesktop.Notifications.service diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile index 618396f83fbb..c26069658a92 100644 --- a/deskutils/notify-osd/Makefile +++ b/deskutils/notify-osd/Makefile @@ -28,7 +28,7 @@ USE_XORG= pixman x11 GNU_CONFIGURE= yes GLIB_SCHEMAS= com.canonical.NotifyOSD.gschema.xml -CONFLICTS= xfce4-notification-daemon +CONFLICTS_INSTALL= notification-daemon # share/dbus-1/services/org.freedesktop.Notifications.service post-patch: @${REINPLACE_CMD} '/SUBDIRS =/s/tests//' ${WRKSRC}/Makefile.in diff --git a/deskutils/presage/Makefile b/deskutils/presage/Makefile index 5174de910d62..c8bb9e363af3 100644 --- a/deskutils/presage/Makefile +++ b/deskutils/presage/Makefile @@ -34,4 +34,6 @@ CONFIGURE_ARGS= --disable-documentation \ --disable-static INSTALL_TARGET= install-strip +CONFLICTS_INSTALL= soothsayer # man/man1/text2ngram.1.gz + .include