svn commit: r428813 - head/irc/ircII

[Adam Weinberger]

Author: adamw
Date: Sun Dec 18 00:50:06 2016
New Revision: 428813
URL: https://svnweb.freebsd.org/changeset/ports/428813

Log:
  r428809 was, of course, not the right way to fix libssl linkage. marino
  had the right solution, which is to use the appropriate OPTIONS helper,
  which puts -L${OPENSSLLIB} in early enough that linkage works correctly.

Modified:
  head/irc/ircII/Makefile

Modified: head/irc/ircII/Makefile
==============================================================================
--- head/irc/ircII/Makefile	Sat Dec 17 23:56:02 2016	(r428812)
+++ head/irc/ircII/Makefile	Sun Dec 18 00:50:06 2016	(r428813)
@@ -27,19 +27,15 @@ SCRIPTS_DESC=	Install ircII script colle
 
 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}&/' \