Fri Mar 6 12:12:58 2020 UTC ()
ucommon: Incompatible with OpenSSL 1.1. Force gnutls instead.

While here, clean up a bit.

Bump PKGREVISION.


(nia)
diff -r1.16 -r1.17 pkgsrc/devel/ucommon/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/ucommon/options.mk
cvs diff -r1.16 -r1.17 pkgsrc/devel/ucommon/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/Makefile 2020/01/18 21:48:10 1.16
+++ pkgsrc/devel/ucommon/Makefile 2020/03/06 12:12:58 1.17
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.16 2020/01/18 21:48:10 jperkin Exp $ 1# $NetBSD: Makefile,v 1.17 2020/03/06 12:12:58 nia Exp $
2 2
3DISTNAME= ucommon-7.0.0 3DISTNAME= ucommon-7.0.0
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNU:=commoncpp/} 6MASTER_SITES= ${MASTER_SITE_GNU:=commoncpp/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnu.org/software/commoncpp/ 9HOMEPAGE= https://www.gnu.org/software/commoncpp/
10COMMENT= Very light-weight C++ library for deeply embedded applications 10COMMENT= Very light-weight C++ library for deeply embedded applications
11LICENSE= gnu-lgpl-v3 11LICENSE= gnu-lgpl-v3
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_TOOLS+= intltool pkg-config 15USE_TOOLS+= pkg-config
16#USE_LIBTOOL= yes 16
 17# Incompatible with OpenSSL 1.1
 18CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF
 19
17PKGCONFIG_OVERRIDE+= commoncpp.pc.in 20PKGCONFIG_OVERRIDE+= commoncpp.pc.in
18PKGCONFIG_OVERRIDE+= ucommon.pc.in 21PKGCONFIG_OVERRIDE+= ucommon.pc.in
19 22
20.include "options.mk" 
21 
22LDFLAGS.SunOS+= -lsocket -lnsl -lintl 23LDFLAGS.SunOS+= -lsocket -lnsl -lintl
23 24
 25.include "options.mk"
24.include "../../mk/dlopen.buildlink3.mk" 26.include "../../mk/dlopen.buildlink3.mk"
25.include "../../mk/pthread.buildlink3.mk" 27.include "../../mk/pthread.buildlink3.mk"
26.include "../../devel/gettext-lib/buildlink3.mk" 28.include "../../devel/gettext-lib/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/devel/ucommon/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/ucommon/options.mk 2020/01/25 10:45:10 1.4
+++ pkgsrc/devel/ucommon/options.mk 2020/03/06 12:12:58 1.5
@@ -1,25 +1,20 @@ @@ -1,25 +1,20 @@
1# $NetBSD: options.mk,v 1.4 2020/01/25 10:45:10 jperkin Exp $ 1# $NetBSD: options.mk,v 1.5 2020/03/06 12:12:58 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon 3PKG_OPTIONS_VAR= PKG_OPTIONS.ucommon
4PKG_SUPPORTED_OPTIONS= gnutls openssl tests 4PKG_SUPPORTED_OPTIONS= gnutls tests
5PKG_SUGGESTED_OPTIONS+= openssl 5PKG_SUGGESTED_OPTIONS+= gnutls
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mgnutls) 9.if !empty(PKG_OPTIONS:Mgnutls)
 10CMAKE_ARGS+= -DCRYPTO_GNUTLS=ON
10BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0 11BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0
11.include "../../security/gnutls/buildlink3.mk" 12.include "../../security/gnutls/buildlink3.mk"
12.endif 13CMAKE_ARGS+= -DCRYPTO_GNUTLS=OFF
13 
14.if !empty(PKG_OPTIONS:Mopenssl) 
15.include "../../security/openssl/buildlink3.mk" 
16CMAKE_ARGS+= -DCRYPTO_OPENSSL=ON 
17.else 
18CMAKE_ARGS+= -DCRYPTO_OPENSSL=OFF 
19.endif 14.endif
20 15
21.if !empty(PKG_OPTIONS:Mtests) 16.if !empty(PKG_OPTIONS:Mtests)
22CMAKE_ARGS+= -DBUILD_TESTING=ON 17CMAKE_ARGS+= -DBUILD_TESTING=ON
23.else 18.else
24CMAKE_ARGS+= -DBUILD_TESTING=OFF 19CMAKE_ARGS+= -DBUILD_TESTING=OFF
25.endif 20.endif