Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Feb 2017 19:51:08 +0000 (UTC)
From:      Matthew Rezny <rezny@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r434635 - head/net/qt4-network
Message-ID:  <201702221951.v1MJp8xI041732@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rezny
Date: Wed Feb 22 19:51:08 2017
New Revision: 434635
URL: https://svnweb.freebsd.org/changeset/ports/434635

Log:
  Replace USE_OPENSSL with USES=ssl and bump portrevision for SSL changes.
  This should have been part of the prior commit, oops.
  
  PR:		216781
  Approved by:	swills (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9727

Modified:
  head/net/qt4-network/Makefile

Modified: head/net/qt4-network/Makefile
==============================================================================
--- head/net/qt4-network/Makefile	Wed Feb 22 19:38:31 2017	(r434634)
+++ head/net/qt4-network/Makefile	Wed Feb 22 19:51:08 2017	(r434635)
@@ -3,7 +3,7 @@
 
 PORTNAME=	network
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6
 PKGNAMEPREFIX=	qt4-
 
@@ -15,11 +15,11 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
+USES=		ssl
 USE_QT4=	qmake_build moc_build rcc_build corelib
 QT_DIST=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
-USE_OPENSSL=	yes
 
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
@@ -55,7 +55,8 @@ post-configure:
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \
 		${WRKSRC}/lib/pkgconfig/QtNetwork.pc
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp \
+		${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp
+	${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \
 		${WRKSRC}/src/network/ssl/qsslsocket_openssl_symbols.cpp
 
 .include <bsd.port.mk>



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