Attachment #79714 for bug #114472

View | Details | Raw Unified | Return to bug 114472
Collapse All | Expand All

Lines 6-12 Link Here

(-)devel/git/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= git	8	PORTNAME= git
9	PORTVERSION= 1.5.2.1	9	PORTVERSION= 1.5.2.3
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://www.kernel.org/pub/software/scm/git/	11	MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
12	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \	12	DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
Lines 172-178 Link Here
172	WITH_P4IMPORT=yes \	172	WITH_P4IMPORT=yes \
173	LDFLAGS="-L${LOCALBASE}/lib" \	173	LDFLAGS="-L${LOCALBASE}/lib" \
174	PYTHON_PATH=${LOCALBASE}/bin/python \	174	PYTHON_PATH=${LOCALBASE}/bin/python \
175	PERL_PATH=${PERL}	175	PERL_PATH=${PERL} \
		176	LIBMD_SHA1=yes
176	MAKE_ARGS+= prefix="${PREFIX}"	177	MAKE_ARGS+= prefix="${PREFIX}"
177		178
178	.ifndef WITHOUT_GUI	179	.ifndef WITHOUT_GUI

Lines 1-6 Link Here

(-)devel/git/distinfo (-6 / +6 lines)
1	MD5 (git-1.5.2.1.tar.bz2) = 0a39e786a12974cbe7b14f2fe92dc163	1	MD5 (git-1.5.2.3.tar.bz2) = 8bb8995f098826154178d5f2d926b6c6
2	SHA256 (git-1.5.2.1.tar.bz2) = 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37	2	SHA256 (git-1.5.2.3.tar.bz2) = d7a92ec68849cc8b333f10263ea3c9c19ccc99fe9b581b5769fb729b14ac54ac
3	SIZE (git-1.5.2.1.tar.bz2) = 1184392	3	SIZE (git-1.5.2.3.tar.bz2) = 1191521
4	MD5 (git-manpages-1.5.2.1.tar.bz2) = e9da37e899167a4f36a71c8fee46e6a0	4	MD5 (git-manpages-1.5.2.3.tar.bz2) = 04c7b173c30871b012297f6aa76abcb1
5	SHA256 (git-manpages-1.5.2.1.tar.bz2) = f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f	5	SHA256 (git-manpages-1.5.2.3.tar.bz2) = 39b4029e064ed748fb1631ff623d5a10c2809b3262e55cf9e6aee701ce032a92
6	SIZE (git-manpages-1.5.2.1.tar.bz2) = 139651	6	SIZE (git-manpages-1.5.2.3.tar.bz2) = 139820




 
 export TCL_PATH TCLTK_PATH
 
@@ -634,6 +634,10 @@
 	BASIC_CFLAGS += -DOLD_ICONV
 endif
 
+ifdef LIBMD_SHA1
+	SHA1_HEADER = "sha.h"
+	EXTLIBS += -lmd
+else
 ifdef PPC_SHA1
 	SHA1_HEADER = "ppc/sha1.h"
 	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
@@ -648,6 +652,7 @@
 else
 	SHA1_HEADER = <openssl/sha.h>
 	EXTLIBS += $(LIB_4_CRYPTO)
+endif
 endif
 endif
 endif

Return to bug 114472

Lines 32-34 Link Here

(-)devel/git/files/patch-Makefile (+19 lines)
32		32
33	export TCL_PATH TCLTK_PATH	33	export TCL_PATH TCLTK_PATH
34		34
		35	@@ -634,6 +634,10 @@
		36	BASIC_CFLAGS += -DOLD_ICONV
		37	endif
		38
		39	+ifdef LIBMD_SHA1
		40	+ SHA1_HEADER = "sha.h"
		41	+ EXTLIBS += -lmd
		42	+else
		43	ifdef PPC_SHA1
		44	SHA1_HEADER = "ppc/sha1.h"
		45	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
		46	@@ -648,6 +652,7 @@
		47	else
		48	SHA1_HEADER = <openssl/sha.h>
		49	EXTLIBS += $(LIB_4_CRYPTO)
		50	+endif
		51	endif
		52	endif
		53	endif