[csw-devel] SF.net SVN: gar:[3275] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 3275
          http://gar.svn.sourceforge.net/gar/?rev=3275&view=rev
Author:   bdwalton
Date:     2009-02-19 21:07:31 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Update to 1.6.1.3; Use new dynamic gspec, etc.

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile
    csw/mgar/pkg/git/trunk/checksums
    csw/mgar/pkg/git/trunk/files/doc-makefile.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2009-02-19 19:13:25 UTC (rev 3274)
+++ csw/mgar/pkg/git/trunk/Makefile	2009-02-19 21:07:31 UTC (rev 3275)
@@ -1,10 +1,19 @@
 GARNAME = git
-GARVERSION = 1.6.0.5
+GARVERSION = 1.6.1.3
 CATEGORIES = devel
 
-PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl
+PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc
+
+ARCHALL_CSWsvn = 1
+ARCHALL_CSWcvs = 1
+ARCHALL_CSWgitk = 1
+ARCHALL_CSWgitgui = 1
+ARCHALL_CSWgitemacs = 1
+ARCHALL_CSWgitdoc = 1
+
+PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel
 PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat
-PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvsps CSWemacs
+PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs
 
 REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt
 REQUIRED_PKGS_CSWgit += CSWossh CSWiconv CSWexpat CSWbash CSWpmerror
@@ -15,7 +24,7 @@
 
 REQUIRED_PKGS_CSWgitsvn = CSWgit CSWpmsvn
 
-REQUIRED_PKGS_CSWgitcvs = CSWgit CSWcvsps
+REQUIRED_PKGS_CSWgitcvs = CSWgit CSWcvs CSWcvsps
 
 REQUIRED_PKGS_CSWgitemacs = CSWgit CSWemacs
 
@@ -37,13 +46,6 @@
 
 MASTER_SITES = http://kernel.org/pub/software/scm/$(GARNAME)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWgitsvn,)
-DISTFILES += $(call admfiles,CSWgitgui,)
-DISTFILES += $(call admfiles,CSWgitk,)
-DISTFILES += $(call admfiles,CSWgitemacs,)
-DISTFILES += $(call admfiles,CSWgitcvs,)
-DISTFILES += $(call admfiles,CSWgitdoc,)
-DISTFILES += $(call admfiles,CSWgit,)
 
 PATCHFILES = doc-makefile.patch
 
@@ -66,7 +68,7 @@
 CONFIGURE_ARGS += --with-iconv=$(prefix)
 
 BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
-		ETC_CONFIG=$(sysconfdir)/gitconfig \
+		ETC_CONFIG=$(sysconfdir)/gitconfig V=1 \
 		all doc
 
 INSTALL_ARGS = ETC_CONFIG=$(sysconfdir)/gitconfig install-doc

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2009-02-19 19:13:25 UTC (rev 3274)
+++ csw/mgar/pkg/git/trunk/checksums	2009-02-19 21:07:31 UTC (rev 3275)
@@ -1,9 +1,2 @@
-899172ebeac65f7a09a8e204d4f87d8c  download/git-1.6.0.5.tar.bz2
-52eec3e59489ecca898ef2b3d1bb4323  download/CSWgitsvn.gspec
-e8fb4cb1b06cd7bdfeeb9317ad6aae12  download/CSWgitgui.gspec
-50ab41f1f828ad1401cf9d05d8775499  download/CSWgitk.gspec
-393d10b23a1ecb60f91bdc5f2d12a75d  download/CSWgitemacs.gspec
-20718be97e218e2fc1b21982cf71f32a  download/CSWgitcvs.gspec
-7d668417a6375d27a49212c58f26db60  download/CSWgitdoc.gspec
-57d2c46660773d3a1e87651447e3252a  download/CSWgit.gspec
-369547e8222dcf8be214b5013f28afcc  download/doc-makefile.patch
+e31ea5ce9b076f5745056f01465e9602  download/git-1.6.1.3.tar.bz2
+075441ea2a95cfa5fd7aaebb888a93f3  download/doc-makefile.patch

Modified: csw/mgar/pkg/git/trunk/files/doc-makefile.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/doc-makefile.patch	2009-02-19 19:13:25 UTC (rev 3274)
+++ csw/mgar/pkg/git/trunk/files/doc-makefile.patch	2009-02-19 21:07:31 UTC (rev 3275)
@@ -1,6 +1,6 @@
---- git-1.6.0.5/Documentation/Makefile.orig	2008-12-16 14:41:44.670977000 -0500
-+++ git-1.6.0.5/Documentation/Makefile	2008-12-16 14:49:07.561035000 -0500
-@@ -56,6 +56,8 @@
+--- git-1.6.1.3/Documentation/Makefile.orig	2009-02-07 20:46:30.000000000 +0100
++++ git-1.6.1.3/Documentation/Makefile	2009-02-18 20:53:41.159467914 +0100
+@@ -57,6 +57,8 @@
  -include ../config.mak.autogen
  -include ../config.mak
  
@@ -9,7 +9,7 @@
  ifdef ASCIIDOC8
  ASCIIDOC_EXTRA += -a asciidoc7compatible
  endif
-@@ -105,7 +107,7 @@
+@@ -108,7 +110,7 @@
  	fi
  
  install-html: html
@@ -18,7 +18,7 @@
  
  ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	$(MAKE) -C ../ GIT-VERSION-FILE
-@@ -167,7 +169,7 @@
+@@ -170,7 +172,7 @@
  
  technical/api-index.txt: technical/api-index-skel.txt \
  	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -27,7 +27,7 @@
  
  $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
  	$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
-@@ -203,7 +205,7 @@
+@@ -206,7 +208,7 @@
  
  howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
  	$(RM) $@+ $@
@@ -36,15 +36,21 @@
  	mv $@+ $@
  
  $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
-@@ -217,9 +219,9 @@
+@@ -220,14 +222,14 @@
  	mv $@+ $@
  
  install-webdoc : html
 -	sh ./install-webdoc.sh $(WEBDOC_DEST)
 +	$(SHELL) ./install-webdoc.sh $(WEBDOC_DEST)
  
- quick-install:
+ quick-install: quick-install-man
+ 
+ quick-install-man:
 -	sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
 +	$(SHELL) ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
  
+ quick-install-html:
+-	sh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
++	$(SHELL) ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
+ 
  .PHONY: .FORCE-GIT-VERSION-FILE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.