Index: head/irc/ircII/Makefile
===================================================================
--- head/irc/ircII/Makefile	(revision 428812)
+++ head/irc/ircII/Makefile	(revision 428813)
@@ -1,53 +1,49 @@
 # Created by: torstenb
 # $FreeBSD$
 
 PORTNAME=	ircii
 PORTVERSION=	20151120
 PORTREVISION=	2
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://ircii.warped.com/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Small and high extensible IRC client
 
 LICENSE=	BSD3CLAUSE
 
 GNU_CONFIGURE=	yes
 DATADIR=	${PREFIX}/share/irc
 USES=		iconv ncurses tar:bzip2
 
 OPTIONS_DEFINE=	EMACS_KEYS HELP IRCBUG OPENSSL SCRIPTS
 OPTIONS_DEFAULT=EMACS_KEYS HELP OPENSSL SCRIPTS
 OPTIONS_SUB=	yes
 
 HELP_DESC=	Install ircII help files
 EMACS_KEYS_DESC=Use emacs meta keys
 IRCBUG_DESC=	Install ircII bug-reporting script
 SCRIPTS_DESC=	Install ircII script collection
 
 EMACS_KEYS_CONFIGURE_WITH=	emacs-meta-keys
 OPENSSL_USES=			ssl
+OPENSSL_CONFIGURE_WITH=		openssl=${OPENSSLBASE}
+OPENSSL_LDFLAGS=		-L${OPENSSLLIB}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=	--without-openssl
-.endif
-
-.if ${ICONV_PREFIX} != /usr
+# The ordering is very specific. This must come after pre.mk or
+# ircII won't link against libssl from ports
 CPPFLAGS+=	-I${ICONV_PREFIX}/include
 LDFLAGS+=	-L${ICONV_PREFIX}/lib
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$${DESTDIR}&/' \
 		-e '/^LDFLAGS =/s/$$/ -s ${ICONV_LIB}/' \
 		-e '/^INCLUDES =/s|$$| -I${ICONV_PREFIX}/include -DHAVE_ICONV_OPEN|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${MV} -f ${STAGEDIR}${PREFIX}/bin/irc-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/irc
 
 .include <bsd.port.post.mk>