From nobody Wed Jun 28 17:43:23 2023 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 4QrppM6vyCz4k9Qb; Wed, 28 Jun 2023 17:43:23 +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 4QrppM6GZTz3xD7; Wed, 28 Jun 2023 17:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687974203; 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=oLPAV+8xnN6oXl9eBihj69h0Wl2oiY5PZmH/joP07dc=; b=BawKsyGwb+VTwrNCKP/3gRl95GMtcb3KgZwMmUyCmsk6qT+0qbUFFI3sbEv36ASUCPGKNS +na6A1g486iN5Y5hEKzLDZ65Dgi6hz5TEgvlGQwe4zzmXhiCy8mvPhHQPZBMDKGiTkSacv +P7+RSwM8FVnU6jDc46GJ4muYA8/tdFl8Ep/gVElsyD90wP6pPJkrwFRjZZ0/mEU6TFcJ9 Evk9wAFowHSHz1d9uxY2AgdqtdbPNP8wIpoN3DGyKQzyrGEcsYVelpdmUp05jzak3yq5zy 1PuJm/0XqkTRWk/yhQx5eGPih+u1odbgUxQncI7GLxOR6+BGP5vkOqCQmxrrnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687974203; 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=oLPAV+8xnN6oXl9eBihj69h0Wl2oiY5PZmH/joP07dc=; b=THYU8BEAjjYep4xUkWsu72jP4nbf+a5lD+IJIGK19a94zZ0ekcctvB2nJq5T62SMalk80T kf014OWTyBXW1xYMA1vWaQT4XE/8ihS7x74wF/HLqufss9epT4B1Qmg8rS94xfQSgpyvmY gLA9YWonAVLk75HiGEFhSXMRBOcI+9fNxxqs+jjkFFIGWo0TFsD5zLBdOv1QbeQ6wW1IAz XEWOvqv63L21kFceQQdpsqQFbok5wPXVydiF1ZBhZ2zavELiCqagdJt+je4asY9+yyA5H/ ZxstCX54GIBnSVVjauqtwq3zl9luq2zI8OsNN2ODfMhfHE5wH8/4eHWWEBcE6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687974203; a=rsa-sha256; cv=none; b=H/yVE6XQhWEG20F1Ep8VKUbRMg0XO7MoBDymD9hzdJBC0GfkcO003EMv8pD0ThTSoUdd0Q rUtkXQ/jgVYQ2DWtnUcBPe+nzi9XLCKb+U8uYoqFmo3J9jutdVJ5EmLz/RbN6qIbXQDWGd s3PI8CF5Kygyn76gvOsvlDGiE2KEZceQp9k+ys8rt+H46qP5JMw6a3ywiV4toFCWwh3U4t xKoXAZrKisqgnr/HrSw1rasHmwt1HSy15BdCvbY2EWwcUtCtoUtuCTWddrHdnLSmYKuAUZ inJHiPgzTkYHHwCgxXqnPlmgkSoXk9I2lOvbZrcxfr0aCTjfANdyIejLVBPI0A== 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 4QrppM4zQQzjh8; Wed, 28 Jun 2023 17:43:23 +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 35SHhN0m057879; Wed, 28 Jun 2023 17:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35SHhN31057878; Wed, 28 Jun 2023 17:43:23 GMT (envelope-from git) Date: Wed, 28 Jun 2023 17:43:23 GMT Message-Id: <202306281743.35SHhN31057878@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: fdc58defc52f - main - converters/unix2dos: mark install conflict with converters/dos2unix 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdc58defc52fcafb84e22fc729fe2466cdb68339 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdc58defc52fcafb84e22fc729fe2466cdb68339 commit fdc58defc52fcafb84e22fc729fe2466cdb68339 Author: Dimitry Andric AuthorDate: 2023-06-28 17:42:16 +0000 Commit: Dimitry Andric CommitDate: 2023-06-28 17:42:18 +0000 converters/unix2dos: mark install conflict with converters/dos2unix PR: 271998 Reviewed by: eduardo MFH: 2023Q2 --- converters/unix2dos/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile index 6e3bfa09a004..b9b1a74902f0 100644 --- a/converters/unix2dos/Makefile +++ b/converters/unix2dos/Makefile @@ -1,5 +1,6 @@ PORTNAME= unix2dos PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= converters MASTER_SITES= LOCAL/ehaupt @@ -10,6 +11,8 @@ PLIST_FILES= bin/dos2unix bin/unix2dos \ man/man1/unix2dos.1.gz man/man1/dos2unix.1.gz NO_WRKSUBDIR= yes +CONFLICTS_INSTALL= dos2unix + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${STAGEDIR}${PREFIX}/bin/unix2dos ${LN} -f ${STAGEDIR}${PREFIX}/bin/unix2dos ${STAGEDIR}${PREFIX}/bin/dos2unix