From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 16 13:24:55 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4781727E;
 Tue, 16 Jun 2015 13:24:55 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 354FE956;
 Tue, 16 Jun 2015 13:24:55 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5GDOtf9070764;
 Tue, 16 Jun 2015 13:24:55 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5GDOt5L070763;
 Tue, 16 Jun 2015 13:24:55 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201506161324.t5GDOt5L070763@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 16 Jun 2015 13:24:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r389842 - branches/2015Q2/irc/hexchat
X-SVN-Group: ports-branches
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2015 13:24:55 -0000

Author: amdmi3
Date: Tue Jun 16 13:24:54 2015
New Revision: 389842
URL: https://svnweb.freebsd.org/changeset/ports/389842

Log:
  MFH: r389839
  
  - Fix build on pre-10.x by requiring newer OpenSSL version from ports
  - Fix build with NLS disabled by adding gettext-tools dependency
  
  Approved by:	ports-secteam (erwin)

Modified:
  branches/2015Q2/irc/hexchat/Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/irc/hexchat/Makefile
==============================================================================
--- branches/2015Q2/irc/hexchat/Makefile	Tue Jun 16 13:18:03 2015	(r389841)
+++ branches/2015Q2/irc/hexchat/Makefile	Tue Jun 16 13:24:54 2015	(r389842)
@@ -20,6 +20,7 @@ CONFIGURE_ARGS+=--enable-openssl --enabl
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
+USE_OPENSSL=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lX11
@@ -51,6 +52,7 @@ DOAT_CONFIGURE_ENABLE=	doat
 FISHLIM_CONFIGURE_ENABLE=	fishlim
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
+NLS_USES_OFF=		gettext-tools # doesn't build otherwise
 NOTIFY_RUN_DEPENDS=	notify-send:${PORTSDIR}/devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	libnotify
 PERL_CONFIGURE_ENABLE=	perl
@@ -61,6 +63,12 @@ TEXTFE_CONFIGURE_ENABLE=	textfe
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+WITH_OPENSSL_PORT=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if ${PORT_OPTIONS:MCA_BUNDLE}
 CA_BUNDLE=	"${LOCALBASE}/share/certs/ca-root-nss.crt"
 .else
@@ -93,4 +101,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>