From owner-svn-ports-head@freebsd.org Sat Dec 17 22:30:47 2016 Return-Path: Delivered-To: svn-ports-head@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 1F605C851B4; Sat, 17 Dec 2016 22:30:47 +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 E32DD17D; Sat, 17 Dec 2016 22:30:46 +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 uBHMUkYh015156; Sat, 17 Dec 2016 22:30:46 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBHMUkAo015155; Sat, 17 Dec 2016 22:30:46 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201612172230.uBHMUkAo015155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 17 Dec 2016 22:30:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428809 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Dec 2016 22:30:47 -0000 Author: adamw Date: Sat Dec 17 22:30:45 2016 New Revision: 428809 URL: https://svnweb.freebsd.org/changeset/ports/428809 Log: Fix build against SSL from ports. The -L${ICONV_PREFIX}/lib prevents cc from finding the correct libcrypto/libssl, so quick-fix this by only adding -L${ICONV_PREFIX}/lib if it's something other than /usr/lib. Also, use USES=ssl. PORTREVISION bump for the potential ldd change. Modified: head/irc/ircII/Makefile Modified: head/irc/ircII/Makefile ============================================================================== --- head/irc/ircII/Makefile Sat Dec 17 21:54:49 2016 (r428808) +++ head/irc/ircII/Makefile Sat Dec 17 22:30:45 2016 (r428809) @@ -3,6 +3,7 @@ PORTNAME= ircii PORTVERSION= 20151120 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://ircii.warped.com/ @@ -23,7 +24,7 @@ IRCBUG_DESC= Install ircII bug-reporting EMACS_KEYS_DESC=Use emacs meta keys EMACS_KEYS_CONFIGURE_WITH= emacs-meta-keys -OPENSSL_USE= OPENSSL=yes +OPENSSL_USES= ssl .include @@ -33,8 +34,10 @@ CONFIGURE_ARGS+= --with-openssl=${OPENSS CONFIGURE_ARGS+= --without-openssl .endif +.if ${ICONV_PREFIX} != /usr CPPFLAGS+= -I${ICONV_PREFIX}/include LDFLAGS+= -L${ICONV_PREFIX}/lib +.endif post-patch: @${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$${DESTDIR}&/' \