Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Nov 2018 18:45:56 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r485780 - branches/2018Q4/irc/bitchx
Message-ID:  <201811241845.wAOIjuku060768@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



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