Attachment 81173 Details for Bug 116269 – file.diff

[patch] file.diff

file.diff (text/plain), 9.06 KB, created by Benjamin Close on 2007-09-11 00:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Close

Created: 2007-09-11 00:10:01 UTC

Size: 9.06 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/git/Makefile,v
>retrieving revision 1.23
>diff -u -r1.23 Makefile
>--- Makefile	4 Aug 2007 11:40:47 -0000	1.23
>+++ Makefile	10 Sep 2007 04:44:16 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	git
>-PORTVERSION=	1.5.2.1
>+PORTVERSION=	1.5.3.1
> 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 \
>@@ -43,6 +41,7 @@
> 		git-checkout.1 \
> 		git-cherry-pick.1 \
> 		git-cherry.1 \
>+		git-citool.1 \
> 		git-clean.1 \
> 		git-clone.1 \
> 		git-commit-tree.1 \
>@@ -62,21 +61,23 @@
> 		git-fast-import.1 \
> 		git-fetch-pack.1 \
> 		git-fetch.1 \
>+		git-filter-branch.1 \
> 		git-fmt-merge-msg.1 \
>-		git-format-patch.1 \
> 		git-for-each-ref.1 \
>-		git-fsck.1 \
>+		git-format-patch.1 \
> 		git-fsck-objects.1 \
>+		git-fsck.1 \
> 		git-gc.1 \
> 		git-get-tar-commit-id.1 \
> 		git-grep.1 \
>+		git-gui.1 \
> 		git-hash-object.1 \
> 		git-http-fetch.1 \
> 		git-http-push.1 \
> 		git-imap-send.1 \
> 		git-index-pack.1 \
>-		git-init.1 \
> 		git-init-db.1 \
>+		git-init.1 \
> 		git-instaweb.1 \
> 		git-local-fetch.1 \
> 		git-log.1 \
>@@ -86,18 +87,17 @@
> 		git-ls-tree.1 \
> 		git-mailinfo.1 \
> 		git-mailsplit.1 \
>-		git-merge.1 \
> 		git-merge-base.1 \
> 		git-merge-file.1 \
> 		git-merge-index.1 \
> 		git-merge-one-file.1 \
> 		git-merge-tree.1 \
>+		git-merge.1 \
> 		git-mergetool.1 \
> 		git-mktag.1 \
> 		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 \
>@@ -136,10 +136,12 @@
> 		git-show.1 \
> 		git-ssh-fetch.1 \
> 		git-ssh-upload.1 \
>+		git-stash.1 \
> 		git-status.1 \
> 		git-stripspace.1 \
>-		git-svnimport.1 \
>+		git-submodule.1 \
> 		git-svn.1 \
>+		git-svnimport.1 \
> 		git-symbolic-ref.1 \
> 		git-tag.1 \
> 		git-tar-tree.1 \
>@@ -158,7 +160,9 @@
> 		gitk.1
> MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
> MAN3=		Git.3
>-MAN5=		gitattributes.5 gitignore.5
>+MAN5=		gitignore.5 \
>+		gitmodules.5 \
>+		gitattributes.5
> MAN7=		git.7
> 
> USE_BZIP2=	yes
>@@ -172,7 +176,8 @@
> 		WITH_P4IMPORT=yes \
> 		LDFLAGS="-L${LOCALBASE}/lib" \
> 		PYTHON_PATH=${LOCALBASE}/bin/python \
>-		PERL_PATH=${PERL}
>+		PERL_PATH=${PERL} \
>+		LIBMD_SHA1=yes
> MAKE_ARGS+=	prefix="${PREFIX}"
> 
> .ifndef WITHOUT_GUI
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/devel/git/distinfo,v
>retrieving revision 1.14
>diff -u -r1.14 distinfo
>--- distinfo	9 Jul 2007 20:55:46 -0000	1.14
>+++ distinfo	10 Sep 2007 04:04:50 -0000
>@@ -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.1.tar.bz2) = 3213bc24c86e3741bae3607192f3ee7d
>+SHA256 (git-1.5.3.1.tar.bz2) = c089f5007a4766b147679c16f0b92508a7d30799034c586e1d86192165c52959
>+SIZE (git-1.5.3.1.tar.bz2) = 1344764
>+MD5 (git-manpages-1.5.3.1.tar.bz2) = d56d08094cda979ed61d9a8322c5db4a
>+SHA256 (git-manpages-1.5.3.1.tar.bz2) = dd732f0ab3babc6438dbd69f7315e9240bf34b69e521baeceff5d09b4843c236
>+SIZE (git-manpages-1.5.3.1.tar.bz2) = 152406
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/devel/git/pkg-plist,v
>retrieving revision 1.12
>diff -u -r1.12 pkg-plist
>--- pkg-plist	27 May 2007 23:43:32 -0000	1.12
>+++ pkg-plist	10 Sep 2007 22:41:24 -0000
>@@ -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
>@@ -38,8 +36,9 @@
> bin/git-diff-tree
> bin/git-fast-import
> bin/git-fetch
>-bin/git-fetch-pack
> bin/git-fetch--tool
>+bin/git-fetch-pack
>+bin/git-filter-branch
> bin/git-fmt-merge-msg
> bin/git-for-each-ref
> bin/git-format-patch
>@@ -82,7 +81,6 @@
> bin/git-mktree
> bin/git-mv
> bin/git-name-rev
>-bin/git-p4import
> bin/git-pack-objects
> bin/git-pack-redundant
> bin/git-pack-refs
>@@ -96,6 +94,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
>@@ -123,8 +122,10 @@
> 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
>@@ -153,29 +154,40 @@
> 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/update
> share/git-core/templates/info/exclude
>-%%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_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/tclIndex
> %%GUI%%share/git-gui/lib/transport.tcl
>+%%GUI%%@dirrm share/git-gui/lib
>+%%GUI%%@dirrm share/git-gui
> @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
> @dirrm lib/xemacs/site-lisp/git
> @dirrmtry lib/xemacs/site-lisp
>@@ -183,10 +195,8 @@
> @dirrm share/emacs/site-lisp/git
> @dirrmtry share/emacs/site-lisp
> @dirrmtry share/emacs
>-%%GUI%%@dirrm share/git-gui/lib
>-%%GUI%%@dirrm share/git-gui
>-@dirrm share/git-core/templates/branches
>-@dirrm share/git-core/templates/hooks
> @dirrm share/git-core/templates/info
>+@dirrm share/git-core/templates/hooks
>+@dirrm share/git-core/templates/branches
> @dirrm share/git-core/templates
> @dirrm share/git-core
>Index: files/patch-Makefile
>===================================================================
>RCS file: /home/ncvs/ports/devel/git/files/patch-Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 patch-Makefile
>--- files/patch-Makefile	27 May 2007 23:43:32 -0000	1.6
>+++ files/patch-Makefile	10 Sep 2007 04:19:21 -0000
>@@ -1,5 +1,5 @@
>---- Makefile	Sun May 20 10:40:55 2007
>-+++ Makefile	Sat May 26 20:43:02 2007
>+--- Makefile	2007-09-03 18:00:41.000000000 +0930
>++++ Makefile	2007-09-10 13:48:32.541604245 +0930
> @@ -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
>@@ -32,3 +36,22 @@
>  
>  export TCL_PATH TCLTK_PATH
>  
>+@@ -637,6 +637,10 @@
>+ 	BASIC_CFLAGS += -DOLD_ICONV
>+ endif
>+ 
>++ifdef LIBMD_SHA1
>++	SHA1_HEADER = "sha.h"
>++	EXTLIBS += -lmd
>++else
>+ ifdef PPC_SHA1
>+ 	SHA1_HEADER = "ppc/sha1.h"
>+ 	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
>+@@ -654,6 +658,7 @@
>+ endif
>+ endif
>+ endif
>++endif
>+ ifdef NO_PERL_MAKEMAKER
>+ 	export NO_PERL_MAKEMAKER
>+ endif
>Index: files/patch-perl-Makefile.PL
>===================================================================
>RCS file: files/patch-perl-Makefile.PL
>diff -N files/patch-perl-Makefile.PL
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-perl-Makefile.PL	10 Sep 2007 07:34:13 -0000
>@@ -0,0 +1,22 @@
>+--- perl/Makefile.PL.orig	2007-09-03 18:00:41.000000000 +0930
>++++ perl/Makefile.PL	2007-09-10 17:03:56.253543541 +0930
>+@@ -1,4 +1,5 @@
>+ use ExtUtils::MakeMaker;
>++use Config;
>+ 
>+ sub MY::postamble {
>+ 	return <<'MAKE_FRAG';
>+@@ -24,11 +25,12 @@
>+ # disrupts the output for the target 'instlibdir'
>+ open STDOUT, ">&STDERR";
>+ 
>++
>+ WriteMakefile(
>+ 	NAME            => 'Git',
>+ 	VERSION_FROM    => 'Git.pm',
>+ 	PM		=> \%pm,
>+ 	MAKEFILE	=> 'perl.mak',
>+-	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
>++	INSTALLSITEMAN3DIR => "\$(SITEPREFIX)/lib/perl5/$Config{version}/man/man3",
>+ 	%extra
>+ );

Actions: View | Diff

Attachments on bug 116269: 81173