Attachment 86265 Details for Bug 122665 – file.diff

[patch] file.diff

file.diff (text/plain), 6.68 KB, created by Andrew Bennett on 2008-04-11 18:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bennett

Created: 2008-04-11 18:00:07 UTC

Size: 6.68 KB

patch

obsolete

>diff --git a/devel/git/Makefile b/devel/git/Makefile
>index b21a882..dad882b 100644
>--- a/devel/git/Makefile
>+++ b/devel/git/Makefile
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	git
>-PORTVERSION=	1.5.3.8
>+PORTVERSION=	1.5.5
> CATEGORIES=	devel
> MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
> DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
>@@ -46,7 +46,6 @@ MAN1=		git-add.1 \
> 		git-commit-tree.1 \
> 		git-commit.1 \
> 		git-config.1 \
>-		git-convert-objects.1 \
> 		git-count-objects.1 \
> 		git-cvsexportcommit.1 \
> 		git-cvsimport.1 \
>@@ -57,6 +56,7 @@ MAN1=		git-add.1 \
> 		git-diff-index.1 \
> 		git-diff-tree.1 \
> 		git-diff.1 \
>+		git-fast-export.1 \
> 		git-fast-import.1 \
> 		git-fetch-pack.1 \
> 		git-fetch.1 \
>@@ -70,6 +70,7 @@ MAN1=		git-add.1 \
> 		git-get-tar-commit-id.1 \
> 		git-grep.1 \
> 		git-hash-object.1 \
>+		git-help.1 \
> 		git-http-fetch.1 \
> 		git-http-push.1 \
> 		git-imap-send.1 \
>@@ -77,7 +78,6 @@ MAN1=		git-add.1 \
> 		git-init-db.1 \
> 		git-init.1 \
> 		git-instaweb.1 \
>-		git-local-fetch.1 \
> 		git-log.1 \
> 		git-lost-found.1 \
> 		git-ls-files.1 \
>@@ -122,7 +122,6 @@ MAN1=		git-add.1 \
> 		git-rev-parse.1 \
> 		git-revert.1 \
> 		git-rm.1 \
>-		git-runstatus.1 \
> 		git-send-email.1 \
> 		git-send-pack.1 \
> 		git-sh-setup.1 \
>@@ -132,14 +131,11 @@ MAN1=		git-add.1 \
> 		git-show-index.1 \
> 		git-show-ref.1 \
> 		git-show.1 \
>-		git-ssh-fetch.1 \
>-		git-ssh-upload.1 \
> 		git-stash.1 \
> 		git-status.1 \
> 		git-stripspace.1 \
> 		git-submodule.1 \
> 		git-svn.1 \
>-		git-svnimport.1 \
> 		git-symbolic-ref.1 \
> 		git-tag.1 \
> 		git-tar-tree.1 \
>@@ -153,10 +149,12 @@ MAN1=		git-add.1 \
> 		git-var.1 \
> 		git-verify-pack.1 \
> 		git-verify-tag.1 \
>+		git-web--browse.1 \
> 		git-whatchanged.1 \
> 		git-write-tree.1
> MAN3=		Git.3
> MAN5=		gitattributes.5 \
>+		gitcli.5 \
> 		gitignore.5 \
> 		gitmodules.5
> MAN7=		git.7
>diff --git a/devel/git/distinfo b/devel/git/distinfo
>index 5c5db74..887ad81 100644
>--- a/devel/git/distinfo
>+++ b/devel/git/distinfo
>@@ -1,6 +1,6 @@
>-MD5 (git-1.5.3.8.tar.bz2) = bb2477df09d4af52b05f0ee64d6ccc54
>-SHA256 (git-1.5.3.8.tar.bz2) = f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77
>-SIZE (git-1.5.3.8.tar.bz2) = 1363259
>-MD5 (git-manpages-1.5.3.8.tar.bz2) = 6aebdb18ab71309d6404f5be3cd7f09d
>-SHA256 (git-manpages-1.5.3.8.tar.bz2) = 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
>-SIZE (git-manpages-1.5.3.8.tar.bz2) = 147875
>+MD5 (git-1.5.5.tar.bz2) = 09f15f0b0e330986d930746abf6962f4
>+SHA256 (git-1.5.5.tar.bz2) = 27483890c598450d7d1b4583e40dd8ec6c8def08c7cec94b20eb7336bb83e65e
>+SIZE (git-1.5.5.tar.bz2) = 1673736
>+MD5 (git-manpages-1.5.5.tar.bz2) = 62a82276856add1d2b310d1e0b5ad5db
>+SHA256 (git-manpages-1.5.5.tar.bz2) = cc7f16b72a228cafd6bcc41ea09fdc67f4c5d50a0bf4521b80d8ea75127bb802
>+SIZE (git-manpages-1.5.5.tar.bz2) = 162609
>diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
>index 4ee4d52..255a5e2 100644
>--- a/devel/git/pkg-plist
>+++ b/devel/git/pkg-plist
>@@ -23,7 +23,6 @@ bin/git-clone
> bin/git-commit
> bin/git-commit-tree
> bin/git-config
>-bin/git-convert-objects
> bin/git-count-objects
> bin/git-cvsexportcommit
> bin/git-cvsimport
>@@ -34,6 +33,7 @@ bin/git-diff
> bin/git-diff-files
> bin/git-diff-index
> bin/git-diff-tree
>+bin/git-fast-export
> bin/git-fast-import
> bin/git-fetch
> bin/git-fetch--tool
>@@ -56,7 +56,6 @@ bin/git-index-pack
> bin/git-init
> bin/git-init-db
> bin/git-instaweb
>-bin/git-local-fetch
> bin/git-log
> bin/git-lost-found
> bin/git-ls-files
>@@ -110,7 +109,6 @@ bin/git-rev-list
> bin/git-rev-parse
> bin/git-revert
> bin/git-rm
>-bin/git-runstatus
> bin/git-send-email
> bin/git-send-pack
> bin/git-sh-setup
>@@ -122,16 +120,11 @@ bin/git-show
> bin/git-show-branch
> bin/git-show-index
> bin/git-show-ref
>-bin/git-ssh-fetch
>-bin/git-ssh-pull
>-bin/git-ssh-push
>-bin/git-ssh-upload
> bin/git-stash
> bin/git-status
> bin/git-stripspace
> bin/git-submodule
> bin/git-svn
>-bin/git-svnimport
> bin/git-symbolic-ref
> bin/git-tag
> bin/git-tar-tree
>@@ -145,6 +138,7 @@ bin/git-upload-pack
> bin/git-var
> bin/git-verify-pack
> bin/git-verify-tag
>+bin/git-web--browse
> bin/git-whatchanged
> bin/git-write-tree
> %%GUI%%bin/gitk
>@@ -158,14 +152,16 @@ share/git-core/templates/description
> share/git-core/templates/hooks/applypatch-msg
> share/git-core/templates/hooks/commit-msg
> share/git-core/templates/hooks/post-commit
>-share/git-core/templates/hooks/post-update
> share/git-core/templates/hooks/post-receive
>+share/git-core/templates/hooks/post-update
> share/git-core/templates/hooks/pre-applypatch
> share/git-core/templates/hooks/pre-commit
> share/git-core/templates/hooks/pre-rebase
>+share/git-core/templates/hooks/prepare-commit-msg
> share/git-core/templates/hooks/update
> share/git-core/templates/info/exclude
> %%GUI%%share/git-gui/lib/tclIndex
>+%%GUI%%share/git-gui/lib/about.tcl
> %%GUI%%share/git-gui/lib/blame.tcl
> %%GUI%%share/git-gui/lib/branch.tcl
> %%GUI%%share/git-gui/lib/branch_checkout.tcl
>@@ -175,22 +171,39 @@ share/git-core/templates/info/exclude
> %%GUI%%share/git-gui/lib/browser.tcl
> %%GUI%%share/git-gui/lib/checkout_op.tcl
> %%GUI%%share/git-gui/lib/choose_font.tcl
>+%%GUI%%share/git-gui/lib/choose_repository.tcl
> %%GUI%%share/git-gui/lib/choose_rev.tcl
> %%GUI%%share/git-gui/lib/class.tcl
> %%GUI%%share/git-gui/lib/commit.tcl
> %%GUI%%share/git-gui/lib/console.tcl
> %%GUI%%share/git-gui/lib/database.tcl
>+%%GUI%%share/git-gui/lib/date.tcl
> %%GUI%%share/git-gui/lib/diff.tcl
> %%GUI%%share/git-gui/lib/encoding.tcl
> %%GUI%%share/git-gui/lib/error.tcl
>+%%GUI%%share/git-gui/lib/git-gui.ico
> %%GUI%%share/git-gui/lib/index.tcl
>+%%GUI%%share/git-gui/lib/logo.tcl
> %%GUI%%share/git-gui/lib/merge.tcl
> %%GUI%%share/git-gui/lib/option.tcl
> %%GUI%%share/git-gui/lib/remote.tcl
> %%GUI%%share/git-gui/lib/remote_branch_delete.tcl
> %%GUI%%share/git-gui/lib/shortcut.tcl
>+%%GUI%%share/git-gui/lib/spellcheck.tcl
> %%GUI%%share/git-gui/lib/status_bar.tcl
> %%GUI%%share/git-gui/lib/transport.tcl
>+%%GUI%%share/git-gui/lib/win32.tcl
>+%%GUI%%share/git-gui/lib/win32_shortcut.js
>+%%GUI%%share/git-gui/lib/msgs/de.msg
>+%%GUI%%share/git-gui/lib/msgs/fr.msg
>+%%GUI%%share/git-gui/lib/msgs/hu.msg
>+%%GUI%%share/git-gui/lib/msgs/it.msg
>+%%GUI%%share/git-gui/lib/msgs/ja.msg
>+%%GUI%%share/git-gui/lib/msgs/ru.msg
>+%%GUI%%share/git-gui/lib/msgs/sv.msg
>+%%GUI%%share/git-gui/lib/msgs/zh_cn.msg
>+%%GUI%%share/gitk/lib/msgs/de.msg
>+%%GUI%%share/gitk/lib/msgs/it.msg
> @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
> @dirrm lib/xemacs/site-lisp/git
> @dirrmtry lib/xemacs/site-lisp
>@@ -198,6 +211,10 @@ share/git-core/templates/info/exclude
> @dirrm share/emacs/site-lisp/git
> @dirrmtry share/emacs/site-lisp
> @dirrmtry share/emacs
>+%%GUI%%@dirrm share/gitk/lib/msgs
>+%%GUI%%@dirrm share/gitk/lib
>+%%GUI%%@dirrm share/gitk
>+%%GUI%%@dirrm share/git-gui/lib/msgs
> %%GUI%%@dirrm share/git-gui/lib
> %%GUI%%@dirrm share/git-gui
> @dirrm share/git-core/templates/branches

Actions: View | Diff

Attachments on bug 122665: 86265