CVS commit: pkgsrc/devel/ucommon

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Mar  6 12:12:58 UTC 2020

Modified Files:
        pkgsrc/devel/ucommon: Makefile options.mk

Log Message:
ucommon: Incompatible with OpenSSL 1.1. Force gnutls instead.

While here, clean up a bit.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ucommon/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ucommon/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ucommon/Makefile
diff -u pkgsrc/devel/ucommon/Makefile:1.16 pkgsrc/devel/ucommon/Makefile:1.17
--- pkgsrc/devel/ucommon/Makefile:1.16  Sat Jan 18 21:48:10 2020
+++ pkgsrc/devel/ucommon/Makefile       Fri Mar  6 12:12:58 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2020/01/18 21:48:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/06 12:12:58 nia Exp $
 
 DISTNAME=      ucommon-7.0.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=commoncpp/}
 
@@ -10,17 +10,19 @@ HOMEPAGE=   https://www.gnu.org/software/c
 COMMENT=       Very light-weight C++ library for deeply embedded applications
 LICENSE=       gnu-lgpl-v3
 
-USE_CMAKE=             yes
-USE_LANGUAGES=         c c++
-USE_TOOLS+=            intltool pkg-config
-#USE_LIBTOOL=          yes
+USE_CMAKE=     yes
+USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config
+
+# Incompatible with OpenSSL 1.1
+CMAKE_ARGS+=   -DCRYPTO_OPENSSL=OFF
+
 PKGCONFIG_OVERRIDE+=   commoncpp.pc.in
 PKGCONFIG_OVERRIDE+=   ucommon.pc.in
 
-.include "options.mk"
-
 LDFLAGS.SunOS+=                -lsocket -lnsl -lintl
 
+.include "options.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/devel/ucommon/options.mk
diff -u pkgsrc/devel/ucommon/options.mk:1.4 pkgsrc/devel/ucommon/options.mk:1.5
--- pkgsrc/devel/ucommon/options.mk:1.4 Sat Jan 25 10:45:10 2020
+++ pkgsrc/devel/ucommon/options.mk     Fri Mar  6 12:12:58 2020
@@ -1,21 +1,16 @@
-# $NetBSD: options.mk,v 1.4 2020/01/25 10:45:10 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2020/03/06 12:12:58 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucommon
-PKG_SUPPORTED_OPTIONS= gnutls openssl tests
-PKG_SUGGESTED_OPTIONS+=        openssl
+PKG_SUPPORTED_OPTIONS= gnutls tests
+PKG_SUGGESTED_OPTIONS+=        gnutls
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnutls)
+CMAKE_ARGS+=   -DCRYPTO_GNUTLS=ON
 BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.0.0
 .include "../../security/gnutls/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenssl)
-.include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+=   -DCRYPTO_OPENSSL=ON
-.else
-CMAKE_ARGS+=   -DCRYPTO_OPENSSL=OFF
+CMAKE_ARGS+=   -DCRYPTO_GNUTLS=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)