From c1b7981e9e1cf4fffe48f6df2043af9b124d04b2 Mon Sep 17 00:00:00 2001 From: alexbl Date: Wed, 8 Nov 2006 05:55:45 +0000 Subject: - update to 1.4.3.4 Approved by: anholt --- devel/git/Makefile | 12 +++++++++--- devel/git/distinfo | 6 +++--- devel/git/files/patch-Makefile | 32 +++++++++++++++----------------- devel/git/pkg-plist | 14 ++++++++++++-- 4 files changed, 39 insertions(+), 25 deletions(-) (limited to 'devel/git') diff --git a/devel/git/Makefile b/devel/git/Makefile index 3fe3ab1f8d9f..bdc14005784f 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -6,7 +6,7 @@ # PORTNAME= git -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.3.4 CATEGORIES= devel MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -23,6 +23,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 CONFLICTS= cogito-0.1[012] git-4.* +MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} MAN1= git-add.1 \ git-am.1 \ git-annotate.1 \ @@ -30,6 +31,7 @@ MAN1= git-add.1 \ git-applymbox.1 \ git-applypatch.1 \ git-archimport.1 \ + git-archive.1 \ git-bisect.1 \ git-blame.1 \ git-branch.1 \ @@ -68,6 +70,7 @@ MAN1= git-add.1 \ git-imap-send.1 \ git-index-pack.1 \ git-init-db.1 \ + git-instaweb.1 \ git-local-fetch.1 \ git-log.1 \ git-lost-found.1 \ @@ -123,6 +126,7 @@ MAN1= git-add.1 \ git-status.1 \ git-stripspace.1 \ git-svnimport.1 \ + git-svn.1 \ git-symbolic-ref.1 \ git-tag.1 \ git-tar-tree.1 \ @@ -131,14 +135,15 @@ MAN1= git-add.1 \ git-update-index.1 \ git-update-ref.1 \ git-update-server-info.1 \ + git-upload-archive.1 \ git-upload-pack.1 \ - git-upload-tar.1 \ git-var.1 \ git-verify-pack.1 \ git-verify-tag.1 \ git-whatchanged.1 \ git-write-tree.1 \ gitk.1 +MAN3= Git.3 private-Error.3 MAN7= git.7 USE_PERL5= yes @@ -151,7 +156,8 @@ CFLAGS+= -I${LOCALBASE}/include MAKE_ENV+= CURLDIR=${LOCALBASE} \ NEEDS_LIBICONV=yes \ LDFLAGS="-L${LOCALBASE}/lib" \ - PYTHON_PATH=${LOCALBASE}/bin/python + PYTHON_PATH=${LOCALBASE}/bin/python \ + PERL_PATH=${PERL} MAKE_ARGS+= prefix="${PREFIX}" .include diff --git a/devel/git/distinfo b/devel/git/distinfo index 62bb5b8fce43..f6baeac78f59 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,3 +1,3 @@ -MD5 (git-1.4.1.tar.gz) = af0f49e50016eb258bf308f8aa6d0702 -SHA256 (git-1.4.1.tar.gz) = 27bc107e58f60256356390e7c01aedd8e4c0f5067845b32fcb9d20a56d4d7620 -SIZE (git-1.4.1.tar.gz) = 888274 +MD5 (git-1.4.3.4.tar.gz) = 8e69df0e540a68ccb2676895627bff32 +SHA256 (git-1.4.3.4.tar.gz) = 6d545f40775adbcdfdc2c5198eb6d26b844b839406e5e4a4984b1408a9edbd23 +SIZE (git-1.4.3.4.tar.gz) = 1014501 diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile index c5be76a29b91..7b1d160623e6 100644 --- a/devel/git/files/patch-Makefile +++ b/devel/git/files/patch-Makefile @@ -1,23 +1,21 @@ ---- Makefile.orig Sat Jun 10 12:41:54 2006 -+++ Makefile Thu Jul 6 16:59:27 2006 -@@ -85,8 +85,8 @@ - - # CFLAGS and LDFLAGS are for the users to override from the command line. - --CFLAGS = -g -O2 -Wall --LDFLAGS = -+#CFLAGS = -g -O2 -Wall -+#LDFLAGS = - ALL_CFLAGS = $(CFLAGS) - ALL_LDFLAGS = $(LDFLAGS) - STRIP ?= strip -@@ -135,7 +135,8 @@ - git-send-email.perl +--- Makefile.orig Tue Nov 7 20:47:34 2006 ++++ Makefile Tue Nov 7 20:47:55 2006 +@@ -178,7 +178,8 @@ + git-send-email.perl git-svn.perl SCRIPT_PYTHON = \ -- git-merge-recursive.py -+ git-merge-recursive.py \ +- git-merge-recursive-old.py ++ git-merge-recursive-old.py \ + git-p4import.py SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ +@@ -823,7 +824,7 @@ + $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)' + $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install +- $(MAKE) -C perl install ++ $(MAKE) -C perl pure_install + $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)' + $(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)' + if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \ diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 7a4981c53d36..3fba81613360 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -6,6 +6,7 @@ bin/git-apply bin/git-applymbox bin/git-applypatch bin/git-archimport +bin/git-archive bin/git-bisect bin/git-blame bin/git-branch @@ -44,6 +45,7 @@ bin/git-http-push bin/git-imap-send bin/git-index-pack bin/git-init-db +bin/git-instaweb bin/git-local-fetch bin/git-log bin/git-lost-found @@ -58,7 +60,9 @@ bin/git-merge-index bin/git-merge-octopus bin/git-merge-one-file bin/git-merge-ours +bin/git-merge-recur bin/git-merge-recursive +bin/git-merge-recursive-old bin/git-merge-resolve bin/git-merge-stupid bin/git-merge-tree @@ -91,6 +95,7 @@ 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 @@ -105,6 +110,7 @@ bin/git-ssh-push bin/git-ssh-upload bin/git-status bin/git-stripspace +bin/git-svn bin/git-svnimport bin/git-symbolic-ref bin/git-tag @@ -114,14 +120,17 @@ bin/git-unpack-objects bin/git-update-index bin/git-update-ref bin/git-update-server-info +bin/git-upload-archive bin/git-upload-pack -bin/git-upload-tar bin/git-var bin/git-verify-pack bin/git-verify-tag bin/git-whatchanged bin/git-write-tree bin/gitk +%%SITE_PERL%%/Error.pm +%%SITE_PERL%%/Git.pm +%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist share/git-core/python/gitMergeCommon.py share/git-core/templates/description share/git-core/templates/hooks/applypatch-msg @@ -133,10 +142,11 @@ 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 -@dirrm share/git-core/python +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git @dirrm share/git-core/templates/branches @dirrm share/git-core/templates/hooks @dirrm share/git-core/templates/info @dirrm share/git-core/templates/remotes @dirrm share/git-core/templates +@dirrm share/git-core/python @dirrm share/git-core -- cgit