aboutsummaryrefslogtreecommitdiffstats
path: root/devel/git
diff options
context:
space:
mode:
Diffstat (limited to 'devel/git')
-rw-r--r--devel/git/Makefile2
-rw-r--r--devel/git/distinfo12
-rw-r--r--devel/git/files/patch-Makefile20
-rw-r--r--devel/git/pkg-plist2
4 files changed, 22 insertions, 14 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 46d2512d82fa..74c2b7c1522f 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= git
-PORTVERSION= 1.5.5
+PORTVERSION= 1.5.5.4
CATEGORIES= devel
MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 887ad81fcbbc..235bfba3791a 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (git-1.5.5.4.tar.bz2) = b0f80ae5e5d818aaccd44b0c9caff6d9
+SHA256 (git-1.5.5.4.tar.bz2) = 0c052b8bbf5bbb787f17ac334dc839b2e6dce3a3158f0a5893d4b86e80de61a3
+SIZE (git-1.5.5.4.tar.bz2) = 1677894
+MD5 (git-manpages-1.5.5.4.tar.bz2) = 418895a38ba863acdb75fd2d5d7a0496
+SHA256 (git-manpages-1.5.5.4.tar.bz2) = ab58825c06347534cfe2fe624834543503b6465392ec3786948d92d9b0e21207
+SIZE (git-manpages-1.5.5.4.tar.bz2) = 163922
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index b625711ae1b7..527af550b0c4 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2007-09-19 22:02:17.000000000 +0400
-+++ Makefile 2007-09-21 22:13:25.000000000 +0400
-@@ -135,8 +135,8 @@
+--- ./Makefile.orig 2008-06-07 21:03:58.000000000 -0400
++++ ./Makefile 2008-06-14 18:18:52.000000000 -0400
+@@ -164,16 +164,16 @@
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,9 +11,19 @@
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
-@@ -173,15 +173,15 @@
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+-mandir = $(prefix)/share/man
+-infodir = $(prefix)/share/info
++mandir = $(prefix)/man
++infodir = $(prefix)/info
+ gitexecdir = $(bindir)
+ sharedir = $(prefix)/share
+ template_dir = $(sharedir)/git-core/templates
+@@ -206,15 +206,15 @@
+
+ export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
-CC = gcc
-AR = ar
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 255a5e2b2bd7..bcae66301f5f 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -209,8 +209,6 @@ share/git-core/templates/info/exclude
@dirrmtry lib/xemacs/site-lisp
@dirrmtry lib/xemacs
@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