From owner-svn-ports-all@freebsd.org  Sun Dec 18 00:50:08 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2421CC71E11;
 Sun, 18 Dec 2016 00:50:08 +0000 (UTC)
 (envelope-from adamw@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 mx1.freebsd.org (Postfix) with ESMTPS id E223B62B;
 Sun, 18 Dec 2016 00:50:07 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBI0o7gJ072477;
 Sun, 18 Dec 2016 00:50:07 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBI0o7NM072476;
 Sun, 18 Dec 2016 00:50:07 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201612180050.uBI0o7NM072476@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sun, 18 Dec 2016 00:50:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428813 - head/irc/ircII
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Dec 2016 00:50:08 -0000

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}&/' \