Date: Wed, 28 Jun 2023 17:43:23 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fdc58defc52f - main - converters/unix2dos: mark install conflict with converters/dos2unix Message-ID: <202306281743.35SHhN31057878@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=fdc58defc52fcafb84e22fc729fe2466cdb68339 commit fdc58defc52fcafb84e22fc729fe2466cdb68339 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-06-28 17:42:16 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306281743.35SHhN31057878>