Index: branches/2018Q4/irc/bitchx/Makefile
===================================================================
--- branches/2018Q4/irc/bitchx/Makefile	(revision 485779)
+++ branches/2018Q4/irc/bitchx/Makefile	(revision 485780)
@@ -1,76 +1,75 @@
 # Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>
 # $FreeBSD$
 
 PORTNAME=	bitchx
 PORTVERSION=	1.2.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES+=	irc
 MASTER_SITES=	SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	freebsd@bitchx.org
 COMMENT=	Feature-rich scriptable IRC client
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=		cpe gmake ncurses
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
 		--datadir="${PREFIX}/share" \
 		--libdir="${PREFIX}/share"
 LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_SUB=	yes
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 DOCSDIR=	${PREFIX}/share/bx/help
 PORTDOCS=	*
 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}
 	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 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
 
 post-patch-TOGGLES-on:
 	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_AWAY ON|DEFAULT_AUTO_AWAY OFF|' \
 		${WRKSRC}/include/config.h
 	${REINPLACE_CMD} -e 's|DEFAULT_KICK_OPS ON|DEFAULT_KICK_OPS OFF|' \
 		${WRKSRC}/include/config.h
 	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_REJOIN ON|DEFAULT_AUTO_REJOIN OFF|' \
 		${WRKSRC}/include/config.h
 
 .include <bsd.port.mk>
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 485779)
+++ branches/2018Q4	(revision 485780)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r483042,483384