CVS commit: pkgsrc/security/git-crypt

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Sep  2 06:57:27 UTC 2023

Modified Files:
        pkgsrc/security/git-crypt: Makefile

Log Message:
git-crypt: Set the appropriate OPENSSL_API_COMPAT when OpenSSL 3 is used.

Hopefully fixes the main build problems (at least when deprecated
declarations are available).

While here, convert to USE_CXX_FEATURES.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/git-crypt/Makefile

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

Modified files:

Index: pkgsrc/security/git-crypt/Makefile
diff -u pkgsrc/security/git-crypt/Makefile:1.2 pkgsrc/security/git-crypt/Makefile:1.3
--- pkgsrc/security/git-crypt/Makefile:1.2      Wed Jul 12 20:59:34 2023
+++ pkgsrc/security/git-crypt/Makefile  Sat Sep  2 06:57:27 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/07/12 20:59:34 nia Exp $
+# $NetBSD: Makefile,v 1.3 2023/09/02 06:57:27 nia Exp $
 
 DISTNAME=      git-crypt-0.7.0
 CATEGORIES=    security
@@ -9,7 +9,17 @@ HOMEPAGE=      https://www.agwa.name/projects
 COMMENT=       Transparent file encryption in git
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= c++11
+USE_LANGUAGES= c c++
+
+USE_CXX_FEATURES+=     c++11
+
+.include "../../security/openssl/buildlink3.mk"
+
+# This isn't a header it needs, I'm just not sure of a better way to
+# check for OpenSSL 3...
+.if !exists(${SSLBASE}/include/openssl/rand_drbg.h)
+CFLAGS+=       -DOPENSSL_API_COMPAT=0x30000000L
+.endif
 
 SUBST_CLASSES+=                        explicit_memset
 SUBST_STAGE.explicit_memset=   pre-configure
@@ -17,5 +27,4 @@ SUBST_MESSAGE.explicit_memset=        Avoid con
 SUBST_FILES.explicit_memset=   *.cpp *.hpp
 SUBST_SED.explicit_memset+=    -e 's,explicit_memset,gitcrypt_explicit_memset,g'
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"