Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jul 2022 07:15:23 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: a4b60f60f513 - 2022Q3 - irc/thales: always build hybrid
Message-ID:  <202207040715.2647FNVL081308@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q3 has been updated by tcberner:

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

commit a4b60f60f5131151e265860a4f1dbd801971b368
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-07-04 06:58:58 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-07-04 07:14:50 +0000

    irc/thales: always build hybrid
    
    This should fix the
       > Please enter a valid option number
    creating GBs of logfiles on the builders.
    
    Reported by:    philip
    
    (cherry picked from commit 2f9bf53fdd2d5246847e6e096bdef3a8d2d72e38)
---
 irc/thales/Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index 4fc331a89f6b..9bb3c3c8b714 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -12,26 +12,23 @@ COMMENT=	IRC to MySQL gateway
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	${LOCALBASE}/bin/ircd:irc/ircd-hybrid
+
 USES=		gmake mysql shebangfix
 SHEBANG_FILES=	examples/MRTG/thalesinfo.pl
 USE_RC_SUBR=	thales
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ircd=${_IRCD} \
+CONFIGURE_ARGS=	--with-ircd=hybrid \
 		--prefix=${PREFIX}/sbin/thales \
 		--with-mysql=${LOCALBASE} \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
 
 OPTIONS_DEFINE=	MODES DOCS EXAMPLES
-OPTIONS_RADIO=	IRCD
-OPTIONS_RADIO_IRCD=	HYBRID
 OPTIONS_DEFAULT=MODES
 MODES_DESC=		Support modes in the database
-HYBRID_DESC=	Build for ircd-hybrid
 
 MODES_CONFIGURE_OFF=	--enable-no-modes
-HYBRID_RUN_DEPENDS=	${LOCALBASE}/bin/ircd:irc/ircd-hybrid
-HYBRID_VARS=		_IRCD=hybrid IS_INTERACTIVE=yes
 
 post-patch: .SILENT
 	${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -r {} \;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207040715.2647FNVL081308>