svn commit: r428809 - head/irc/ircII

[Adam Weinberger]

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 <bsd.port.pre.mk>
 
@@ -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}&/' \