[Midnightbsd-cvs] mports: devel/git: update to 1.6.1.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Mar 25 17:50:59 EDT 2009


Log Message:
-----------
update to 1.6.1.3

Modified Files:
--------------
    mports/devel/git:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.3 -> r1.4)
    mports/devel/git/files:
        git_daemon.in (r1.3 -> r1.4)
        patch-Makefile (r1.2 -> r1.3)
        pkg-message.in (r1.1 -> r1.2)

Added Files:
-----------
    mports/devel/git/files:
        patch-Documentation__Makefile (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L devel/git/Makefile -L devel/git/Makefile -u -r1.4 -r1.5
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD: ports/devel/git/Makefile,v 1.37 2008/09/23 02:42:22 wxs Exp $
 
 PORTNAME=	git
-PORTVERSION=	1.6.0.6
+PORTVERSION=	1.6.1.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.kernel.org/pub/software/scm/git/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/git/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/git/distinfo -L devel/git/distinfo -u -r1.3 -r1.4
--- devel/git/distinfo
+++ devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.6.0.6.tar.bz2) = b5be9b34b441cb57f92086bfaf59f255
-SHA256 (git-1.6.0.6.tar.bz2) = e1d65bece5e8da1b72db22d3f6f2cbcefd28360c7f5bba141af436f43f887d0c
-SIZE (git-1.6.0.6.tar.bz2) = 1882225
-MD5 (git-manpages-1.6.0.6.tar.bz2) = e795e251df5c14a8c7212742880a6a9e
-SHA256 (git-manpages-1.6.0.6.tar.bz2) = 80dc6a8a05bccdb49de261c32c9c22ab8c2e957edd618c0315fdf49e46f89bc8
-SIZE (git-manpages-1.6.0.6.tar.bz2) = 217074
-MD5 (git-1.6.0.6.tar.bz2.sign) = cdf072cc0d4b93ddfd9e34f9825bd239
-SHA256 (git-1.6.0.6.tar.bz2.sign) = b471b66a3a0d748ff90bc9e8579b6c88559b3c906dd80466eaa2ab38055b4c88
-SIZE (git-1.6.0.6.tar.bz2.sign) = 248
+MD5 (git-1.6.1.3.tar.bz2) = e31ea5ce9b076f5745056f01465e9602
+SHA256 (git-1.6.1.3.tar.bz2) = aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682
+SIZE (git-1.6.1.3.tar.bz2) = 1973574
+MD5 (git-manpages-1.6.1.3.tar.bz2) = 8eb57492278ef4d471a899dbe9c30fcf
+SHA256 (git-manpages-1.6.1.3.tar.bz2) = ac3daa67b5f0a5bdf9c45dbf148c7f3c51e673f3a5460e00c55594a3cd51f1a4
+SIZE (git-manpages-1.6.1.3.tar.bz2) = 231623
+MD5 (git-1.6.1.3.tar.bz2.sign) = afbb0db39a03457bdc36574961303252
+SHA256 (git-1.6.1.3.tar.bz2.sign) = 5c67761af8792ccf05908506c438219578449b647ae633384bfd0a92bf47313b
+SIZE (git-1.6.1.3.tar.bz2.sign) = 248
--- /dev/null
+++ devel/git/files/patch-Documentation__Makefile
@@ -0,0 +1,32 @@
+--- ./Documentation/Makefile.orig	2008-10-22 00:19:18.000000000 -0400
++++ ./Documentation/Makefile	2008-10-24 10:06:25.561498942 -0400
+@@ -12,8 +12,6 @@
+ MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
+ MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
+ 
+-DOC_HTML=$(MAN_HTML)
+-
+ ARTICLES = howto-index
+ ARTICLES += everyday
+ ARTICLES += git-tools
+@@ -29,9 +27,9 @@
+ DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
+ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+ 
+-prefix?=$(HOME)
++prefix?=$(PREFIX)
+ bindir?=$(prefix)/bin
+-htmldir?=$(prefix)/share/doc/git-doc
++htmldir?=$(prefix)/share/doc/git
+ mandir?=$(prefix)/share/man
+ man1dir=$(mandir)/man1
+ man5dir=$(mandir)/man5
+@@ -73,7 +71,7 @@
+ # yourself - yes, all 6 characters of it!
+ #
+ 
+-all: html man
++all: html
+ 
+ html: $(DOC_HTML)
+ 
Index: git_daemon.in
===================================================================
RCS file: /home/cvs/mports/devel/git/files/git_daemon.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/git/files/git_daemon.in -L devel/git/files/git_daemon.in -u -r1.3 -r1.4
--- devel/git/files/git_daemon.in
+++ devel/git/files/git_daemon.in
@@ -1,6 +1,5 @@
 #! /bin/sh
 #
-# $MidnightBSD$
 # $FreeBSD: ports/devel/git/files/git_daemon.in,v 1.2 2008/08/27 22:05:12 wxs Exp $
 #
 
Index: patch-Makefile
===================================================================
RCS file: /home/cvs/mports/devel/git/files/patch-Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/git/files/patch-Makefile -L devel/git/files/patch-Makefile -u -r1.2 -r1.3
--- devel/git/files/patch-Makefile
+++ devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile.orig	2008-08-24 19:41:58.000000000 -0400
-+++ ./Makefile	2008-09-18 13:32:34.000000000 -0400
-@@ -164,8 +164,8 @@
+--- Makefile.orig	2008-12-25 00:33:25.000000000 -0500
++++ Makefile	2009-01-14 09:37:39.152324285 -0500
+@@ -170,8 +170,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,7 +11,7 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -182,8 +182,8 @@
+@@ -188,12 +188,12 @@
  
  prefix = $(HOME)
  bindir = $(prefix)/bin
@@ -22,7 +22,12 @@
  gitexecdir = $(prefix)/libexec/git-core
  sharedir = $(prefix)/share
  template_dir = $(sharedir)/git-core/templates
-@@ -217,15 +217,15 @@
+-htmldir=$(sharedir)/doc/git-doc
++htmldir=$(sharedir)/doc/git
+ ifeq ($(prefix),/usr)
+ sysconfdir = /etc
+ else
+@@ -223,16 +223,16 @@
  
  export prefix bindir sharedir htmldir sysconfdir
  
@@ -35,6 +40,7 @@
 -RPMBUILD = rpmbuild
 -TCL_PATH = tclsh
 -TCLTK_PATH = wish
+-PTHREAD_LIBS = -lpthread
 +CC ?= gcc
 +AR ?= ar
 +RM ?= rm -f
@@ -44,10 +50,11 @@
 +RPMBUILD ?= rpmbuild
 +TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
++PTHREAD_LIBS ?= -lpthread
  
  export TCL_PATH TCLTK_PATH
  
-@@ -827,9 +827,9 @@
+@@ -865,9 +865,9 @@
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
Index: pkg-message.in
===================================================================
RCS file: /home/cvs/mports/devel/git/files/pkg-message.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/git/files/pkg-message.in -L devel/git/files/pkg-message.in -u -r1.1 -r1.2
--- devel/git/files/pkg-message.in
+++ devel/git/files/pkg-message.in
@@ -1,3 +1,5 @@
+
+------------------------------------------------------------------------
 In the directory %%EXAMPLESDIR%%/gitweb you can find all files to
 make gitweb work as a public repository on the web.
 
@@ -8,3 +10,5 @@
 2) In gitweb.cgi, adjust the variable $projectroot to point to
    your git repository (that is where you have your *.git project
    directories).
+------------------------------------------------------------------------
+


More information about the Midnightbsd-cvs mailing list