View | Details | Raw Unified | Return to bug 282593 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/rubygem-rugged/Makefile (-6 / +5 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	rugged
3
PORTNAME=	rugged
4
PORTVERSION=	1.7.2
4
PORTVERSION=	1.7.2
5
PORTREVISION=	2
5
PORTREVISION=	3
6
CATEGORIES=	devel rubygems
6
CATEGORIES=	devel rubygems
7
MASTER_SITES=	RG
7
MASTER_SITES=	RG
8
8
Lines 13-23 WWW= https://github.com/libgit2/rugged Link Here
13
LICENSE=	MIT
13
LICENSE=	MIT
14
LICENSE_FILE=	${WRKSRC}/LICENSE
14
LICENSE_FILE=	${WRKSRC}/LICENSE
15
15
16
BUILD_DEPENDS=	libgit2>=${PORTVERSION:R}:devel/libgit2
16
LIB_DEPENDS=	libgmp.so:math/gmp \
17
LIB_DEPENDS=	libgit2.so:devel/libgit2 \
17
		libssh2.so:security/libssh2
18
		libgmp.so:math/gmp
19
18
20
CONFIGURE_ARGS=	--use-system-libraries
19
CONFIGURE_ARGS=	--with-ssh
21
USES=		gem pkgconfig
20
USES=		cmake:indirect gem pkgconfig ssl
22
21
23
.include <bsd.port.mk>
22
.include <bsd.port.mk>
(-)a/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb (-37 lines)
Removed Link Here
1
# Remove broken libgit2 detection
2
3
--- ext/rugged/extconf.rb.orig	2024-10-19 10:29:11 UTC
4
+++ ext/rugged/extconf.rb
5
@@ -65,32 +65,6 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_
6
 
7
 if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES'])
8
   puts "Building Rugged using system libraries.\n"
9
-
10
-  dir_config('git2').any? or pkg_config('libgit2')
11
-
12
-  major = minor = nil
13
-
14
-  File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line|
15
-    if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/))
16
-      major = matches[1]
17
-      next
18
-    end
19
-
20
-    if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR\s+([0-9]+)$/))
21
-      minor = matches[1]
22
-      next
23
-    end
24
-
25
-    break if major && minor
26
-  end
27
-
28
-  try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0"
29
-#include <git2/version.h>
30
-
31
-#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor}
32
-#error libgit2 version is not compatible
33
-#endif
34
-  SRC
35
 else
36
   if !find_executable('cmake')
37
     abort "ERROR: CMake is required to build Rugged."
(-)b/devel/rubygem-rugged/pkg-plist (+3 lines)
Added Link Here
1
@dir %%GEM_LIB_DIR%%/vendor/libgit2/build/CMakeFiles/3.30.5/CompilerIdC/tmp
2
@dir %%GEM_LIB_DIR%%/vendor/libgit2/build/CMakeFiles/CMakeScratch
3
@dir %%GEM_LIB_DIR%%/vendor/libgit2/build/CMakeFiles/pkgRedirects

Return to bug 282593