Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Sep 2020 14:23:14 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r547786 - in head/net/usockets: . files
Message-ID:  <202009061423.086ENEw3036801@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sun Sep  6 14:23:13 2020
New Revision: 547786
URL: https://svnweb.freebsd.org/changeset/ports/547786

Log:
  net/usockets: Update 0.5.0 -> 0.6.0
  
  Reported by:	portscout

Deleted:
  head/net/usockets/files/patch-src_libusockets.h
Modified:
  head/net/usockets/Makefile
  head/net/usockets/distinfo
  head/net/usockets/files/patch-Makefile

Modified: head/net/usockets/Makefile
==============================================================================
--- head/net/usockets/Makefile	Sun Sep  6 14:04:03 2020	(r547785)
+++ head/net/usockets/Makefile	Sun Sep  6 14:23:13 2020	(r547786)
@@ -2,7 +2,7 @@
 
 PORTNAME=	usockets
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.0
 CATEGORIES=	net devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,19 +11,21 @@ COMMENT=	Miniscule eventing, networking & crypto for a
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c11 gmake
+USES=		compiler:c++17-lang gmake ssl # c++17 only for temp C_++ code, otherwise it is c11
 USE_GITHUB=	yes
 GH_ACCOUNT=	uNetworking
 GH_PROJECT=	uSockets
 USE_LDCONFIG=	yes
 
+MAKE_ARGS=	WITH_OPENSSL=1
+
 ALL_TARGET=	default
 
 PLIST_FILES=	include/libusockets.h \
-		lib/libusockets.so
+		lib/libuSockets.so
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/libusockets.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libusockets.so ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libuSockets.so ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>

Modified: head/net/usockets/distinfo
==============================================================================
--- head/net/usockets/distinfo	Sun Sep  6 14:04:03 2020	(r547785)
+++ head/net/usockets/distinfo	Sun Sep  6 14:23:13 2020	(r547786)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593391628
-SHA256 (uNetworking-uSockets-v0.5.0_GH0.tar.gz) = cbac10d9bfa6686224d8b0ec1bcc0ee7a2d8a53872ef74dea2aed5d0d8d679dc
-SIZE (uNetworking-uSockets-v0.5.0_GH0.tar.gz) = 50852
+TIMESTAMP = 1599401067
+SHA256 (uNetworking-uSockets-v0.6.0_GH0.tar.gz) = 999387d3653b2bc663c34aa7e973358ac4c4897dccd644553a5caab843a978a1
+SIZE (uNetworking-uSockets-v0.6.0_GH0.tar.gz) = 57590

Modified: head/net/usockets/files/patch-Makefile
==============================================================================
--- head/net/usockets/files/patch-Makefile	Sun Sep  6 14:04:03 2020	(r547785)
+++ head/net/usockets/files/patch-Makefile	Sun Sep  6 14:23:13 2020	(r547786)
@@ -1,13 +1,18 @@
---- Makefile.orig	2019-12-26 21:03:09 UTC
+--- Makefile.orig	2020-09-05 12:33:36 UTC
 +++ Makefile
-@@ -38,8 +38,8 @@ override LDFLAGS += uSockets.a
+@@ -39,12 +39,12 @@ override LDFLAGS += uSockets.a
  # By default we build the uSockets.a static library
  default:
  	rm -f *.o
 -	$(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
--	$(AR) rvs uSockets.a *.o
 +	$(CC) $(CFLAGS) -fPIC -flto -c src/*.c src/eventing/*.c src/crypto/*.c
-+	$(CC) -shared -o libusockets.so *.o
+ # For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
+ ifeq ($(WITH_OPENSSL),1)
+-	$(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++	$(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -O3 -c src/crypto/*.cpp
+ endif
+-	$(AR) rvs uSockets.a *.o
++	$(CXX) -shared -o libuSockets.so *.o -lssl
  
  # Builds all examples
  .PHONY: examples



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