From nobody Wed Jun 29 15:01:13 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 2834A8724AD; Wed, 29 Jun 2022 15:01:14 +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 4LY4RG0cvXz4mt7; Wed, 29 Jun 2022 15:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656514874; 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=NNoVcksWWcVn5BYQIMBXTo1+3iKLpuBccP4M1XK6yOw=; b=OhJQwrZR15OgNqsJ2akwYU8oJDHXnr08aCNNheiYh368g6CyEexTWkOGbyUpt3SlB2EC6c kDgGoTxGz4G05l4EsUJD1K+1w3l+VOetCRM4gRVjh1V73GWyPMuqxbAbvJs0vsyzSBflWT r31E1dcHaw1WBck9ghWcmGxBpXFI4+pC5+d/B2BemMGkviWIcsH9t1L/rsbrAlGn3BPp+s 3X54QddQ4T5eaHDGmimHVBJLls+wyAgIA4XtsSgcqAK0Fvo8UJaGWqQfnnY02KDZIGOZLF EHjLpYTfpvECl/mZKidhaCJGKVbt1vHCoenXkwdoKARghoPyRcCnQHgWYJiCWQ== 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 E9F0A13AF4; Wed, 29 Jun 2022 15:01:13 +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 25TF1DPW058413; Wed, 29 Jun 2022 15:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TF1DT6058412; Wed, 29 Jun 2022 15:01:13 GMT (envelope-from git) Date: Wed, 29 Jun 2022 15:01:13 GMT Message-Id: <202206291501.25TF1DT6058412@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: 15c825be194e - main - Fix CONFLICTS_INSTALL in categories cad and chinese 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: 15c825be194e0b8a9d48226441684486600978b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656514874; 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=NNoVcksWWcVn5BYQIMBXTo1+3iKLpuBccP4M1XK6yOw=; b=tA0TphGySdQhHA9HZyF6brG6GnFhPHxonu4mVE22c6j6YMy+lmcYBhG/wmVlOYq3vIpjba pK28CPFtYxJg+OLloeMh5hwrGW+GA8lN0Xs8KMH+oi9CL03kNCrOKp21r++xa2g1On4nY3 21Rbbas7eJpeb5kMckS6hhOk7Ze9Xixgt3qGO7+SRoVFhMiCVt1wCmspbQIgCGog6tPFwk qGed6xV3KUqu+j14I/Ee85idaGvuhWRgduP8aEIzH3vIiW6SAjA3L76qpsb3ymVsJWDohE eRx7pp4ZTa4XgO3Dj58UVaZy8G1zb4RQSI0ff+gzgrS0TM582IyG9h7qZdBySQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656514874; a=rsa-sha256; cv=none; b=uUdYF3UjWik/U0+wMCFftVDt2lcpgH7jP41lY8gXZjaDAFQi087YKXP3mQpSjD6oC0lmUR +HSqJbl/BkcPc/ioA+RVrsMzJoJMgz93Ixvh28PBx3KsA9zx7bKI/gTXM08hn4vnOscFdG bYYHVYCWCRvpPu1vvP7m754C5lyeTowhMgNtOEWv4RWO/CltyNz2sM7KayIlgeJKALeGTv AELVSAXWCJYvjlfzSkfKDPsiUsjKrQU60iC9r2n3N4oB5t0KQfWJ+HgJ8+ggYW106YOePQ 1JXZEadOxJSEjz8Wmrj/leHRMC3HoxUuKmtkUq5ICQFJKEheHp7h6lulzUn/bQ== 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=15c825be194e0b8a9d48226441684486600978b6 commit 15c825be194e0b8a9d48226441684486600978b6 Author: Stefan Eßer AuthorDate: 2022-06-29 15:00:01 +0000 Commit: Stefan Eßer CommitDate: 2022-06-29 15:00:01 +0000 Fix CONFLICTS_INSTALL in categories cad and chinese Approved by: portmgr (implicit) --- cad/netgen/Makefile | 2 +- chinese/enscript/Makefile | 2 +- chinese/fcitx/Makefile | 2 +- chinese/wordpress-zh_CN/Makefile | 4 ++++ chinese/wordpress-zh_TW/Makefile | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index f488b12ffceb..0347dae9f065 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -32,7 +32,7 @@ LDFLAGS+= -lexecinfo CMAKE_OFF= USE_NATIVE_ARCH -CONFLICTS_INSTALL= libvisual netgen-lvs pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so +CONFLICTS_INSTALL= libvisual pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so OPTIONS_DEFINE= JPEG MPEG CGNS diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile index 31a9f3201fdb..66e749f05002 100644 --- a/chinese/enscript/Makefile +++ b/chinese/enscript/Makefile @@ -16,7 +16,7 @@ PKGMESSAGE= ${.CURDIR}/pkg-message USES+= ghostscript:run -CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj py*-us # bin/einfo bin/xml2json +CONFLICTS_INSTALL= enscript-a4 enscript-letter enscript-letterdj # bin/einfo bin/xml2json post-patch: @${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile index 7204c62544d6..64e15fc465a1 100644 --- a/chinese/fcitx/Makefile +++ b/chinese/fcitx/Makefile @@ -37,7 +37,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ SUB_FILES= pkg-message SUB_LIST+= PORTSDIR=${PORTSDIR} -CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons zh-scim-fcitx # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png +CONFLICTS_INSTALL= fcitx5 zh-fcitx5-chinese-addons # bin/createPYMB share/icons/hicolor/128x128/apps/fcitx.png share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png USE_GNOME= pango intltool libxml2 introspection USE_KDE= ecm diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile index 456edaabeb3b..ca11c3eead2e 100644 --- a/chinese/wordpress-zh_CN/Makefile +++ b/chinese/wordpress-zh_CN/Makefile @@ -20,6 +20,10 @@ USES= cpe php:web CPE_VERSION= ${DISTVERSION}.0 .endif USE_PHP= curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib + +CONFLICTS_INSTALL= de-wordpress fr-wordpress ru-wordpress wordpress \ + zh-wordpress-zh_TW # share/doc/wordpress/readme.html + WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} NO_ARCH= yes NO_BUILD= yes diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile index 6b949d2d40f4..c52c4c7bdc07 100644 --- a/chinese/wordpress-zh_TW/Makefile +++ b/chinese/wordpress-zh_TW/Makefile @@ -22,6 +22,8 @@ CPE_VERSION= ${DISTVERSION}.0 USE_PHP= curl exif fileinfo ftp gd hash json mysqli pcre tokenizer xml zip zlib CONFLICTS_INSTALL= ja-wordpress wordpress # share/doc/wordpress/readme.html +CONFLICTS_INSTALL= de-wordpress fr-wordpress ru-wordpress wordpress \ + zh-wordpress-zh_CN # share/doc/wordpress/readme.html WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX} NO_ARCH= yes