From owner-svn-ports-head@freebsd.org Tue Jan 8 12:16:52 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20775149E2DA; Tue, 8 Jan 2019 12:16:52 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 879A387BB6; Tue, 8 Jan 2019 12:16:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 770BA27848; Tue, 8 Jan 2019 12:16:51 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x08CGpoc043951; Tue, 8 Jan 2019 12:16:51 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x08CGpr3043950; Tue, 8 Jan 2019 12:16:51 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201901081216.x08CGpr3043950@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 8 Jan 2019 12:16:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489674 - head/irc/thales X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/irc/thales X-SVN-Commit-Revision: 489674 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 879A387BB6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 12:16:52 -0000 Author: tobik Date: Tue Jan 8 12:16:51 2019 New Revision: 489674 URL: https://svnweb.freebsd.org/changeset/ports/489674 Log: irc/thales: Unbreak MODES option - Convert to options helpers - Switch to USES=mysql - Remove obsolete comment that no longer seems to be relevant - Fix CONFIGURE_ARGS assignment Modified: head/irc/thales/Makefile Modified: head/irc/thales/Makefile ============================================================================== --- head/irc/thales/Makefile Tue Jan 8 11:54:12 2019 (r489673) +++ head/irc/thales/Makefile Tue Jan 8 12:16:51 2019 (r489674) @@ -3,7 +3,7 @@ PORTNAME= thales PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= irc MASTER_SITES= GNU @@ -13,12 +13,16 @@ COMMENT= GNU Thales -- An IRC to MySQL gateway LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -USES= gmake shebangfix +USES= gmake mysql shebangfix SHEBANG_FILES= examples/MRTG/thalesinfo.pl -USE_MYSQL= yes USE_RC_SUBR= thales +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-ircd=${_IRCD} \ + --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 IRCDRU UNREAL @@ -28,31 +32,13 @@ HYBRID_DESC= Build for ircd-hybrid IRCDRU_DESC= Build for ircd-ru UNREAL_DESC= Build for unreal ircd +MODES_CONFIGURE_OFF= --enable-no-modes HYBRID_RUN_DEPENDS= ${LOCALBASE}/bin/ircd:irc/ircd-hybrid +HYBRID_VARS= _IRCD=hybrid IS_INTERACTIVE=yes IRCDRU_RUN_DEPENDS= ${LOCALBASE}/sbin/ircd:irc/ircd-ru +IRCDRU_VARS= _IRCD=ircdru IS_INTERACTIVE=yes UNREAL_RUN_DEPENDS= ${LOCALBASE}/libexec/ircd:irc/unreal - -# Currently, not all supported IRCDs are handled here, only the ones -# I could find corresponding RUN_DEPENDS in our Ports Collection. -.include -.if ${PORT_OPTIONS:MHYBRID} -_IRCD= hybrid -IS_INTERACTIVE= yes -.elif ${PORT_OPTIONS:MIRCDRU} -_IRCD= ircdru -IS_INTERACTIVE= yes -.else -_IRCD= unreal -.endif - -# ``Assign with expansion'' is needed here, otherwise we cannot override -# WITH_IRCD value supplied as make(1) argument (which can be bogus). -CONFIGURE_ARGS:= --with-ircd=${_IRCD} \ - --prefix=${PREFIX}/sbin/thales \ - --with-mysql=${LOCALBASE} \ - --with-mysql-libraries=${LOCALBASE}/lib/mysql - -MODES_CONFIGURE_OFF= --enable-no-modes +UNREAL_VARS= _IRCD=unreal post-patch: .SILENT ${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -r {} \;