Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-11-11 Thread Stuart Henderson 
On 2021/11/11 12:23, Gonzalo L. Rodriguez wrote:
> On Wed, 10 Nov 2021 at 22:04:24 +, Stuart Henderson wrote:
> > On 2021/11/10 21:55, Gonzalo Rodriguez wrote:
> > > tgz attached
> > > 
> > > Looks good?
> > > 
> > > On 11/10/21 18:51, Stuart Henderson wrote:
> > > > On 2021/11/10 12:30, Aisha Tammy wrote:
> > > > > 
> > > > > > Updated tgz attached.
> > > > > 
> > > > > ping for the lmdbxx tarball.
> > > > > 
> > > > > > Attaching the same diffs as separate files on request from gonzalo@
> > > > > > 
> > > > > > Can be used after Stuart sends the tgz for lmdbxx.
> > > > > > 
> > > > > > Aisha
> > > > > 
> > > > 
> > > > Can't find it any more, I expect I cleaned mystuff. Anyway I described 
> > > > the
> > > > changes in the email with it.
> > > > 
> > 
> > readme is for ${PREFIX}/share/doc not ${PREFIX}/share/examples
> > 
> 
> Right! New attached.
> 
> -- 
> 
>%gonzalo


ok.

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-11-11 Thread Gonzalo L. Rodriguez 
On Wed, 10 Nov 2021 at 22:04:24 +, Stuart Henderson wrote:
> On 2021/11/10 21:55, Gonzalo Rodriguez wrote:
> > tgz attached
> > 
> > Looks good?
> > 
> > On 11/10/21 18:51, Stuart Henderson wrote:
> > > On 2021/11/10 12:30, Aisha Tammy wrote:
> > > > 
> > > > > Updated tgz attached.
> > > > 
> > > > ping for the lmdbxx tarball.
> > > > 
> > > > > Attaching the same diffs as separate files on request from gonzalo@
> > > > > 
> > > > > Can be used after Stuart sends the tgz for lmdbxx.
> > > > > 
> > > > > Aisha
> > > > 
> > > 
> > > Can't find it any more, I expect I cleaned mystuff. Anyway I described the
> > > changes in the email with it.
> > > 
> 
> readme is for ${PREFIX}/share/doc not ${PREFIX}/share/examples
> 

Right! New attached.

-- 

 %gonzalo


lmdbxx.tgz
Description: Binary data

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-11-10 Thread Stuart Henderson 
On 2021/11/10 21:55, Gonzalo Rodriguez wrote:
> tgz attached
> 
> Looks good?
> 
> On 11/10/21 18:51, Stuart Henderson wrote:
> > On 2021/11/10 12:30, Aisha Tammy wrote:
> > > 
> > > > Updated tgz attached.
> > > 
> > > ping for the lmdbxx tarball.
> > > 
> > > > Attaching the same diffs as separate files on request from gonzalo@
> > > > 
> > > > Can be used after Stuart sends the tgz for lmdbxx.
> > > > 
> > > > Aisha
> > > 
> > 
> > Can't find it any more, I expect I cleaned mystuff. Anyway I described the
> > changes in the email with it.
> > 

readme is for ${PREFIX}/share/doc not ${PREFIX}/share/examples

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-11-10 Thread Gonzalo Rodriguez 

tgz attached

Looks good?

On 11/10/21 18:51, Stuart Henderson wrote:

On 2021/11/10 12:30, Aisha Tammy wrote:



Updated tgz attached.


ping for the lmdbxx tarball.


Attaching the same diffs as separate files on request from gonzalo@

Can be used after Stuart sends the tgz for lmdbxx.

Aisha




Can't find it any more, I expect I cleaned mystuff. Anyway I described the
changes in the email with it.


lmdbxx.tgz
Description: Binary data

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-11-10 Thread Stuart Henderson 
On 2021/11/10 12:30, Aisha Tammy wrote:
> 
> > Updated tgz attached.
> 
> ping for the lmdbxx tarball.
> 
> > Attaching the same diffs as separate files on request from gonzalo@
> > 
> > Can be used after Stuart sends the tgz for lmdbxx.
> > 
> > Aisha
> 

Can't find it any more, I expect I cleaned mystuff. Anyway I described the
changes in the email with it.

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-11-03 Thread Gonzalo Rodriguez 




On 10/26/21 23:10, Stuart Henderson wrote:

On 2021/10/26 11:04, aisha wrote:

On 21/10/26 02:52PM, Stuart Henderson wrote:

there were some other comments about the patches in my mail



Oops, sorry. I missed that.

I've changed the lmdbxx install function to the simpler one line.


Thanks. Couple more tweaks; rewrap DESCR as the lines were a bit
narrow, and install the readme. Updated tgz attached. This is
OK sthen@ if someone would like to import.


I am OK with them.

I will commit it soon, sorry for the delay.




For the usockets port, instead of making a diff to the provided
Makefile from upstream, I've changed the port to use a different
Makefile.obsd, which is a lot simpler than the upstream one.
Upstream Makefile, does not create a shared lib, it manually specifies
the C++ library to use (-lstdc++), sets optimzation flags and does
not create a pkg-config file, among other things.
It was easier to create a simple different Makefile and keep that
as a patch. Hopefully thats acceptable.
Unfortunately, upstream is not going to accept any changes to their
Makefile to standardize it (I've asked them multiple times to even
just create a shared library and have been declined).


Oh I remember about that upstream now. Yes that's probably for the best
and it's much simpler this way. Will look at getting that in when lmdbxx
is imported or ok'd.



This should be the best compromise without overcomplicating our
patches.

Aisha

diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..865795d0e1e 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,38 +3,29 @@
  COMMENT   =   eventing, networking & crypto for async applications
  CATEGORIES =  net
  
-VERSION =	0.6.0

-REVISION = 1
-
-DISTNAME = usockets-${VERSION}
-PKGNAME =  ${DISTNAME:L}
-
-SHARED_LIBS =  usockets 1.0
+SHARED_LIBS =  usockets 2.0
  
  GH_ACCOUNT =	uNetworking

  GH_PROJECT =  uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+GH_TAGNAME =   v0.8.1
+PKGNAME =  ${DISTNAME:L}
  
  MAINTAINER =	Aisha Tammy 
  
  # Apache 2.0

  PERMIT_PACKAGE =  Yes
  
-WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv

+WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
  
  # C11 C++17

  COMPILER =base-clang ports-gcc
  
  LIB_DEPENDS =	devel/libuv
  
-USE_GMAKE =	Yes

-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_FILE =Makefile.obsd
+
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
  
-NO_TEST =	Yes

+# tests need A LOT of file desrciptors ~5000-6000
  
  .include 

diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..a437989a34e 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
+SIZE (uSockets-0.8.1.tar.gz) = 65470
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
deleted file mode 100644
index e718b65a265..000
--- a/net/usockets/patches/patch-Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
-
-add shared + static lib + pkg-config file
-remove -flto -O3
-
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -1,60 +1,40 @@
--# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
--# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
--ifeq ($(WITH_OPENSSL),1)
--  override CFLAGS += -DLIBUS_USE_OPENSSL
--  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
--  override LDFLAGS += -lssl -lcrypto -lstdc++
--else
--  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
--  ifeq ($(WITH_WOLFSSL),1)
--  # todo: change these
--  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
--  override LDFLAGS += -L/usr/local/lib -lwolfssl
--  else
--  override CFLAGS += -DLIBUS_NO_SSL
--  endif
--endif
-+DESTDIR ?=
-
--# WITH_LIBUV=1 builds with libuv as event-loop
--ifeq ($(WITH_LIBUV),1)
--  override CFLAGS += -DLIBUS_USE_LIBUV
--  override LDFLAGS += -luv
--endif
-+PREFIX ?= "/usr/local"
-+LIBDIR ?= "$(PREFIX)/lib"
-+INCLUDEDIR ?= "$(PREFIX)/include"
-
--# WITH_GCD=1 builds with libdispatch as event-loop
--ifeq ($(WITH_GCD),1)
--  override CFLAGS += -DLIBUS_USE_GCD
--  override LDFLAGS += -framework CoreFoundation
--endif
-+# OpenBSD specific library version
-+LIBTARGET ?=  libusockets.so.$(LIBusockets_VERSION)
-
--# WITH_ASAN builds with sanitizers
--ifeq ($(WITH_ASAN),1)
--  override CFLAGS += -fsanitize=address -g
--

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-26 Thread Stuart Henderson 
On 2021/10/26 11:04, aisha wrote:
> On 21/10/26 02:52PM, Stuart Henderson wrote:
> > there were some other comments about the patches in my mail
> > 
> 
> Oops, sorry. I missed that.
> 
> I've changed the lmdbxx install function to the simpler one line.

Thanks. Couple more tweaks; rewrap DESCR as the lines were a bit
narrow, and install the readme. Updated tgz attached. This is
OK sthen@ if someone would like to import.


> For the usockets port, instead of making a diff to the provided
> Makefile from upstream, I've changed the port to use a different
> Makefile.obsd, which is a lot simpler than the upstream one.
> Upstream Makefile, does not create a shared lib, it manually specifies
> the C++ library to use (-lstdc++), sets optimzation flags and does
> not create a pkg-config file, among other things.
> It was easier to create a simple different Makefile and keep that
> as a patch. Hopefully thats acceptable.
> Unfortunately, upstream is not going to accept any changes to their
> Makefile to standardize it (I've asked them multiple times to even
> just create a shared library and have been declined).

Oh I remember about that upstream now. Yes that's probably for the best
and it's much simpler this way. Will look at getting that in when lmdbxx
is imported or ok'd.


> This should be the best compromise without overcomplicating our
> patches.
> 
> Aisha
> 
> diff --git a/net/usockets/Makefile b/net/usockets/Makefile
> index a484c23f93a..865795d0e1e 100644
> --- a/net/usockets/Makefile
> +++ b/net/usockets/Makefile
> @@ -3,38 +3,29 @@
>  COMMENT  =   eventing, networking & crypto for async applications
>  CATEGORIES = net
>  
> -VERSION =0.6.0
> -REVISION =   1
> -
> -DISTNAME =   usockets-${VERSION}
> -PKGNAME =${DISTNAME:L}
> -
> -SHARED_LIBS =usockets 1.0
> +SHARED_LIBS =usockets 2.0
>  
>  GH_ACCOUNT = uNetworking
>  GH_PROJECT = uSockets
> -#GH_TAGNAME =v0.6.0
> -# cstdlib include error
> -GH_COMMIT =  7683672d87067cd75b854f4e36b9820f4809a4be
> -
> +GH_TAGNAME = v0.8.1
> +PKGNAME =${DISTNAME:L}
>  
>  MAINTAINER = Aisha Tammy 
>  
>  # Apache 2.0
>  PERMIT_PACKAGE = Yes
>  
> -WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
> +WANTLIB +=   ${COMPILER_LIBCXX} crypto ssl uv
>  
>  # C11 C++17
>  COMPILER =   base-clang ports-gcc
>  
>  LIB_DEPENDS =devel/libuv
>  
> -USE_GMAKE =  Yes
> -MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
> - CC="${CC}" CXX="${CXX}" \
> - LIBusockets_VERSION="${LIBusockets_VERSION}"
> +MAKE_FILE =  Makefile.obsd
> +
> +MAKE_ENV =   LIBusockets_VERSION="${LIBusockets_VERSION}"
>  
> -NO_TEST =Yes
> +# tests need A LOT of file desrciptors ~5000-6000
>  
>  .include 
> diff --git a/net/usockets/distinfo b/net/usockets/distinfo
> index 964ba508e9e..a437989a34e 100644
> --- a/net/usockets/distinfo
> +++ b/net/usockets/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
> 0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
> -SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
> +SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
> +SIZE (uSockets-0.8.1.tar.gz) = 65470
> diff --git a/net/usockets/patches/patch-Makefile 
> b/net/usockets/patches/patch-Makefile
> deleted file mode 100644
> index e718b65a265..000
> --- a/net/usockets/patches/patch-Makefile
> +++ /dev/null
> @@ -1,98 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
> -
> -add shared + static lib + pkg-config file
> -remove -flto -O3
> -
> -Index: Makefile
>  Makefile.orig
> -+++ Makefile
> -@@ -1,60 +1,40 @@
> --# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
> --# For now we need to link with C++ for OpenSSL support, but should be 
> removed with time
> --ifeq ($(WITH_OPENSSL),1)
> --override CFLAGS += -DLIBUS_USE_OPENSSL
> --# With problems on macOS, make sure to pass needed LDFLAGS required to 
> find these
> --override LDFLAGS += -lssl -lcrypto -lstdc++
> --else
> --# WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
> OpenSSL)
> --ifeq ($(WITH_WOLFSSL),1)
> --# todo: change these
> --override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
> --override LDFLAGS += -L/usr/local/lib -lwolfssl
> --else
> --override CFLAGS += -DLIBUS_NO_SSL
> --endif
> --endif
> -+DESTDIR ?=
> - 
> --# WITH_LIBUV=1 builds with libuv as event-loop
> --ifeq ($(WITH_LIBUV),1)
> --override CFLAGS += -DLIBUS_USE_LIBUV
> --override LDFLAGS += -luv
> --endif
> -+PREFIX ?=   "/usr/local"
> -+LIBDIR ?=   "$(PREFIX)/lib"
> -+INCLUDEDIR ?=   "$(PREFIX)/include"
> - 
> --# WITH_GCD=1 builds with libdispatch as event-loop
> --ifeq ($(WITH_GCD),1)
> --override CFLAGS += -DLIBUS_USE_GCD
> --override LDFLAGS += -framework CoreFoundation
> --endif
> -+# OpenBSD specific library version
> -+LIBTARGET ?=libusockets.so.$(LIBusockets_VERSION)
> - 
> --#

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-26 Thread aisha 
On 21/10/26 02:52PM, Stuart Henderson wrote:
> there were some other comments about the patches in my mail
> 

Oops, sorry. I missed that.

I've changed the lmdbxx install function to the simpler one line.

For the usockets port, instead of making a diff to the provided
Makefile from upstream, I've changed the port to use a different
Makefile.obsd, which is a lot simpler than the upstream one.
Upstream Makefile, does not create a shared lib, it manually specifies
the C++ library to use (-lstdc++), sets optimzation flags and does
not create a pkg-config file, among other things.
It was easier to create a simple different Makefile and keep that
as a patch. Hopefully thats acceptable.
Unfortunately, upstream is not going to accept any changes to their
Makefile to standardize it (I've asked them multiple times to even
just create a shared library and have been declined).
This should be the best compromise without overcomplicating our
patches.

Aisha

diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..865795d0e1e 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,38 +3,29 @@
 COMMENT=   eventing, networking & crypto for async applications
 CATEGORIES =   net
 
-VERSION =  0.6.0
-REVISION = 1
-
-DISTNAME = usockets-${VERSION}
-PKGNAME =  ${DISTNAME:L}
-
-SHARED_LIBS =  usockets 1.0
+SHARED_LIBS =  usockets 2.0
 
 GH_ACCOUNT =   uNetworking
 GH_PROJECT =   uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+GH_TAGNAME =   v0.8.1
+PKGNAME =  ${DISTNAME:L}
 
 MAINTAINER =   Aisha Tammy 
 
 # Apache 2.0
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
+WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
 
 # C11 C++17
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  devel/libuv
 
-USE_GMAKE =Yes
-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_FILE =Makefile.obsd
+
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
 
-NO_TEST =  Yes
+# tests need A LOT of file desrciptors ~5000-6000
 
 .include 
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..a437989a34e 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
+SIZE (uSockets-0.8.1.tar.gz) = 65470
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
deleted file mode 100644
index e718b65a265..000
--- a/net/usockets/patches/patch-Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
-
-add shared + static lib + pkg-config file
-remove -flto -O3
-
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -1,60 +1,40 @@
--# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
--# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
--ifeq ($(WITH_OPENSSL),1)
--  override CFLAGS += -DLIBUS_USE_OPENSSL
--  # With problems on macOS, make sure to pass needed LDFLAGS required to 
find these
--  override LDFLAGS += -lssl -lcrypto -lstdc++
--else
--  # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with 
OpenSSL)
--  ifeq ($(WITH_WOLFSSL),1)
--  # todo: change these
--  override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
--  override LDFLAGS += -L/usr/local/lib -lwolfssl
--  else
--  override CFLAGS += -DLIBUS_NO_SSL
--  endif
--endif
-+DESTDIR ?=
- 
--# WITH_LIBUV=1 builds with libuv as event-loop
--ifeq ($(WITH_LIBUV),1)
--  override CFLAGS += -DLIBUS_USE_LIBUV
--  override LDFLAGS += -luv
--endif
-+PREFIX ?= "/usr/local"
-+LIBDIR ?= "$(PREFIX)/lib"
-+INCLUDEDIR ?= "$(PREFIX)/include"
- 
--# WITH_GCD=1 builds with libdispatch as event-loop
--ifeq ($(WITH_GCD),1)
--  override CFLAGS += -DLIBUS_USE_GCD
--  override LDFLAGS += -framework CoreFoundation
--endif
-+# OpenBSD specific library version
-+LIBTARGET ?=  libusockets.so.$(LIBusockets_VERSION)
- 
--# WITH_ASAN builds with sanitizers
--ifeq ($(WITH_ASAN),1)
--  override CFLAGS += -fsanitize=address -g
--  override LDFLAGS += -lasan
--endif
-+PKG_CONFIG ?= pkg-config
- 
--override CFLAGS += -std=c11 -Isrc
--override LDFLAGS += uSockets.a
-+override LDFLAGS +=   -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
- 
--# 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
--# For now we do rely on C++17 for OpenSSL support but we will be porting this 
work to C11
--ifeq ($(WITH_OPENSSL),1)
--

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-26 Thread aisha 
On 21/10/26 09:36AM, Stuart Henderson wrote:
> On 2021/10/25 17:22, aisha wrote:
> > another ping
> > 
> > usockets - 0.8.1
> > uwebsockets - 20.6.0
> > purritobin - 0.6.7
> >  Additions to www/purritobin
> >  - auto cleaning of pastes
> >  - web portal for pasting
> >  - in-built http server, good for tiny pastes and testing setups
> >  - http header manipulation
> > 
> > depends on a new port databases/lmdbxx, which is attached in the
> > patch as well.
> 
> Please send new ports as a tar. Diff is harder to work with, and diff
> mixing a new port (which many of us put in ports/mystuff/category/name)
> with existing ports even harder.
> 
> > Cheers,
> > Aisha
> > 

Oh got it. I've attached the lmdbxx port tgz and the patch
for the other three.


diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..c33d35207bc 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,38 +3,29 @@
 COMMENT=   eventing, networking & crypto for async applications
 CATEGORIES =   net
 
-VERSION =  0.6.0
-REVISION = 1
-
-DISTNAME = usockets-${VERSION}
-PKGNAME =  ${DISTNAME:L}
-
-SHARED_LIBS =  usockets 1.0
+SHARED_LIBS =  usockets 2.0
 
 GH_ACCOUNT =   uNetworking
 GH_PROJECT =   uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+GH_TAGNAME =   v0.8.1
+PKGNAME =  ${DISTNAME:L}
 
 MAINTAINER =   Aisha Tammy 
 
 # Apache 2.0
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
+WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
 
 # C11 C++17
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  devel/libuv
 
-USE_GMAKE =Yes
-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
+
+FAKE_FLAGS =   PREFIX=${TRUEPREFIX}
 
-NO_TEST =  Yes
+# tests need A LOT of file desrciptors ~5000-6000
 
 .include 
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..a437989a34e 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
+SIZE (uSockets-0.8.1.tar.gz) = 65470
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
index e718b65a265..5ea504d9f0f 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
+: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
 
 add shared + static lib + pkg-config file
 remove -flto -O3
@@ -6,7 +6,7 @@ remove -flto -O3
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,72 +1,46 @@
 -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
 -# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
 -ifeq ($(WITH_OPENSSL),1)
@@ -30,69 +30,85 @@ Index: Makefile
 -  override CFLAGS += -DLIBUS_USE_LIBUV
 -  override LDFLAGS += -luv
 -endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
 +LIBDIR ?= "$(PREFIX)/lib"
 +INCLUDEDIR ?= "$(PREFIX)/include"
  
+-# WITH_ASIO builds with boot asio event-loop
+-ifeq ($(WITH_ASIO),1)
+-  override CFLAGS += -DLIBUS_USE_ASIO
+-  override LDFLAGS += -lstdc++ -lpthread
+-  override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
+-endif
++PKG_CONFIG ?= pkg-config
+ 
 -# WITH_GCD=1 builds with libdispatch as event-loop
 -ifeq ($(WITH_GCD),1)
 -  override CFLAGS += -DLIBUS_USE_GCD
 -  override LDFLAGS += -framework CoreFoundation
 -endif
-+# OpenBSD specific library version
-+LIBTARGET ?=  libusockets.so.$(LIBusockets_VERSION)
++LIBTARGET =   libusockets.so.$(LIBusockets_VERSION)
  
 -# WITH_ASAN builds with sanitizers
 -ifeq ($(WITH_ASAN),1)
 -  override CFLAGS += -fsanitize=address -g
--  override LDFLAGS += -lasan
+-  override LDFLAGS += -fsanitize=address
 -endif
-+PKG_CONFIG ?= pkg-config
++REQUIRES =libcrypto libssl libuv
++COMMON_FLAGS =-Isrc -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV 
`$(PKG_CONFIG) --cflags $(REQUIRES)`
  
 -override CFLAGS += -std=c11 -Isrc
 -override LDFLAGS += uSockets.a
-+override LDFLAGS +=   -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
++CFLAGS += -std=c11 -fPIC $(COMMON_FLAGS)
++CXXFLAGS +=   -std=c++17 -fPIC $(COMMON_FLAGS)
++LDFLAGS +=`$(PKG_CONFIG) --libs $(REQUIRES)`
  
 -# 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
+-# Also link in Boost Asio support
+-ifeq ($(WITH_ASIO),1)
+-  $(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp
+-endif
++all:
++  $(CC)

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-26 Thread Stuart Henderson 
there were some other comments about the patches in my mail

On 2021/10/26 09:46, aisha wrote:
> On 21/10/26 09:36AM, Stuart Henderson wrote:
> > On 2021/10/25 17:22, aisha wrote:
> > > another ping
> > > 
> > > usockets - 0.8.1
> > > uwebsockets - 20.6.0
> > > purritobin - 0.6.7
> > >  Additions to www/purritobin
> > >  - auto cleaning of pastes
> > >  - web portal for pasting
> > >  - in-built http server, good for tiny pastes and testing setups
> > >  - http header manipulation
> > > 
> > > depends on a new port databases/lmdbxx, which is attached in the
> > > patch as well.
> > 
> > Please send new ports as a tar. Diff is harder to work with, and diff
> > mixing a new port (which many of us put in ports/mystuff/category/name)
> > with existing ports even harder.
> > 
> > > Cheers,
> > > Aisha
> > > 
> 
> Oh got it. I've attached the lmdbxx port tgz and the patch
> for the other three.
> 
> 
> diff --git a/net/usockets/Makefile b/net/usockets/Makefile
> index a484c23f93a..c33d35207bc 100644
> --- a/net/usockets/Makefile
> +++ b/net/usockets/Makefile
> @@ -3,38 +3,29 @@
>  COMMENT  =   eventing, networking & crypto for async applications
>  CATEGORIES = net
>  
> -VERSION =0.6.0
> -REVISION =   1
> -
> -DISTNAME =   usockets-${VERSION}
> -PKGNAME =${DISTNAME:L}
> -
> -SHARED_LIBS =usockets 1.0
> +SHARED_LIBS =usockets 2.0
>  
>  GH_ACCOUNT = uNetworking
>  GH_PROJECT = uSockets
> -#GH_TAGNAME =v0.6.0
> -# cstdlib include error
> -GH_COMMIT =  7683672d87067cd75b854f4e36b9820f4809a4be
> -
> +GH_TAGNAME = v0.8.1
> +PKGNAME =${DISTNAME:L}
>  
>  MAINTAINER = Aisha Tammy 
>  
>  # Apache 2.0
>  PERMIT_PACKAGE = Yes
>  
> -WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
> +WANTLIB +=   ${COMPILER_LIBCXX} crypto ssl uv
>  
>  # C11 C++17
>  COMPILER =   base-clang ports-gcc
>  
>  LIB_DEPENDS =devel/libuv
>  
> -USE_GMAKE =  Yes
> -MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
> - CC="${CC}" CXX="${CXX}" \
> - LIBusockets_VERSION="${LIBusockets_VERSION}"
> +MAKE_ENV =   LIBusockets_VERSION="${LIBusockets_VERSION}"
> +
> +FAKE_FLAGS = PREFIX=${TRUEPREFIX}
>  
> -NO_TEST =Yes
> +# tests need A LOT of file desrciptors ~5000-6000
>  
>  .include 
> diff --git a/net/usockets/distinfo b/net/usockets/distinfo
> index 964ba508e9e..a437989a34e 100644
> --- a/net/usockets/distinfo
> +++ b/net/usockets/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
> 0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
> -SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
> +SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
> +SIZE (uSockets-0.8.1.tar.gz) = 65470
> diff --git a/net/usockets/patches/patch-Makefile 
> b/net/usockets/patches/patch-Makefile
> index e718b65a265..5ea504d9f0f 100644
> --- a/net/usockets/patches/patch-Makefile
> +++ b/net/usockets/patches/patch-Makefile
> @@ -1,4 +1,4 @@
> -$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
> +: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
>  
>  add shared + static lib + pkg-config file
>  remove -flto -O3
> @@ -6,7 +6,7 @@ remove -flto -O3
>  Index: Makefile
>  --- Makefile.orig
>  +++ Makefile
> -@@ -1,60 +1,40 @@
> +@@ -1,72 +1,46 @@
>  -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
>  -# For now we need to link with C++ for OpenSSL support, but should be 
> removed with time
>  -ifeq ($(WITH_OPENSSL),1)
> @@ -30,69 +30,85 @@ Index: Makefile
>  -override CFLAGS += -DLIBUS_USE_LIBUV
>  -override LDFLAGS += -luv
>  -endif
> -+PREFIX ?=   "/usr/local"
> ++PREFIX ?=   /usr/local
>  +LIBDIR ?=   "$(PREFIX)/lib"
>  +INCLUDEDIR ?=   "$(PREFIX)/include"
>   
> +-# WITH_ASIO builds with boot asio event-loop
> +-ifeq ($(WITH_ASIO),1)
> +-override CFLAGS += -DLIBUS_USE_ASIO
> +-override LDFLAGS += -lstdc++ -lpthread
> +-override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
> +-endif
> ++PKG_CONFIG ?=   pkg-config
> + 
>  -# WITH_GCD=1 builds with libdispatch as event-loop
>  -ifeq ($(WITH_GCD),1)
>  -override CFLAGS += -DLIBUS_USE_GCD
>  -override LDFLAGS += -framework CoreFoundation
>  -endif
> -+# OpenBSD specific library version
> -+LIBTARGET ?=libusockets.so.$(LIBusockets_VERSION)
> ++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
>   
>  -# WITH_ASAN builds with sanitizers
>  -ifeq ($(WITH_ASAN),1)
>  -override CFLAGS += -fsanitize=address -g
> --override LDFLAGS += -lasan
> +-override LDFLAGS += -fsanitize=address
>  -endif
> -+PKG_CONFIG ?=   pkg-config
> ++REQUIRES =  libcrypto libssl libuv
> ++COMMON_FLAGS =  -Isrc -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV 
> `$(PKG_CONFIG) --cflags $(REQUIRES)`
>   
>  -override CFLAGS += -std=c11 -Isrc
>  -override LDFLAGS += uSockets.a
> -+override LDFLAGS += -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
> ++CFLAGS +=   -std=c11 -fPIC $(COMMON_FLAGS)
> ++CXXFLAGS += -std=c++17 -fPIC $(COMMON_FLAGS)
> ++LDFLAGS +=

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-26 Thread Stuart Henderson 
On 2021/10/25 17:22, aisha wrote:
> another ping
> 
> usockets - 0.8.1
> uwebsockets - 20.6.0
> purritobin - 0.6.7
>  Additions to www/purritobin
>  - auto cleaning of pastes
>  - web portal for pasting
>  - in-built http server, good for tiny pastes and testing setups
>  - http header manipulation
> 
> depends on a new port databases/lmdbxx, which is attached in the
> patch as well.

Please send new ports as a tar. Diff is harder to work with, and diff
mixing a new port (which many of us put in ports/mystuff/category/name)
with existing ports even harder.

> Cheers,
> Aisha
> 
> 
> diff --git a/databases/lmdbxx/Makefile b/databases/lmdbxx/Makefile
> new file mode 100644
> index 000..b676b039ba3
> --- /dev/null
> +++ b/databases/lmdbxx/Makefile
> @@ -0,0 +1,41 @@
> +# $OpenBSD: $
> +
> +COMMENT =C++17 wrapper for Lightning Memory-Mapped Database
> +
> +VERSION =1.0.0
> +DISTNAME =   lmdbxx-${VERSION}
> +
> +CATEGORIES = databases
> +
> +GH_ACCOUNT = hoytech
> +GH_PROJECT = lmdbxx
> +#GH_TAGNAME =1.0.0
> +GH_COMMIT =  f1f00acf5f5045b43d7189c2b23ae5ca103a6faa
> +
> +HOMEPAGE =   https://github.com/hoytech/lmdbxx
> +
> +MAINTAINER = Aisha Tammy 
> +
> +# Unlicense
> +PERMIT_PACKAGE = Yes
> +
> +COMPILER =   base-clang ports-gcc
> +
> +NO_BUILD =   Yes
> +
> +RUN_DEPENDS =databases/lmdb
> +
> +do-install:
> + cd ${WRKSRC} && \
> + mkdir -p ${PREFIX}/include && \
> + ${INSTALL_DATA} lmdb++.h ${PREFIX}/include 

That dir is already created by ports infrastructure. Only one command so
the cd isn't needed, I'd go with

${INSTALL_DATA} ${WRKSRC}/lmdb++.h ${PREFIX}/include

>  --- Makefile.orig
>  +++ Makefile
> -@@ -1,60 +1,40 @@
> +@@ -1,72 +1,46 @@
>  -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
>  -# For now we need to link with C++ for OpenSSL support, but should be 
> removed with time
>  -ifeq ($(WITH_OPENSSL),1)
> @@ -30,69 +30,85 @@ Index: Makefile
>  -override CFLAGS += -DLIBUS_USE_LIBUV
>  -override LDFLAGS += -luv
>  -endif
> -+PREFIX ?=   "/usr/local"
> ++PREFIX ?=   /usr/local
>  +LIBDIR ?=   "$(PREFIX)/lib"
>  +INCLUDEDIR ?=   "$(PREFIX)/include"
>   
> +-# WITH_ASIO builds with boot asio event-loop
> +-ifeq ($(WITH_ASIO),1)
> +-override CFLAGS += -DLIBUS_USE_ASIO
> +-override LDFLAGS += -lstdc++ -lpthread
> +-override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
> +-endif
> ++PKG_CONFIG ?=   pkg-config
> + 
>  -# WITH_GCD=1 builds with libdispatch as event-loop
>  -ifeq ($(WITH_GCD),1)
>  -override CFLAGS += -DLIBUS_USE_GCD
>  -override LDFLAGS += -framework CoreFoundation
>  -endif
> -+# OpenBSD specific library version
> -+LIBTARGET ?=libusockets.so.$(LIBusockets_VERSION)
> ++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
>   
>  -# WITH_ASAN builds with sanitizers
>  -ifeq ($(WITH_ASAN),1)
>  -override CFLAGS += -fsanitize=address -g
> --override LDFLAGS += -lasan
> +-override LDFLAGS += -fsanitize=address
>  -endif

Why remove all these WITH_XXX blocks? Having anything unnecessary in the
patch makes the patch harder to read, harder to merge with updates, and
makes it harder to review diffs to the port

>  -# 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
> +-# Also link in Boost Asio support
> +-ifeq ($(WITH_ASIO),1)
> +-$(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp
> +-endif
> ++all:
> ++$(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
> ++$(CXX) $(CXXFLAGS) -c src/crypto/*.cpp
> ++$(AR) rvs libusockets.a *.o
> ++$(CXX) $(CXXFLAGS) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) 
> $(LDFLAGS)
> ++sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@VERSION@:$(LIBusockets_VERSION):" 
> libusockets.pc.in > libusockets.pc
> + 
>  -# 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
>  -endif
>  -$(AR) rvs uSockets.a *.o

lots of shuffling here that doesn't seem necessary, basically you just
want to remove -flto -O3 from the compiler lines don't you?

> -+COMMON_FLAGS =  -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -Isrc 
> `$(PKG_CONFIG) --cflags libuv`
> -+override CFLAGS +=  $(COMMON_FLAGS)
> -+override CXXFLAGS +=$(COMMON_FLAGS)
> ++install:
> ++install -d "$(DESTDIR)$(LIBDIR)/pkgconfig" "$(DESTDIR)$(INCLUDEDIR)"
> ++install -m 644 src/libusockets.h "$(DESTDIR)$(INCLUDEDIR)/"
> ++install -m 644 $(LIBTARGET) "$(DESTDIR)$(LIBDIR)"
> ++install -m 644 libusockets.a "$(DESTDIR)$(LIBDIR)/"
> ++install -m 644 libusockets.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/"
.
> -+install:
> -+install -d "$(LIBDIR)/pkgconfig" "$(INCLUDEDIR)"
> -+install -m 644 src/libusockets.h "$(INCLUDEDIR)"
> -+install -m 755 $(LIBTARGET) "$(LIBDIR)"
> -+install -m 755

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-25 Thread aisha 
another ping

usockets - 0.8.1
uwebsockets - 20.6.0
purritobin - 0.6.7
 Additions to www/purritobin
 - auto cleaning of pastes
 - web portal for pasting
 - in-built http server, good for tiny pastes and testing setups
 - http header manipulation

depends on a new port databases/lmdbxx, which is attached in the
patch as well.

Cheers,
Aisha


diff --git a/databases/lmdbxx/Makefile b/databases/lmdbxx/Makefile
new file mode 100644
index 000..b676b039ba3
--- /dev/null
+++ b/databases/lmdbxx/Makefile
@@ -0,0 +1,41 @@
+# $OpenBSD: $
+
+COMMENT =  C++17 wrapper for Lightning Memory-Mapped Database
+
+VERSION =  1.0.0
+DISTNAME = lmdbxx-${VERSION}
+
+CATEGORIES =   databases
+
+GH_ACCOUNT =   hoytech
+GH_PROJECT =   lmdbxx
+#GH_TAGNAME =  1.0.0
+GH_COMMIT =f1f00acf5f5045b43d7189c2b23ae5ca103a6faa
+
+HOMEPAGE = https://github.com/hoytech/lmdbxx
+
+MAINTAINER =   Aisha Tammy 
+
+# Unlicense
+PERMIT_PACKAGE =   Yes
+
+COMPILER = base-clang ports-gcc
+
+NO_BUILD = Yes
+
+RUN_DEPENDS =  databases/lmdb
+
+do-install:
+   cd ${WRKSRC} && \
+   mkdir -p ${PREFIX}/include && \
+   ${INSTALL_DATA} lmdb++.h ${PREFIX}/include 
+
+do-test:
+   cd ${WRKSRC} && \
+   rm -rf testdb && \
+   mkdir -p testdb && \
+   ${CXX} ${CXXFLAGS} -std=c++17 -Wall -I${LOCALBASE}/include -I. \
+   -o check check.cc ${LDFLAGS} -L${LOCALBASE}/lib -llmdb && \
+   ./check
+
+.include 
diff --git a/databases/lmdbxx/distinfo b/databases/lmdbxx/distinfo
new file mode 100644
index 000..2cd8254361c
--- /dev/null
+++ b/databases/lmdbxx/distinfo
@@ -0,0 +1,2 @@
+SHA256 (lmdbxx-1.0.0-f1f00acf.tar.gz) = 
hcZXFqDBZaZ8N3t6DP6m5mMypWnY2kadLD49v5mwSZo=
+SIZE (lmdbxx-1.0.0-f1f00acf.tar.gz) = 53347
diff --git a/databases/lmdbxx/pkg/DESCR b/databases/lmdbxx/pkg/DESCR
new file mode 100644
index 000..29e045d9927
--- /dev/null
+++ b/databases/lmdbxx/pkg/DESCR
@@ -0,0 +1,4 @@
+A comprehensive C++ wrapper for the LMDB embedded
+database library, offering both an error-checked
+procedural interface and an object-oriented resource
+interface with RAII semantics.
diff --git a/databases/lmdbxx/pkg/PLIST b/databases/lmdbxx/pkg/PLIST
new file mode 100644
index 000..cdf3f124dec
--- /dev/null
+++ b/databases/lmdbxx/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST,v$
+include/lmdb++.h
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..c33d35207bc 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,38 +3,29 @@
 COMMENT=   eventing, networking & crypto for async applications
 CATEGORIES =   net
 
-VERSION =  0.6.0
-REVISION = 1
-
-DISTNAME = usockets-${VERSION}
-PKGNAME =  ${DISTNAME:L}
-
-SHARED_LIBS =  usockets 1.0
+SHARED_LIBS =  usockets 2.0
 
 GH_ACCOUNT =   uNetworking
 GH_PROJECT =   uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+GH_TAGNAME =   v0.8.1
+PKGNAME =  ${DISTNAME:L}
 
 MAINTAINER =   Aisha Tammy 
 
 # Apache 2.0
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
+WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
 
 # C11 C++17
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  devel/libuv
 
-USE_GMAKE =Yes
-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
+
+FAKE_FLAGS =   PREFIX=${TRUEPREFIX}
 
-NO_TEST =  Yes
+# tests need A LOT of file desrciptors ~5000-6000
 
 .include 
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..a437989a34e 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
+SIZE (uSockets-0.8.1.tar.gz) = 65470
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
index e718b65a265..5ea504d9f0f 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
+: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
 
 add shared + static lib + pkg-config file
 remove -flto -O3
@@ -6,7 +6,7 @@ remove -flto -O3
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,72 +1,46 @@
 -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
 -# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
 -ifeq ($(WITH_OPENSSL),1)
@@ -30,69 +30,85 @@ Index: Makefile
 -  override CFLAGS += -DLIBUS_USE_LIBUV
 -  override LDFLAGS += -luv
 -endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
 +LIBDIR ?= "$(PREFIX)/lib"
 +INCLUDEDIR ?=

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

2021-10-18 Thread aisha 
ping

usockets - 0.8.1
uwebsockets - 20.6.0
purritobin - 0.6.7
 Additions to www/purritobin
 - auto cleaning of pastes
 - web portal for pasting
 - in-built http server, good for tiny pastes and testing setups
 - http header manipulation

depends on a new port databases/lmdbxx, which is attached in the
patch as well.

Cheers,
Aisha

diff --git a/databases/lmdbxx/Makefile b/databases/lmdbxx/Makefile
new file mode 100644
index 000..b676b039ba3
--- /dev/null
+++ b/databases/lmdbxx/Makefile
@@ -0,0 +1,41 @@
+# $OpenBSD: $
+
+COMMENT =  C++17 wrapper for Lightning Memory-Mapped Database
+
+VERSION =  1.0.0
+DISTNAME = lmdbxx-${VERSION}
+
+CATEGORIES =   databases
+
+GH_ACCOUNT =   hoytech
+GH_PROJECT =   lmdbxx
+#GH_TAGNAME =  1.0.0
+GH_COMMIT =f1f00acf5f5045b43d7189c2b23ae5ca103a6faa
+
+HOMEPAGE = https://github.com/hoytech/lmdbxx
+
+MAINTAINER =   Aisha Tammy 
+
+# Unlicense
+PERMIT_PACKAGE =   Yes
+
+COMPILER = base-clang ports-gcc
+
+NO_BUILD = Yes
+
+RUN_DEPENDS =  databases/lmdb
+
+do-install:
+   cd ${WRKSRC} && \
+   mkdir -p ${PREFIX}/include && \
+   ${INSTALL_DATA} lmdb++.h ${PREFIX}/include 
+
+do-test:
+   cd ${WRKSRC} && \
+   rm -rf testdb && \
+   mkdir -p testdb && \
+   ${CXX} ${CXXFLAGS} -std=c++17 -Wall -I${LOCALBASE}/include -I. \
+   -o check check.cc ${LDFLAGS} -L${LOCALBASE}/lib -llmdb && \
+   ./check
+
+.include 
diff --git a/databases/lmdbxx/distinfo b/databases/lmdbxx/distinfo
new file mode 100644
index 000..2cd8254361c
--- /dev/null
+++ b/databases/lmdbxx/distinfo
@@ -0,0 +1,2 @@
+SHA256 (lmdbxx-1.0.0-f1f00acf.tar.gz) = 
hcZXFqDBZaZ8N3t6DP6m5mMypWnY2kadLD49v5mwSZo=
+SIZE (lmdbxx-1.0.0-f1f00acf.tar.gz) = 53347
diff --git a/databases/lmdbxx/pkg/DESCR b/databases/lmdbxx/pkg/DESCR
new file mode 100644
index 000..29e045d9927
--- /dev/null
+++ b/databases/lmdbxx/pkg/DESCR
@@ -0,0 +1,4 @@
+A comprehensive C++ wrapper for the LMDB embedded
+database library, offering both an error-checked
+procedural interface and an object-oriented resource
+interface with RAII semantics.
diff --git a/databases/lmdbxx/pkg/PLIST b/databases/lmdbxx/pkg/PLIST
new file mode 100644
index 000..cdf3f124dec
--- /dev/null
+++ b/databases/lmdbxx/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST,v$
+include/lmdb++.h
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..c33d35207bc 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,38 +3,29 @@
 COMMENT=   eventing, networking & crypto for async applications
 CATEGORIES =   net
 
-VERSION =  0.6.0
-REVISION = 1
-
-DISTNAME = usockets-${VERSION}
-PKGNAME =  ${DISTNAME:L}
-
-SHARED_LIBS =  usockets 1.0
+SHARED_LIBS =  usockets 2.0
 
 GH_ACCOUNT =   uNetworking
 GH_PROJECT =   uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+GH_TAGNAME =   v0.8.1
+PKGNAME =  ${DISTNAME:L}
 
 MAINTAINER =   Aisha Tammy 
 
 # Apache 2.0
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
+WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
 
 # C11 C++17
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  devel/libuv
 
-USE_GMAKE =Yes
-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
+
+FAKE_FLAGS =   PREFIX=${TRUEPREFIX}
 
-NO_TEST =  Yes
+# tests need A LOT of file desrciptors ~5000-6000
 
 .include 
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..a437989a34e 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
+SIZE (uSockets-0.8.1.tar.gz) = 65470
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
index e718b65a265..5ea504d9f0f 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
+: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
 
 add shared + static lib + pkg-config file
 remove -flto -O3
@@ -6,7 +6,7 @@ remove -flto -O3
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,72 +1,46 @@
 -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
 -# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
 -ifeq ($(WITH_OPENSSL),1)
@@ -30,69 +30,85 @@ Index: Makefile
 -  override CFLAGS += -DLIBUS_USE_LIBUV
 -  override LDFLAGS += -luv
 -endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
 +LIBDIR ?= "$(PREFIX)/lib"
 +INCLUDEDIR ?=