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

Collapse All | Expand All

(-)libgit2/Makefile (-5 / +8 lines)
Lines 1-25 Link Here
1
# $FreeBSD: head/devel/libgit2/Makefile 377075 2015-01-15 11:01:25Z wg $
1
# $FreeBSD: head/devel/libgit2/Makefile 377075 2015-01-15 11:01:25Z wg $
2
2
3
PORTNAME=	libgit2
3
PORTNAME=	libgit2
4
PORTVERSION=	0.21.1
4
PORTVERSION=	0.22.0
5
PORTREVISION=	1
6
CATEGORIES=	devel
5
CATEGORIES=	devel
7
6
8
MAINTAINER=	wg@FreeBSD.org
7
MAINTAINER=	wg@FreeBSD.org
9
COMMENT=	Portable, pure C implementation of the Git core
8
COMMENT=	Portable, pure C implementation of the Git core
10
9
11
LICENSE=	GPLv2
10
LICENSE=	GPLv2
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
12
13
USE_GITHUB=	yes
13
USE_GITHUB=	yes
14
GH_ACCOUNT=	libgit2
14
GH_ACCOUNT=	libgit2
15
GH_TAGNAME=	v${PORTVERSION}
15
GH_TAGNAME=	v${PORTVERSION}
16
GH_COMMIT=	b4d00c1
16
GH_COMMIT=	04bdd97
17
17
18
USES=		cmake python:build
18
USES=		cmake python:build
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
USE_OPENSSL=	yes
20
USE_OPENSSL=	yes
21
CMAKE_ARGS+=	-DBUILD_CLAR:BOOL=OFF
21
22
22
PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:E}
23
PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E}
23
24
24
OPTIONS_DEFINE=	SSH THREADS
25
OPTIONS_DEFINE=	SSH THREADS
25
OPTIONS_DEFAULT=SSH THREADS
26
OPTIONS_DEFAULT=SSH THREADS
Lines 39-45 Link Here
39
40
40
post-patch:
41
post-patch:
41
	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
42
	@${REINPLACE_CMD} -e "s|/pkgconfig|/../libdata/pkgconfig|; \
42
		/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
43
		/LIBGIT2_PC_REQUIRES.*zlib/d ; \
44
		s/PKG_CHECK_MODULES(LIBSSH2 libssh2)/FIND_PACKAGE(LIBSSH2)/" \
45
		${WRKSRC}/CMakeLists.txt
43
.if defined(WITH_OPENSSL_BASE)
46
.if defined(WITH_OPENSSL_BASE)
44
	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
47
	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
45
		${WRKSRC}/CMakeLists.txt
48
		${WRKSRC}/CMakeLists.txt
(-)libgit2/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (libgit2-0.21.1.tar.gz) = 7faed833d59890ca11957610e020aef3d91e56027408e956d5eb3c9f35dbcb29
1
SHA256 (libgit2-0.22.0.tar.gz) = 5359a7256a3c7ba8293029dd31528d6d60d3e396c1b95c157c0f32de15471af8
2
SIZE (libgit2-0.21.1.tar.gz) = 3428317
2
SIZE (libgit2-0.22.0.tar.gz) = 3587964
(-)libgit2/files/patch-src_openssl_stream.c (+11 lines)
Line 0 Link Here
1
--- src/openssl_stream.c.orig	2015-01-12 11:59:46.000000000 +0400
2
+++ src/openssl_stream.c	2015-01-15 16:46:27.000000000 +0400
3
@@ -7,6 +7,8 @@
4
 
5
 #ifdef GIT_SSL
6
 
7
+#include <sys/socket.h>
8
+#include <netinet/in.h>
9
 #include <openssl/ssl.h>
10
 #include <openssl/err.h>
11
 #include <openssl/x509v3.h>
(-)libgit2/pkg-plist (-9 / +18 lines)
Lines 1-4 Link Here
1
include/git2.h
1
include/git2/annotated_commit.h
2
include/git2/attr.h
2
include/git2/attr.h
3
include/git2/blame.h
3
include/git2/blame.h
4
include/git2/blob.h
4
include/git2/blob.h
Lines 11-19 Link Here
11
include/git2/common.h
11
include/git2/common.h
12
include/git2/config.h
12
include/git2/config.h
13
include/git2/cred_helpers.h
13
include/git2/cred_helpers.h
14
include/git2/describe.h
14
include/git2/diff.h
15
include/git2/diff.h
15
include/git2/errors.h
16
include/git2/errors.h
16
include/git2/filter.h
17
include/git2/filter.h
18
include/git2/global.h
17
include/git2/graph.h
19
include/git2/graph.h
18
include/git2/ignore.h
20
include/git2/ignore.h
19
include/git2/index.h
21
include/git2/index.h
Lines 27-36 Link Here
27
include/git2/odb.h
29
include/git2/odb.h
28
include/git2/odb_backend.h
30
include/git2/odb_backend.h
29
include/git2/oid.h
31
include/git2/oid.h
32
include/git2/oidarray.h
30
include/git2/pack.h
33
include/git2/pack.h
31
include/git2/patch.h
34
include/git2/patch.h
32
include/git2/pathspec.h
35
include/git2/pathspec.h
33
include/git2/push.h
36
include/git2/push.h
37
include/git2/rebase.h
34
include/git2/refdb.h
38
include/git2/refdb.h
35
include/git2/reflog.h
39
include/git2/reflog.h
36
include/git2/refs.h
40
include/git2/refs.h
Lines 47-71 Link Here
47
include/git2/stdint.h
51
include/git2/stdint.h
48
include/git2/strarray.h
52
include/git2/strarray.h
49
include/git2/submodule.h
53
include/git2/submodule.h
50
include/git2/tag.h
51
include/git2/threads.h
52
include/git2/trace.h
53
include/git2/transport.h
54
include/git2/tree.h
55
include/git2/types.h
56
include/git2/version.h
57
include/git2/sys/commit.h
54
include/git2/sys/commit.h
58
include/git2/sys/config.h
55
include/git2/sys/config.h
59
include/git2/sys/diff.h
56
include/git2/sys/diff.h
60
include/git2/sys/filter.h
57
include/git2/sys/filter.h
58
include/git2/sys/hashsig.h
61
include/git2/sys/index.h
59
include/git2/sys/index.h
62
include/git2/sys/mempack.h
60
include/git2/sys/mempack.h
63
include/git2/sys/odb_backend.h
61
include/git2/sys/odb_backend.h
62
include/git2/sys/openssl.h
64
include/git2/sys/refdb_backend.h
63
include/git2/sys/refdb_backend.h
65
include/git2/sys/reflog.h
64
include/git2/sys/reflog.h
66
include/git2/sys/refs.h
65
include/git2/sys/refs.h
67
include/git2/sys/repository.h
66
include/git2/sys/repository.h
67
include/git2/sys/stream.h
68
include/git2/sys/transport.h
69
include/git2/tag.h
70
include/git2/trace.h
71
include/git2/transaction.h
72
include/git2/transport.h
73
include/git2/tree.h
74
include/git2/types.h
75
include/git2/version.h
76
include/git2.h
68
lib/libgit2.so
77
lib/libgit2.so
69
lib/libgit2.so.0.%%SHLIB_VER%%.0
78
lib/libgit2.so.%%PORTVERSION%%
70
lib/libgit2.so.%%SHLIB_VER%%
79
lib/libgit2.so.%%SHLIB_VER%%
71
libdata/pkgconfig/libgit2.pc
80
libdata/pkgconfig/libgit2.pc

Return to bug 196176