Attachment 78591 Details for Bug 113030 – file.diff

[patch] file.diff

file.diff (text/plain), 4.64 KB, created by Ed Schouten on 2007-05-26 16:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Schouten

Created: 2007-05-26 16:30:03 UTC

Size: 4.64 KB

patch

obsolete

>--- devel/git/Makefile	Fri May 25 19:13:27 2007
>+++ devel/git/Makefile	Sat May 26 17:11:45 2007
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	git
>-PORTVERSION=	1.5.0.3
>+PORTVERSION=	1.5.2
> CATEGORIES=	devel
> MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
> 
>@@ -36,7 +36,9 @@
> 		git-bisect.1 \
> 		git-blame.1 \
> 		git-branch.1 \
>+		git-bundle.1 \
> 		git-cat-file.1 \
>+		git-check-attr.1 \
> 		git-check-ref-format.1 \
> 		git-checkout-index.1 \
> 		git-checkout.1 \
>@@ -56,7 +58,6 @@
> 		git-describe.1 \
> 		git-diff-files.1 \
> 		git-diff-index.1 \
>-		git-diff-stages.1 \
> 		git-diff-tree.1 \
> 		git-diff.1 \
> 		git-fast-import.1 \
>@@ -87,6 +88,7 @@
> 		git-mailinfo.1 \
> 		git-mailsplit.1 \
> 		git-merge.1 \
>+		git-mergetool.1 \
> 		git-merge-base.1 \
> 		git-merge-file.1 \
> 		git-merge-index.1 \
>@@ -119,7 +121,6 @@
> 		git-request-pull.1 \
> 		git-rerere.1 \
> 		git-reset.1 \
>-		git-resolve.1 \
> 		git-rev-list.1 \
> 		git-rev-parse.1 \
> 		git-revert.1 \
>@@ -157,6 +158,7 @@
> 		git-write-tree.1 \
> 		gitk.1
> MAN3=		Git.3
>+MAN5=		gitattributes.5
> MAN7=		git.7
> 
> USE_BZIP2=	yes
>@@ -177,22 +179,14 @@
> 
> .ifndef WITHOUT_GUI
> PLIST_SUB+=	GUI=""
>-GITGUIVERSION=	0.6-GITGUI
> RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
> .else
> PLIST_SUB+=	GUI="@comment "
>-MAKE_ENV+=	NO_GUI=yes
>-.endif
>-
>-# We should place version files to avoid git's attempt to figure it by itself
>-post-patch:
>-	${ECHO} "GIT_VERSION = ${PORTVERSION}-dirty" > ${WRKSRC}/GIT-VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/GIT-VERSION-GEN
>-.ifndef WITHOUT_GUI
>-	${ECHO} "GIT_VERSION = ${GITGUIVERSION}-dirty" > ${WRKSRC}/git-gui/GIT-VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/git-gui/GIT-VERSION-GEN
>+MAKE_ENV+=	NO_TCLTK=yes
> .endif
> 
> post-install:
>-	${TEST} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod && ${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
>+	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
> 	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
> 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
> 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
>--- devel/git/distinfo	Fri May 25 19:13:27 2007
>+++ devel/git/distinfo	Sat May 26 16:54:53 2007
>@@ -1,3 +1,3 @@
>-MD5 (git-1.5.0.3.tar.bz2) = ea7a01dbde1da8fce235dde689bfeeea
>-SHA256 (git-1.5.0.3.tar.bz2) = 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a
>-SIZE (git-1.5.0.3.tar.bz2) = 1047037
>+MD5 (git-1.5.2.tar.bz2) = 79c749b720c29c024d948163fdc47dac
>+SHA256 (git-1.5.2.tar.bz2) = 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
>+SIZE (git-1.5.2.tar.bz2) = 1180424
>--- devel/git/pkg-plist	Fri May 25 19:13:27 2007
>+++ devel/git/pkg-plist	Sat May 26 17:12:52 2007
>@@ -11,7 +11,9 @@
> bin/git-bisect
> bin/git-blame
> bin/git-branch
>+bin/git-bundle
> bin/git-cat-file
>+bin/git-check-attr
> bin/git-check-ref-format
> bin/git-checkout
> bin/git-checkout-index
>@@ -33,10 +35,10 @@
> bin/git-diff
> bin/git-diff-files
> bin/git-diff-index
>-bin/git-diff-stages
> bin/git-diff-tree
> bin/git-fast-import
> bin/git-fetch
>+bin/git-fetch--tool
> bin/git-fetch-pack
> bin/git-fmt-merge-msg
> bin/git-for-each-ref
>@@ -73,7 +75,9 @@
> bin/git-merge-recursive
> bin/git-merge-resolve
> bin/git-merge-stupid
>+bin/git-merge-subtree
> bin/git-merge-tree
>+bin/git-mergetool
> bin/git-mktag
> bin/git-mktree
> bin/git-mv
>@@ -101,7 +105,6 @@
> bin/git-request-pull
> bin/git-rerere
> bin/git-reset
>-bin/git-resolve
> bin/git-rev-list
> bin/git-rev-parse
> bin/git-revert
>@@ -150,12 +153,29 @@
> 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-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/update
> share/git-core/templates/info/exclude
>+%%GUI%%share/git-gui/lib/blame.tcl
>+%%GUI%%share/git-gui/lib/branch.tcl
>+%%GUI%%share/git-gui/lib/browser.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/diff.tcl
>+%%GUI%%share/git-gui/lib/error.tcl
>+%%GUI%%share/git-gui/lib/index.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/shortcut.tcl
>+%%GUI%%share/git-gui/lib/tclIndex
>+%%GUI%%share/git-gui/lib/transport.tcl
> @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
> @dirrm lib/xemacs/site-lisp/git
> @dirrmtry lib/xemacs/site-lisp
>@@ -168,3 +188,5 @@
> @dirrm share/git-core/templates/info
> @dirrm share/git-core/templates
> @dirrm share/git-core
>+%%GUI%%@dirrm share/git-gui/lib
>+%%GUI%%@dirrm share/git-gui

Actions: View | Diff

Attachments on bug 113030: 78591