mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

Fix botched path correction that resulted in merges not working.

Browse Source
This commit is contained in:
Eric Anholt 2006-02-09 22:28:57 +00:00
parent 7fb1f0eb81
commit ec2e49fc11
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=155610
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/git/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= git
PORTVERSION= 1.1.6
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
@ -24,11 +25,8 @@ USE_GMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
MAKE_ENV+= CURLDIR=${LOCALBASE} \
NEEDS_LIBICONV=yes \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib" \
PYTHON_PATH=${LOCALBASE}/bin/python
MAKE_ARGS+= prefix="${PREFIX}"
pre-patch:
${REINPLACE_CMD} "s|/usr/bin/python|${LOCALBASE}/bin/python|g" \
${WRKSRC}/git-merge-recursive.py
.include <bsd.port.mk>