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

[bdwalton at users.sourceforge.net]

Revision: 2624
          http://gar.svn.sourceforge.net/gar/?rev=2624&view=rev
Author:   bdwalton
Date:     2008-12-16 20:59:04 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
first working build; tests fail, but i think that is a sed vs gsed issue

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile
    csw/mgar/pkg/git/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/doc-makefile.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2008-12-16 18:48:14 UTC (rev 2623)
+++ csw/mgar/pkg/git/trunk/Makefile	2008-12-16 20:59:04 UTC (rev 2624)
@@ -1,7 +1,9 @@
 GARNAME = git
-GARVERSION = 1.5.5.1
+GARVERSION = 1.6.0.5
 CATEGORIES = devel
 
+PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurl
+
 DESCRIPTION = Fast Version Control System
 define BLURB
   Git is a popular version control system designed to handle
@@ -13,17 +15,22 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES += $(call admfiles,CSWgit,)
 
+PATCHFILES = doc-makefile.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-PREREQUISITE_PKGS = CSWasciidoc CSWossldevel
+GARCOMPILER = GNU
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS) --with-shell=/opt/csw/bin/bash
 
-BUILD_ARGS = MSGFMT=gmsgfmt all doc
+BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash all doc
 
 INSTALL_ARGS = install-doc
 
 include gar/category.mk
 
 CFLAGS += -L$(libdir)
+
+# for tail -n
+PATH := /usr/xpg4/bin:$(PATH)
\ No newline at end of file

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2008-12-16 18:48:14 UTC (rev 2623)
+++ csw/mgar/pkg/git/trunk/checksums	2008-12-16 20:59:04 UTC (rev 2624)
@@ -1,2 +1,3 @@
-6c5ffadc0e6a8652833b4160510ed27f  download/git-1.5.5.1.tar.bz2
+899172ebeac65f7a09a8e204d4f87d8c  download/git-1.6.0.5.tar.bz2
 fa435e5bd4c829d055a1265ec36360fe  download/CSWgit.gspec
+369547e8222dcf8be214b5013f28afcc  download/doc-makefile.patch

Added: csw/mgar/pkg/git/trunk/files/doc-makefile.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/doc-makefile.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/doc-makefile.patch	2008-12-16 20:59:04 UTC (rev 2624)
@@ -0,0 +1,50 @@
+--- 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 @@
+ -include ../config.mak.autogen
+ -include ../config.mak
+ 
++SHELL = $(SHELL_PATH)
++
+ ifdef ASCIIDOC8
+ ASCIIDOC_EXTRA += -a asciidoc7compatible
+ endif
+@@ -105,7 +107,7 @@
+ 	fi
+ 
+ install-html: html
+-	sh ./install-webdoc.sh $(DESTDIR)$(htmldir)
++	$(SHELL) ./install-webdoc.sh $(DESTDIR)$(htmldir)
+ 
+ ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
+ 	$(MAKE) -C ../ GIT-VERSION-FILE
+@@ -167,7 +169,7 @@
+ 
+ technical/api-index.txt: technical/api-index-skel.txt \
+ 	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
+-	cd technical && sh ./api-index.sh
++	cd technical && $(SHELL) ./api-index.sh
+ 
+ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
+ 	$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \
+@@ -203,7 +205,7 @@
+ 
+ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
+ 	$(RM) $@+ $@
+-	sh ./howto-index.sh $(wildcard howto/*.txt) >$@+
++	$(SHELL) ./howto-index.sh $(wildcard howto/*.txt) >$@+
+ 	mv $@+ $@
+ 
+ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
+@@ -217,9 +219,9 @@
+ 	mv $@+ $@
+ 
+ install-webdoc : html
+-	sh ./install-webdoc.sh $(WEBDOC_DEST)
++	$(SHELL) ./install-webdoc.sh $(WEBDOC_DEST)
+ 
+ quick-install:
+-	sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
++	$(SHELL) ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
+ 
+ .PHONY: .FORCE-GIT-VERSION-FILE


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