svn commit: r396048 - in head/devel/git: . files
Renato Botelho
garga at FreeBSD.org
Thu Sep 3 22:00:05 UTC 2015
Author: garga
Date: Thu Sep 3 22:00:03 2015
New Revision: 396048
URL: https://svnweb.freebsd.org/changeset/ports/396048
Log:
- Update to 2.5.1
- Fix build with NO_PERL set backporting a commit from git repo (82aec45)
- Add git-submodile, git-am and git-request-pull to the list of commands
that doesn't work without perl
Added:
head/devel/git/files/patch-generate-cmdlist.sh (contents, props changed)
Modified:
head/devel/git/Makefile
head/devel/git/distinfo
head/devel/git/files/patch-Documentation__Makefile
head/devel/git/files/patch-Makefile
head/devel/git/pkg-plist
Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile Thu Sep 3 21:57:40 2015 (r396047)
+++ head/devel/git/Makefile Thu Sep 3 22:00:03 2015 (r396048)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git
-PORTVERSION= 2.4.6
+PORTVERSION= 2.5.1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -31,6 +31,7 @@ MAKE_ENV+= V=1
USE_OPENSSL= yes
USE_RC_SUBR= git_daemon
SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
+ t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \
contrib/hooks/update-paranoid \
contrib/credential/netrc/git-credential-netrc \
contrib/diff-highlight/diff-highlight \
@@ -155,6 +156,7 @@ post-patch:
.endif
.if empty(PORT_OPTIONS:MGITWEB)
@${REINPLACE_CMD} -e '/$$(MAKE) -C gitweb install/d' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/t/gitweb-lib.sh
.endif
.if empty(PORT_OPTIONS:MP4)
@${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile
Modified: head/devel/git/distinfo
==============================================================================
--- head/devel/git/distinfo Thu Sep 3 21:57:40 2015 (r396047)
+++ head/devel/git/distinfo Thu Sep 3 22:00:03 2015 (r396048)
@@ -1,6 +1,6 @@
-SHA256 (git-2.4.6.tar.xz) = bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6
-SIZE (git-2.4.6.tar.xz) = 3690432
-SHA256 (git-manpages-2.4.6.tar.xz) = f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e
-SIZE (git-manpages-2.4.6.tar.xz) = 373408
-SHA256 (git-htmldocs-2.4.6.tar.xz) = 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88
-SIZE (git-htmldocs-2.4.6.tar.xz) = 994712
+SHA256 (git-2.5.1.tar.xz) = b3ceb7b118221b8c74d0abdc62ab035a58360dbbd28ca17c53e301e517d4220f
+SIZE (git-2.5.1.tar.xz) = 3741764
+SHA256 (git-manpages-2.5.1.tar.xz) = 6e403070ee71678acad0b7f53bc5327e13b42cebccc6769177fe0b4a11f042e3
+SIZE (git-manpages-2.5.1.tar.xz) = 378028
+SHA256 (git-htmldocs-2.5.1.tar.xz) = 2ebf4761a793d4c8bdf49ff04937c08408c8903160d910eba5714786535d0c83
+SIZE (git-htmldocs-2.5.1.tar.xz) = 1008284
Modified: head/devel/git/files/patch-Documentation__Makefile
==============================================================================
--- head/devel/git/files/patch-Documentation__Makefile Thu Sep 3 21:57:40 2015 (r396047)
+++ head/devel/git/files/patch-Documentation__Makefile Thu Sep 3 22:00:03 2015 (r396048)
@@ -1,4 +1,4 @@
---- Documentation/Makefile.orig 2015-07-15 20:29:34 UTC
+--- Documentation/Makefile.orig 2015-08-28 19:37:13 UTC
+++ Documentation/Makefile
@@ -86,11 +86,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_T
DOC_MAN5 = $(patsubst %.txt,%.5,$(MAN5_TXT))
Modified: head/devel/git/files/patch-Makefile
==============================================================================
--- head/devel/git/files/patch-Makefile Thu Sep 3 21:57:40 2015 (r396047)
+++ head/devel/git/files/patch-Makefile Thu Sep 3 22:00:03 2015 (r396048)
@@ -1,6 +1,6 @@
---- Makefile.orig 2015-07-15 20:29:34 UTC
+--- Makefile.orig 2015-08-28 19:37:13 UTC
+++ Makefile
-@@ -366,8 +366,8 @@ GIT-VERSION-FILE: FORCE
+@@ -369,8 +369,8 @@ GIT-VERSION-FILE: FORCE
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,7 +11,7 @@
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
-@@ -389,15 +389,15 @@ STRIP ?= strip
+@@ -392,15 +392,15 @@ STRIP ?= strip
prefix = $(HOME)
bindir_relative = bin
bindir = $(prefix)/$(bindir_relative)
@@ -31,7 +31,7 @@
ETC_GITCONFIG = $(sysconfdir)/gitconfig
ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
lib = lib
-@@ -410,21 +410,21 @@ htmldir_relative = $(patsubst $(prefix)/
+@@ -413,21 +413,21 @@ htmldir_relative = $(patsubst $(prefix)/
export prefix bindir sharedir sysconfdir gitwebdir localedir
@@ -68,7 +68,7 @@
export TCL_PATH TCLTK_PATH
-@@ -1090,9 +1090,9 @@ EXTLIBS += -lz
+@@ -1095,9 +1095,9 @@ EXTLIBS += -lz
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
@@ -81,3 +81,25 @@
else
OPENSSL_LINK =
endif
+@@ -1696,10 +1696,10 @@ $(BUILT_INS): git$X
+ ln -s $< $@ 2>/dev/null || \
+ cp $< $@
+
+-common-cmds.h: generate-cmdlist.perl command-list.txt
++common-cmds.h: generate-cmdlist.sh command-list.txt
+
+ common-cmds.h: $(wildcard Documentation/git-*.txt)
+- $(QUIET_GEN)$(PERL_PATH) generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
++ $(QUIET_GEN)$(SHELL_PATH) generate-cmdlist.sh command-list.txt > $@+ && mv $@+ $@
+
+ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
+ $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
+@@ -1791,7 +1791,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT
+ chmod +x $@+ && \
+ mv $@+ $@
+ else # NO_PERL
+-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
++$(SCRIPT_PERL_GEN) git-instaweb git-submodule git-am git-request-pull: % : unimplemented.sh
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
Added: head/devel/git/files/patch-generate-cmdlist.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/git/files/patch-generate-cmdlist.sh Thu Sep 3 22:00:03 2015 (r396048)
@@ -0,0 +1,53 @@
+--- generate-cmdlist.sh.orig 2015-09-03 20:25:24 UTC
++++ generate-cmdlist.sh
+@@ -0,0 +1,50 @@
++#!/bin/sh
++
++echo "/* Automatically generated by $0 */
++struct cmdname_help {
++ char name[16];
++ char help[80];
++ unsigned char group;
++};
++
++static const char *common_cmd_groups[] = {"
++
++grps=grps$$.tmp
++match=match$$.tmp
++trap "rm -f '$grps' '$match'" 0 1 2 3 15
++
++sed -n '
++ 1,/^### common groups/b
++ /^### command list/q
++ /^#/b
++ /^[ ]*$/b
++ h;s/^[^ ][^ ]*[ ][ ]*\(.*\)/ N_("\1"),/p
++ g;s/^\([^ ][^ ]*\)[ ].*/\1/w '$grps'
++ ' "$1"
++printf '};\n\n'
++
++n=0
++substnum=
++while read grp
++do
++ echo "^git-..*[ ]$grp"
++ substnum="$substnum${substnum:+;}s/[ ]$grp/$n/"
++ n=$(($n+1))
++done <"$grps" >"$match"
++
++printf 'static struct cmdname_help common_cmds[] = {\n'
++grep -f "$match" "$1" |
++sed 's/^git-//' |
++sort |
++while read cmd tags
++do
++ tag=$(echo "$tags" | sed "$substnum; s/[^0-9]//g")
++ sed -n '
++ /^NAME/,/git-'"$cmd"'/H
++ ${
++ x
++ s/.*git-'"$cmd"' - \(.*\)/ {"'"$cmd"'", N_("\1"), '$tag'},/
++ p
++ }' "Documentation/git-$cmd.txt"
++done
++echo "};"
Modified: head/devel/git/pkg-plist
==============================================================================
--- head/devel/git/pkg-plist Thu Sep 3 21:57:40 2015 (r396047)
+++ head/devel/git/pkg-plist Thu Sep 3 22:00:03 2015 (r396048)
@@ -154,6 +154,7 @@ man/man1/git-verify-tag.1.gz
man/man1/git-web--browse.1.gz
man/man1/git-whatchanged.1.gz
man/man1/git-write-tree.1.gz
+man/man1/git-worktree.1.gz
%%GUI%%man/man1/gitk.1.gz
man/man1/gitremote-helpers.1.gz
man/man1/gitweb.1.gz
@@ -349,6 +350,7 @@ libexec/git-core/git-verify-pack
libexec/git-core/git-verify-tag
libexec/git-core/git-web--browse
libexec/git-core/git-whatchanged
+libexec/git-core/git-worktree
libexec/git-core/git-write-tree
libexec/git-core/mergetools/codecompare
libexec/git-core/mergetools/deltawalker
@@ -373,6 +375,7 @@ libexec/git-core/mergetools/kompare
libexec/git-core/mergetools/opendiff
libexec/git-core/mergetools/emerge
libexec/git-core/mergetools/araxis
+libexec/git-core/mergetools/winmerge
%%GUI%%bin/gitk
%%PERL%%%%SITE_PERL%%/Git.pm
%%PERL%%%%SITE_PERL%%/Git/I18N.pm
@@ -524,6 +527,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/git-fetch.html
%%HTMLDOCS%%%%DOCSDIR%%/git-filter-branch.html
%%HTMLDOCS%%%%DOCSDIR%%/git-fmt-merge-msg.html
+%%HTMLDOCS%%%%DOCSDIR%%/fmt-merge-msg-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-for-each-ref.html
%%HTMLDOCS%%%%DOCSDIR%%/git-format-patch.html
%%HTMLDOCS%%%%DOCSDIR%%/git-fsck-objects.html
@@ -759,6 +763,8 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/git-stage.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-status.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-worktree.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-worktree.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
%%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
@@ -1224,6 +1230,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.3.8.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.2.txt
@@ -1231,6 +1238,10 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.4.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.5.1.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -1318,7 +1329,7 @@ share/git-core/templates/info/exclude
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive.example
%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
More information about the svn-ports-head
mailing list