CVS commit: pkgsrc/devel/git-base

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun 30 20:19:42 UTC 2026

Modified Files:
        pkgsrc/devel/git-base: Makefile options.mk

Log Message:
git-base: disable Rust; rewrite options


To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/git-base/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/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.136 pkgsrc/devel/git-base/Makefile:1.137
--- pkgsrc/devel/git-base/Makefile:1.136        Tue Jun 30 08:12:33 2026
+++ pkgsrc/devel/git-base/Makefile      Tue Jun 30 20:19:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2026/06/30 08:12:33 adam Exp $
+# $NetBSD: Makefile,v 1.137 2026/06/30 20:19:42 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -66,6 +66,7 @@ MAKE_FLAGS+=          INSTALL=${INSTALL:Q}
 MAKE_FLAGS+=           CC_LD_DYNPATH=${COMPILER_RPATH_FLAG}
 MAKE_ENV+=             NO_GITWEB=1
 MAKE_ENV+=             NO_PERL=1
+MAKE_ENV+=             NO_RUST=1
 
 GIT_TEMPLATE_INSTDIR=  ${EGDIR}/${GIT_TEMPLATEDIR}
 MAKE_ENV+=             GIT_TEMPLATE_INSTDIR=${GIT_TEMPLATE_INSTDIR}

Index: pkgsrc/devel/git-base/options.mk
diff -u pkgsrc/devel/git-base/options.mk:1.7 pkgsrc/devel/git-base/options.mk:1.8
--- pkgsrc/devel/git-base/options.mk:1.7        Sun Oct  5 18:09:33 2025
+++ pkgsrc/devel/git-base/options.mk    Tue Jun 30 20:19:42 2026
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2025/10/05 18:09:33 js Exp $
+# $NetBSD: options.mk,v 1.8 2026/06/30 20:19:42 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.git
-PKG_SUPPORTED_OPTIONS= apple-common-crypto openssl
-PKG_SUGGESTED_OPTIONS= 
+PKG_SUPPORTED_OPTIONS= openssl
+.if ${OPSYS} == "Darwin"
+PKG_SUPPORTED_OPTIONS+=        apple-common-crypto
+.endif
 .if ${OPSYS} != "QNX"
 PKG_SUGGESTED_OPTIONS+=        openssl
 .endif
@@ -10,15 +12,13 @@ PKG_SUGGESTED_OPTIONS+=     openssl
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mapple-common-crypto)
-.  if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*}
-PKG_FAIL_REASON+=      "apple-common-crypto not available on this system"
-.  endif
 CONFIGURE_ARGS+=       --without-openssl
-.elif !empty(PKG_OPTIONS:Mopenssl)
-.include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
-MAKE_FLAGS+=           NO_APPLE_COMMON_CRYPTO=1
 .else
-CONFIGURE_ARGS+=       --without-openssl
 MAKE_FLAGS+=           NO_APPLE_COMMON_CRYPTO=1
+.  if !empty(PKG_OPTIONS:Mopenssl)
+.    include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
+.  else
+CONFIGURE_ARGS+=       --without-openssl
+.  endif
 .endif