From owner-svn-ports-branches@freebsd.org Sat Nov 24 18:45:57 2018 Return-Path: Delivered-To: svn-ports-branches@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 7FD6611352DA; Sat, 24 Nov 2018 18:45:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26F9F86F54; Sat, 24 Nov 2018 18:45:57 +0000 (UTC) (envelope-from riggs@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 0937311DA7; Sat, 24 Nov 2018 18:45:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOIjuEa060769; Sat, 24 Nov 2018 18:45:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOIjuku060768; Sat, 24 Nov 2018 18:45:56 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201811241845.wAOIjuku060768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 24 Nov 2018 18:45:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485780 - branches/2018Q4/irc/bitchx X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q4/irc/bitchx X-SVN-Commit-Revision: 485780 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 26F9F86F54 X-Spamd-Result: default: False [1.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.64)[0.643,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.58)[0.580,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 18:45:57 -0000 Author: riggs Date: Sat Nov 24 18:45:56 2018 New Revision: 485780 URL: https://svnweb.freebsd.org/changeset/ports/485780 Log: MFH: r483042 r483384 Unbreak the build against newer versions of OpenSSL where they had removed SSLeay() from libcrypto so configure test for it now fails. Check against ERR_get_error() instead. PR: 232550 - Remove BROKEN_SSL line (should've been part of r483042) - Cleanup options block a bit and use our standard LANG_HE option for Hebrew language support Approved by: ports-secteam (riggs) Modified: branches/2018Q4/irc/bitchx/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/irc/bitchx/Makefile ============================================================================== --- branches/2018Q4/irc/bitchx/Makefile Sat Nov 24 18:30:53 2018 (r485779) +++ branches/2018Q4/irc/bitchx/Makefile Sat Nov 24 18:45:56 2018 (r485780) @@ -31,27 +31,26 @@ DATADIR= ${PREFIX}/share/bx MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= DOCS HEBREW IPV6 LATIN PLUGINS SSL TOGGLES +OPTIONS_DEFINE= DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES +OPTIONS_DEFAULT= PLUGINS SSL LATIN_DESC= Recommended for ISO-8859-1 display PLUGINS_DESC= Build a handful of BitchX plugins -HEBREW_DESC= Add support for hebrew language TOGGLES_DESC= Disable annoyance toggles -OPTIONS_DEFAULT= PLUGINS SSL IPV6_CONFIGURE_ENABLE= ipv6 SSL_CONFIGURE_WITH= ssl SSL_USES= ssl -SSL_VARS= BROKEN_SSL=openssl-devel -PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" +PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" PLUGIN_LIST= abot acro arcfour autocycle blowfish cavlink cdrom encrypt \ europa fserv hint nap nicklist pkga possum qbx qmail wavplay post-patch: ${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e 's|SSLeay|ERR_get_error|' ${WRKSRC}/configure post-patch-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -61,7 +60,7 @@ post-patch-LATIN-on: ${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \ ${WRKSRC}/include/config.h -post-patch-HEBREW-on: +post-patch-LANG_HE-on: ${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \ ${WRKSRC}/include/config.h