Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jun 2015 13:24:55 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r389842 - branches/2015Q2/irc/hexchat
Message-ID:  <201506161324.t5GDOt5L070763@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506161324.t5GDOt5L070763>