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

- Fix build with PERL and non-default LOCALBASE [1]

Browse Source 
- Fix build with DEVELOPER=yes [2]
- Do not install ZSH completion [3]
	- ZSH installs a better version itself
- Fix PLIST
- Bump PORTREVISION

PR:		213494 [1]
		214009 [2]
		214870 [3] (based on)
Submitted by:	John Hein <z7dr6ut7gs@snkmail.com> [1] [3]
		Michael Zuo <muh.muhten@gmail.com>
Sponsored by:	Rubicon Communications (Netgate)
This commit is contained in:
Renato Botelho 2016-12-01 15:24:06 +00:00
parent 3e4e8900d7
commit 58db8235a2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427505
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/git/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= git
DISTVERSION= 2.11.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@ -27,6 +28,7 @@ GNU_CONFIGURE= yes
USES= gmake shebangfix ssl tar:xz
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS+= DEVELOPER_CFLAGS=
MAKE_ENV+= V=1
USE_RC_SUBR= git_daemon
SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
@ -56,7 +58,7 @@ NLS_USES= gettext
NLS_MAKE_ARGS_OFF= NO_GETTEXT=yes
PERL_USES= perl5
PERL_MAKE_ENV= PERL_PATH=${PERL}
PERL_CONFIGURE_WITH= perl=${PERL}
PERL_BUILD_DEPENDS= p5-Error>=0:lang/p5-Error
PERL_RUN_DEPENDS= p5-Error>=0:lang/p5-Error
PERL_MAKE_ARGS_OFF= NO_PERL=1
@ -198,21 +200,15 @@ post-install-CONTRIB-on:
${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
# Symlink the completions from the contrib directory to where they
# will be useful
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
${STAGEDIR}${PREFIX}/share/zsh/site-functions
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
@${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \
${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
@${LN} -s ../../../share/git-core/contrib/completion/git-completion.zsh \
${STAGEDIR}${PREFIX}/share/zsh/site-functions/_git
post-install-CONTRIB-off:
# Install the contrib completions anyway
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
${STAGEDIR}${PREFIX}/share/zsh/site-functions
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
@${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
@${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.zsh \
${STAGEDIR}${PREFIX}/share/zsh/site-functions/_git
post-install-P4-on:
${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/

7
devel/git/pkg-plist
View File

@ -83,8 +83,6 @@ libexec/git-core/git-grep
libexec/git-core/git-hash-object
libexec/git-core/git-help
libexec/git-core/git-http-backend
%%CURL%%libexec/git-core/git-http-fetch
%%CURL%%libexec/git-core/git-http-push
libexec/git-core/git-imap-send
libexec/git-core/git-index-pack
libexec/git-core/git-init
@ -137,10 +135,6 @@ libexec/git-core/git-relink
libexec/git-core/git-remote
libexec/git-core/git-remote-ext
libexec/git-core/git-remote-fd
%%CURL%%libexec/git-core/git-remote-ftp
%%CURL%%libexec/git-core/git-remote-ftps
%%CURL%%libexec/git-core/git-remote-http
%%CURL%%libexec/git-core/git-remote-https
libexec/git-core/git-remote-testsvn
libexec/git-core/git-repack
libexec/git-core/git-replace
@ -1455,5 +1449,4 @@ share/git-core/templates/info/exclude
%%NLS%%share/locale/sv/LC_MESSAGES/git.mo
%%NLS%%share/locale/vi/LC_MESSAGES/git.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
share/zsh/site-functions/_git
@dir share/git-core/templates/branches