diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-04-09 00:05:11 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-04-09 00:05:11 +0000 |
| commit | 2aef8d55a521e17272bc7500247cc5f5bc3786f3 (patch) | |
| tree | 5c772fa9763da3bddbce9ceb4399d4ef043b7861 /devel/git | |
| parent | 04f79a8cc0ab1cac1a8992830f58931fc0223a11 (diff) | |
Update to 1.2.6, and tune the cogito CONFLICTS to .10 to .12, since .17.2 will
live side-by-side in harmony.
Notes
Notes:
svn path=/head/; revision=159178
Diffstat (limited to 'devel/git')
| -rw-r--r-- | devel/git/Makefile | 4 | ||||
| -rw-r--r-- | devel/git/distinfo | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile index b953f8680be7..0e738adbba6a 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -6,7 +6,7 @@ # PORTNAME= git -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.6 CATEGORIES= devel MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ @@ -21,7 +21,7 @@ RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \ wish8.4:${PORTSDIR}/x11-toolkits/tk84 LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -CONFLICTS= cogito-[0-9]* git-4.* +CONFLICTS= cogito-0.1[012] git-4.* MAN1= git-add.1 \ git-am.1 \ diff --git a/devel/git/distinfo b/devel/git/distinfo index df399542f2c3..90f54a65bd67 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,3 +1,3 @@ -MD5 (git-1.2.4.tar.gz) = 285cb72468d18ca0fe2cb2f624e696aa -SHA256 (git-1.2.4.tar.gz) = 68b26e4ae534515997bd1410984c687ac2110e3b2b7f3251920b55f9abff449a -SIZE (git-1.2.4.tar.gz) = 607155 +MD5 (git-1.2.6.tar.gz) = 64f7e008b7529c8e4e12fdf73b815472 +SHA256 (git-1.2.6.tar.gz) = 6a751031de728c066ddaa3d595eecabb2abd9c28f711ceed5d91a629f6a30b6d +SIZE (git-1.2.6.tar.gz) = 607594 |