Attachment 81412 Details for Bug 116593 – 1.5.2.1-to-1.5.3.2.diff

[patch] 1.5.2.1-to-1.5.3.2.diff

1.5.2.1-to-1.5.3.2.diff (text/plain), 6.10 KB, created by Eygene Ryabinkin on 2007-09-24 05:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eygene Ryabinkin

Created: 2007-09-24 05:50:02 UTC

Size: 6.10 KB

patch

obsolete

>diff -urN ./Makefile ../git/Makefile
>--- ./Makefile	2007-09-21 22:00:09.000000000 +0400
>+++ ../git/Makefile	2007-09-21 23:15:27.000000000 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	git
>-PORTVERSION=	1.5.2.1
>+PORTVERSION=	1.5.3.2
> CATEGORIES=	devel
> MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
> DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
>@@ -28,8 +28,6 @@
> 		git-am.1 \
> 		git-annotate.1 \
> 		git-apply.1 \
>-		git-applymbox.1 \
>-		git-applypatch.1 \
> 		git-archimport.1 \
> 		git-archive.1 \
> 		git-bisect.1 \
>@@ -97,7 +95,6 @@
> 		git-mktree.1 \
> 		git-mv.1 \
> 		git-name-rev.1 \
>-		git-p4import.1 \
> 		git-pack-objects.1 \
> 		git-pack-redundant.1 \
> 		git-pack-refs.1 \
>@@ -156,7 +153,7 @@
> 		git-whatchanged.1 \
> 		git-write-tree.1 \
> 		gitk.1
>-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
>+MAN3PREFIX=	${PREFIX}/share
> MAN3=		Git.3
> MAN5=		gitattributes.5 gitignore.5
> MAN7=		git.7
>@@ -169,7 +166,6 @@
> CFLAGS+=	-I${LOCALBASE}/include
> MAKE_ENV+=	CURLDIR=${LOCALBASE} \
> 		NEEDS_LIBICONV=yes \
>-		WITH_P4IMPORT=yes \
> 		LDFLAGS="-L${LOCALBASE}/lib" \
> 		PYTHON_PATH=${LOCALBASE}/bin/python \
> 		PERL_PATH=${PERL}
>@@ -184,6 +180,25 @@
> MAKE_ENV+=	NO_TCLTK=yes
> .endif
> 
>+.ifdef WITH_GITSVN
>+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
>+		svn:${PORTSDIR}/devel/subversion
>+.endif
>+
>+.include <bsd.port.pre.mk>
>+
>+pre-everything::
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "This port has the following tunables:"
>+	@${ECHO_MSG} "WITHOUT_GUI:	disables Git GUI programs"
>+	@${ECHO_MSG} "WITH_GITSVN:	enables Git <-> SVN interface"
>+	@${ECHO_MSG} ""
>+
>+post-build:
>+	${SED} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
>+		${WRKSRC}/contrib/p4import/git-p4import.py > \
>+		${WRKSRC}/contrib/p4import/git-p4import
>+
> post-install:
> .for i in ${MAN1}
> 	${INSTALL_MAN} ${WRKDIR}/man1/${i} ${MANPREFIX}/man/man1/
>@@ -207,4 +222,9 @@
> 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/vc-git.el \
> 		${PREFIX}/lib/xemacs/site-lisp/git/vc-git.el
> 
>-.include <bsd.port.mk>
>+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
>+		${PREFIX}/bin/
>+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
>+		${PREFIX}/bin/
>+
>+.include <bsd.port.post.mk>
>diff -urN ./distinfo ../git/distinfo
>--- ./distinfo	2007-09-21 22:00:09.000000000 +0400
>+++ ../git/distinfo	2007-09-21 22:11:48.000000000 +0400
>@@ -1,6 +1,6 @@
>-MD5 (git-1.5.2.1.tar.bz2) = 0a39e786a12974cbe7b14f2fe92dc163
>-SHA256 (git-1.5.2.1.tar.bz2) = 4f2710ae146ba387e614f652b0e7e11a4f71090794c49a60791e063f21635b37
>-SIZE (git-1.5.2.1.tar.bz2) = 1184392
>-MD5 (git-manpages-1.5.2.1.tar.bz2) = e9da37e899167a4f36a71c8fee46e6a0
>-SHA256 (git-manpages-1.5.2.1.tar.bz2) = f9e72f4bcb0eaf193d1889c76cea80faf74aed87de0d3739ff1e9291d910a05f
>-SIZE (git-manpages-1.5.2.1.tar.bz2) = 139651
>+MD5 (git-1.5.3.2.tar.bz2) = 2113337dd27141a6890ff84f25164901
>+SHA256 (git-1.5.3.2.tar.bz2) = e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45
>+SIZE (git-1.5.3.2.tar.bz2) = 1344171 
>+MD5 (git-manpages-1.5.3.2.tar.bz2) = 375183e7370877f752674063e4336dfa
>+SHA256 (git-manpages-1.5.3.2.tar.bz2) = b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f
>+SIZE (git-manpages-1.5.3.2.tar.bz2) = 147283 
>diff -urN ./files/patch-Makefile ../git/files/patch-Makefile
>--- ./files/patch-Makefile	2007-09-21 22:00:09.000000000 +0400
>+++ ../git/files/patch-Makefile	2007-09-21 22:14:05.000000000 +0400
>@@ -1,5 +1,5 @@
>---- Makefile	Sun May 20 10:40:55 2007
>-+++ Makefile	Sat May 26 20:43:02 2007
>+--- Makefile.orig	2007-09-19 22:02:17.000000000 +0400
>++++ Makefile	2007-09-21 22:13:25.000000000 +0400
> @@ -135,8 +135,8 @@
>  
>  # CFLAGS and LDFLAGS are for the users to override from the command line.
>@@ -11,20 +11,24 @@
>  ALL_CFLAGS = $(CFLAGS)
>  ALL_LDFLAGS = $(LDFLAGS)
>  STRIP ?= strip
>-@@ -172,13 +172,13 @@
>+@@ -173,15 +173,15 @@
>  
>  export prefix bindir gitexecdir sharedir template_dir sysconfdir
>  
> -CC = gcc
> -AR = ar
>+-RM = rm -f
> -TAR = tar
>+-FIND = find
> -INSTALL = install
> -RPMBUILD = rpmbuild
> -TCL_PATH = tclsh
> -TCLTK_PATH = wish
> +CC ?= gcc
> +AR ?= ar
>++RM ?= rm -f
> +TAR ?= tar
>++FIND ?= find
> +INSTALL ?= install
> +RPMBUILD ?= rpmbuild
> +TCL_PATH ?= tclsh
>diff -urN ./pkg-plist ../git/pkg-plist
>--- ./pkg-plist	2007-09-21 22:00:09.000000000 +0400
>+++ ../git/pkg-plist	2007-09-21 22:55:43.000000000 +0400
>@@ -4,8 +4,6 @@
> bin/git-am
> bin/git-annotate
> bin/git-apply
>-bin/git-applymbox
>-bin/git-applypatch
> bin/git-archimport
> bin/git-archive
> bin/git-bisect
>@@ -40,6 +38,7 @@
> bin/git-fetch
> bin/git-fetch-pack
> bin/git-fetch--tool
>+bin/git-filter-branch
> bin/git-fmt-merge-msg
> bin/git-for-each-ref
> bin/git-format-patch
>@@ -82,6 +81,7 @@
> bin/git-mktree
> bin/git-mv
> bin/git-name-rev
>+bin/git-p4
> bin/git-p4import
> bin/git-pack-objects
> bin/git-pack-redundant
>@@ -96,6 +96,7 @@
> bin/git-quiltimport
> bin/git-read-tree
> bin/git-rebase
>+bin/git-rebase--interactive
> bin/git-receive-pack
> bin/git-reflog
> bin/git-relink
>@@ -124,7 +125,9 @@
> bin/git-ssh-push
> bin/git-ssh-upload
> bin/git-status
>+bin/git-stash
> bin/git-stripspace
>+bin/git-submodule
> bin/git-svn
> bin/git-svnimport
> bin/git-symbolic-ref
>@@ -163,18 +166,28 @@
> %%GUI%%share/git-gui/lib/tclIndex
> %%GUI%%share/git-gui/lib/blame.tcl
> %%GUI%%share/git-gui/lib/branch.tcl
>+%%GUI%%share/git-gui/lib/branch_checkout.tcl
>+%%GUI%%share/git-gui/lib/branch_create.tcl
>+%%GUI%%share/git-gui/lib/branch_delete.tcl
>+%%GUI%%share/git-gui/lib/branch_rename.tcl
> %%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_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/diff.tcl
>+%%GUI%%share/git-gui/lib/encoding.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/remote_branch_delete.tcl
> %%GUI%%share/git-gui/lib/shortcut.tcl
>+%%GUI%%share/git-gui/lib/status_bar.tcl
> %%GUI%%share/git-gui/lib/transport.tcl
> @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
> @dirrm lib/xemacs/site-lisp/git

Actions: View | Diff

Attachments on bug 116593: 81412