git: b61e022f28f6 - main - net/rubygem-proxifier: Fix COMMENT and add CONFLICTS_INSTALL

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b61e022f28f6983f9278c5b66c90abf552c1df17

commit b61e022f28f6983f9278c5b66c90abf552c1df17
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-05-27 23:26:16 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-05-27 23:44:30 +0000

    net/rubygem-proxifier: Fix COMMENT and add CONFLICTS_INSTALL
---
 net/rubygem-proxifier/Makefile  | 4 +++-
 net/rubygem-proxifier/pkg-descr | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/rubygem-proxifier/Makefile b/net/rubygem-proxifier/Makefile
index ebe5f8f4c7e8..2b01dc3f0eca 100644
--- a/net/rubygem-proxifier/Makefile
+++ b/net/rubygem-proxifier/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Add HTTP or SOCKS proxies support and force TCPSocket to use
+COMMENT=	Add HTTP or SOCKS proxies support and force TCPSocket to use proxies
 WWW=		https://github.com/samuelkadolph/ruby-proxifier
 
 LICENSE=	MIT
@@ -16,4 +16,6 @@ NO_ARCH=	yes
 
 PLIST_FILES=	bin/pirb bin/pruby
 
+CONFLICTS_INSTALL=	rubygem-proxifier2
+
 .include <bsd.port.mk>
diff --git a/net/rubygem-proxifier/pkg-descr b/net/rubygem-proxifier/pkg-descr
index 4aa0171e93b7..2fb2eccfd43c 100644
--- a/net/rubygem-proxifier/pkg-descr
+++ b/net/rubygem-proxifier/pkg-descr
@@ -5,6 +5,6 @@ when using TCPSockets. Either manually with Proxifier::Proxy#open or by require
 "proxifier/env".
 
 The second purpose is to use ruby code that doesn't use proxies for users that
-have to use proxies.  The pruby and pirb executables are simple wrappers for
+have to use proxies. The pruby and pirb executables are simple wrappers for
 their respective ruby executables that support proxies from environment
 variables.