CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 14 06:29:19 UTC 2022

Modified Files:
        pkgsrc/editors/xournalpp: Makefile
        pkgsrc/mail/rspamd: Makefile
        pkgsrc/sysutils/libtree: Makefile

Log Message:
*: Sprinkle some USE_PKGSRC_GCC_RUNTIME for packages requriing GCC 8


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/libtree/Makefile

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

Modified files:

Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.36 pkgsrc/editors/xournalpp/Makefile:1.37
--- pkgsrc/editors/xournalpp/Makefile:1.36      Mon Mar 28 10:53:02 2022
+++ pkgsrc/editors/xournalpp/Makefile   Thu Apr 14 06:29:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2022/03/28 10:53:02 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2022/04/14 06:29:19 nia Exp $
 
 DISTNAME=      xournalpp-1.1.1
 PKGREVISION=   1
@@ -21,6 +21,15 @@ BUILD_TARGET=        translations xournalpp
 # C++17, std::filesystem
 GCC_REQD+=     8
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
+USE_PKGSRC_GCC=                yes
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
+
+.include "../../archivers/libarchive/buildlink3.mk"
+
 BUILD_DEPENDS+=        help2man-[0-9]*:../../converters/help2man
 DEPENDS+=      tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
 DEPENDS+=      tex-amsmath-[0-9]*:../../print/tex-amsmath

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.78 pkgsrc/mail/rspamd/Makefile:1.79
--- pkgsrc/mail/rspamd/Makefile:1.78    Tue Dec 21 15:00:41 2021
+++ pkgsrc/mail/rspamd/Makefile Thu Apr 14 06:29:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2021/12/21 15:00:41 triaxx Exp $
+# $NetBSD: Makefile,v 1.79 2022/04/14 06:29:19 nia Exp $
 
 DISTNAME=      rspamd-3.1
 CATEGORIES=    mail
@@ -21,6 +21,13 @@ BUILD_DEFS+= VARBASE
 
 LUA_VERSIONS_ACCEPTED= 54 53 52 51
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
+USE_PKGSRC_GCC=                yes
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
+
 CPPFLAGS.SunOS+=                       -D__EXTENSIONS__
 
 CMAKE_INSTALL_NAME_DIR=        ${PREFIX}/lib/rspamd

Index: pkgsrc/sysutils/libtree/Makefile
diff -u pkgsrc/sysutils/libtree/Makefile:1.2 pkgsrc/sysutils/libtree/Makefile:1.3
--- pkgsrc/sysutils/libtree/Makefile:1.2        Sun Apr 10 08:09:31 2022
+++ pkgsrc/sysutils/libtree/Makefile    Thu Apr 14 06:29:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/04/10 08:09:31 nia Exp $
+# $NetBSD: Makefile,v 1.3 2022/04/14 06:29:19 nia Exp $
 
 DISTNAME=      libtree-2.0.0
 CATEGORIES=    sysutils
@@ -17,6 +17,13 @@ GCC_REQD+=   8 # std::filesystem
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
+USE_PKGSRC_GCC=                yes
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
+
 .include "../../devel/cxxopts/buildlink3.mk"
 .include "../../devel/elfio/buildlink3.mk"
 .include "../../devel/termcolor/buildlink3.mk"