From nobody Wed Jun 29 14:42:29 2022 X-Original-To: dev-commits-ports-all@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 87C2886F50D; Wed, 29 Jun 2022 14:42:30 +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 4LY41f26LZz4kDW; Wed, 29 Jun 2022 14:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656513750; 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=hnGUi4qbCbWOtsLG632qjlY+pufHNqhAFFbP28qAz7g=; b=H2A9KXV8GS9XnwUIlZy6UnjxEEWMyzVqTZmNKKRJvyjnVtmwLElSW+RdM63jSuP/OOlo6H mUob7q+OMq1V0nPpqaFgHi7MTc2+0LUG1ly1edFCSV1iVXiPuYnjChqjoyms5SmItILF6y iUEYXeuaF8RtcMs1pvHCZNTGowtUPB48zzwGEF+YSFi9xZFWXA3RoP5jPzP6Anbhplm8It nhisO3iXTjfPDuM6K+SWjUQRInUH7e4+f/Iq1tjXpGPGIatWH+2MBKVnsV0DsLGOo0IHyh QpKLiFtS9oWOuOSMGRVC2+3Q7UekuElxm5jc2PPfpDbyM2aE8zU4makEGvwtpA== 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 A88A9139BA; Wed, 29 Jun 2022 14:42:29 +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 25TEgTsw034490; Wed, 29 Jun 2022 14:42:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TEgTkT034489; Wed, 29 Jun 2022 14:42:29 GMT (envelope-from git) Date: Wed, 29 Jun 2022 14:42:29 GMT Message-Id: <202206291442.25TEgTkT034489@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: d11ee7cc646e - main - Fix CONFLICTS_INSTALL in archivers, astro, and audio List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: d11ee7cc646e0506089d2d344eef1e1a83d3a978 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656513750; 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=hnGUi4qbCbWOtsLG632qjlY+pufHNqhAFFbP28qAz7g=; b=d5YETG84dNxzsJz3vjmXSZScC5xS1Xf2tWOsPshLIqa8Tgen5oqGLEdVLsTBBk4S38BH0R QzTzNAxGY3cLSm4aeFobF7eE2yIvHm1xfm9mpyiHWeLALlPR2ZwRgXfvNdm5XCyuKtGERA Jv3ls4HO9x5VdvgHKHugFn0uJXgfz67CbhheMmUwp+fOLtIY40AKJcbKOHxy1ZLDBnRG1n F99gR7eUacuvPulcx2KQ1KmkRAT8AClNgVxgiHDkfzNpfIUNUmdZl6Sjmbo0O+dUtPhw9Q 6DScNuYG1jlC+cChXHoOkWU1N0kHkT4k1xWRIMtIt2IckSw5jefWi5D/hYV5Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656513750; a=rsa-sha256; cv=none; b=j88jZaGOaEBOPlG+2iEZ4ujL2j8Uj3wiYO16fxqivsg/NSlk2v3Mn7hiHsQbIxNZSC5Pyh BHj7HOoW+7jmDs7SBQ2HpakObKB6dqZ2Yp3LYlqr114T3GtGH76dpWkv3NcB/xL5HShDbr ALmiyRPnukkJoCFRogQ0LYaR9d7zjFX1OusUXP9MOnRQcrpDhtC/z1OxaAst7Xd1jSZ2qH TgThkzKPmvq1Z4dJlL88GFEnkK6luQJ4OyRFDH2Tztusja3a/XteedNg2VEN1XjutwXXMJ 9saV8vHev8IrrZYDG1iDYRz6ripbae7GViYbcMA5bwAOLwqCO0vliMu2OrPzHg== 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=d11ee7cc646e0506089d2d344eef1e1a83d3a978 commit d11ee7cc646e0506089d2d344eef1e1a83d3a978 Author: Stefan Eßer AuthorDate: 2022-06-29 14:40:54 +0000 Commit: Stefan Eßer CommitDate: 2022-06-29 14:42:06 +0000 Fix CONFLICTS_INSTALL in archivers, astro, and audio Approved by: portmgr (implict) --- archivers/lua-lzlib/Makefile | 2 +- archivers/zutils/Makefile | 2 +- astro/celestia/Makefile | 2 +- astro/match/Makefile | 2 +- audio/julius/Makefile | 2 +- audio/mp3blaster/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archivers/lua-lzlib/Makefile b/archivers/lua-lzlib/Makefile index 74eb73f24f50..1942e1c79dc0 100644 --- a/archivers/lua-lzlib/Makefile +++ b/archivers/lua-lzlib/Makefile @@ -17,7 +17,7 @@ CMAKE_ARGS= -DINSTALL_LMOD="${LUA_MODSHAREDIR}" \ -DINSTALL_DOC="${DOCSDIR}" \ -DINSTALL_TEST="${EXAMPLESDIR}" -CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}zlib lua[0-9][0-9]-lzlib # lib/lua/5.1/zlib.so share/doc/lzlib/README +CONFLICTS_INSTALL= lua[0-9][0-9]-lzlib lua[0-9][0-9]-zlib # lib/lua/5.1/zlib.so share/doc/lzlib/README OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile index 13322d112a15..80d9048ef6a2 100644 --- a/archivers/zutils/Makefile +++ b/archivers/zutils/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 USES= cpe tar:lz GNU_CONFIGURE= yes -CONFLICTS_INSTALL= gzip openzfs # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz +CONFLICTS_INSTALL= gzip # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz INSTALL_TARGET= install-strip CPE_VENDOR= nongnu diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index 1032e58c7ca8..542ce4d5165e 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -28,7 +28,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread UI_LIST= glut gtk gnome CELESTIA_UI?= glut -CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|} +CONFLICTS_INSTALL= ${UI_LIST:S|^|celestia-|} # Celestia provides different UI frontends; you should pick one that suits # you best by setting CELESTIA_UI variable. Possible values are: diff --git a/astro/match/Makefile b/astro/match/Makefile index 8ef95524aabe..6565e91d00e8 100644 --- a/astro/match/Makefile +++ b/astro/match/Makefile @@ -13,6 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -CONFLICTS= avenger schilyutils # bin/match man/man1/match.1.gz +CONFLICTS_INSTALL= avenger # man/man1/match.1.gz .include diff --git a/audio/julius/Makefile b/audio/julius/Makefile index 42737006edba..54625d09493f 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USES= iconv perl5 shebangfix SHEBANG_FILES= jclient-perl/jclient.pl -CONFLICTS_INSTALL= generate julius-caesariii php*-pear-Text_Highlighter # bin/generate bin/julius +CONFLICTS_INSTALL= generate # bin/generate bin/julius CONFIGURE_ENV= ac_cv_path_PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index cba35c7387c9..f9d7d022c6c4 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake localbase:ldflags ncurses GNU_CONFIGURE= yes -CONFLICTS_INSTALL= p5-MP3-Tag-Utils splay # bin/mp3tag bin/splay +CONFLICTS_INSTALL= splay # bin/mp3tag bin/splay OPTIONS_DEFINE= DOCS LIRC NAS SDL SIDPLAY VORBIS OPTIONS_DEFAULT= SIDPLAY VORBIS