From nobody Tue Nov 01 15:21:19 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 4N1tyl2nH8z4gYwb; Tue, 1 Nov 2022 15:21:19 +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 4N1tyl2LnWz3s4m; Tue, 1 Nov 2022 15:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667316079; 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=9Yl8guYWVJBCQkuXoU+Oq6XfLHPAsKc5rjRO96RqBBk=; b=Go6skbAnlsbxTXIIg9/lnHBDXtmePcGtcb6wJb9zvJvXbOcOHnGhFy00/yP9Ed2whdukYf EnBr2rwD4QULpa0CQDhDcZQFOdgRXxeHYzZkIUVMbeO/qmH53EjFqMTfJXmyz+b1D29bn9 OtLWAHz2vbLg6/YsLvzM+Wc7EWWhSUEqr3n/N1jWIaJnOwJ9DavJJs5gvWp5eL6t61v6/C 0vT8XM7imZNjpG0W9GSlSjHqsg8/G+JFJEfzU4Y3ZAUBVF9URMm3THi5x89Vq/JDGcoq+y NzsDoouXzvusuFaCwt8sMKYWe/YTNx1KfNyiACMAPDwOpwdrL0rzeiU3p096vA== 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 4N1tyl1NxNzLGY; Tue, 1 Nov 2022 15:21:19 +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 2A1FLJB1082452; Tue, 1 Nov 2022 15:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1FLJsR082451; Tue, 1 Nov 2022 15:21:19 GMT (envelope-from git) Date: Tue, 1 Nov 2022 15:21:19 GMT Message-Id: <202211011521.2A1FLJsR082451@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: ee06ac7a6cc1 - main - math/libxls, textproc/catdoc: add mutual conflicts 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee06ac7a6cc1618d3268161b04bed3c30b3705eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667316079; 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=9Yl8guYWVJBCQkuXoU+Oq6XfLHPAsKc5rjRO96RqBBk=; b=a0roQaNefY5EnvN9fA5AvQg8tYc1bgrScfQqzixI1pyEQt1AnErFoR3VF2P9MN0Rw/vgUL WvTVSmcntyJ3IRu2W7LHsWnqmPqV1Jq1ocg6cmUwk44NqB1sS+liSSfA5CQnrq2YBlejhM dxBzPbuRfOSva/ObryNROLrCXdo8Wb56my4vmwI+/szpVBVz9FpUoUO/dt9eUiDybXbaxu RXj24hoE4Am7k0lk92i8y0axKOymRkqCgu3i1xPa6HDAF/Y47vnLF6iOWpWovL+53jrhke WS8lBnteR4RVIPEjZmm4dqq7rLRh1Ye3e2sKmbmRnykFLfkkhvhMcqTLSLz0qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667316079; a=rsa-sha256; cv=none; b=OTRrAQ4T+zTj+QFhKsBNJXF41yJZ+HSiyhjHSG+RZ/maZIdjegWAzenHzLEZaGDKvX0nNw 8D2DYMLzMyPJPkQaErN0DN1F4aw42GmpfHKXpgJLM656RY0krsTNuTgS3PprcKE8XX1VYF tDt4K9XWaw3gR7Ll+wlztr1uyU61Nru6UCFISC8ZqyFk72v0XF8TZjmvD0dm6JlkpBPySs mKtu/VSqtpP5InXRQdbjd/fdt2FLpdwi4Y2zU6VILjAOt+7xCAQ7hfrzjvJVpGw5QWDpbM CE+Xdax8Bx9UtRpfW3mpVXHfbegePyog2oflKbVLYB0EcZ9pMyFmxyihZeZZrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee06ac7a6cc1618d3268161b04bed3c30b3705eb commit ee06ac7a6cc1618d3268161b04bed3c30b3705eb Author: Dmitry Marakasov AuthorDate: 2022-11-01 15:18:44 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-01 15:20:53 +0000 math/libxls, textproc/catdoc: add mutual conflicts The ports conflict on bin/xls2csv. While here, a couple of minor cosmetic fixes. PR: 248294 Submitted by: uzsolt@uzsolt.hu Approved by: maintainer timeout (bapt, 2+ years) --- math/libxls/Makefile | 4 +++- textproc/catdoc/Makefile | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/math/libxls/Makefile b/math/libxls/Makefile index 50775156c8f9..7e7d2add3b0f 100644 --- a/math/libxls/Makefile +++ b/math/libxls/Makefile @@ -9,9 +9,11 @@ WWW= https://github.com/libxls/libxls LICENSE= BSD2CLAUSE -USES= compiler:c++11-lang cpe libtool +USES= compiler:c++11-lang cpe libtool CPE_VENDOR= ${PORTNAME}_project +CONFLICTS_INSTALL= catdoc + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile index 1467ceb509fc..e593a403a661 100644 --- a/textproc/catdoc/Makefile +++ b/textproc/catdoc/Makefile @@ -2,7 +2,7 @@ PORTNAME= catdoc PORTVERSION= 0.95 CATEGORIES= textproc MASTER_SITES= http://ftp.wagner.pp.ru/pub/catdoc/ \ - http://mirror.amdmi3.ru/distfiles/ + https://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= MS Word/Excel converter to plain ASCII or TeX. TK viewer included @@ -11,11 +11,13 @@ WWW= https://www.wagner.pp.ru/~vitus/software/catdoc/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +USES= cpe gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-install-root="${STAGEDIR}" -USES= cpe gmake CPE_VENDOR= fossies +CONFLICTS_INSTALL= libxls + PORTDATA= * OPTIONS_DEFINE= WORDVIEW