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

bdwalton at users.sourceforge.net bdwalton at users.sourceforge.net
Sun Oct 11 15:31:43 CEST 2009


Revision: 6828
          http://gar.svn.sourceforge.net/gar/?rev=6828&view=rev
Author:   bdwalton
Date:     2009-10-11 13:31:43 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
git: bump to 1.6.5 (enable tests again); remove autoconf build dep since patches were accepted; remove ls-files patch since it was accepted; make build quiet again

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2009-10-11 11:42:25 UTC (rev 6827)
+++ csw/mgar/pkg/git/trunk/Makefile	2009-10-11 13:31:43 UTC (rev 6828)
@@ -1,10 +1,10 @@
 GARNAME = git
-GARVERSION = 1.6.4.4
+GARVERSION = 1.6.5
 #xPATCHLEVEL = rc3
 CATEGORIES = devel
 
 # disable tests until next version bump (at the top so it stands out)
-TEST_SCRIPTS = 
+# TEST_SCRIPTS = 
 
 PACKAGES = CSWgit CSWgitk CSWgitgui CSWgitsvn CSWgitcvs CSWgitemacs CSWgitdoc
 PACKAGES += CSWgitcompletion CSWgitdevel
@@ -30,8 +30,7 @@
 PREREQUISITE_PKGS = CSWasciidoc CSWossldevel CSWxmlto CSWbash CSWcurldevel
 PREREQUISITE_PKGS += CSWgsed CSWgnulinks CSWperl CSWtk CSWexpat
 PREREQUISITE_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs
-PREREQUISITE_PKGS += CSWautoconf
-
+  
 REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt
 REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror
 REQUIRED_PKGS_CSWgit += CSWpmtermreadkey
@@ -87,7 +86,7 @@
 GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL))
 
 DISTFILES = CSWgit.postinstall
-PATCHFILES = 0001-ls-files-make-option-parser-keep-argv-0.patch
+#PATCHFILES = 0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files
@@ -122,7 +121,7 @@
 CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread"
 
 BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
-		ETC_GITCONFIG=$(sysconfdir)/gitconfig V=1 \
+		ETC_GITCONFIG=$(sysconfdir)/gitconfig \
 		ASCIIDOC_NO_ROFF=YesPlease \
 		all
 
@@ -150,7 +149,6 @@
 post-build-modulated:
 	@echo Builing Emacs Git extension
 	@( cd $(WORKSRC); $(MAKE) -C contrib/emacs )
-	@( cd $(WORKSRC)/Documentation; $(MAKE) )
 
 post-install-modulated: GD=$(DESTDIR)/$(datadir)/doc/$(GARNAME)
 post-install-modulated: BD=$(DESTDIR)/$(bashconfdir)/bash_completion.d

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2009-10-11 11:42:25 UTC (rev 6827)
+++ csw/mgar/pkg/git/trunk/checksums	2009-10-11 13:31:43 UTC (rev 6828)
@@ -1,2 +1,2 @@
-286ebdc4e98afca87750145775cbe918  download/0001-ls-files-make-option-parser-keep-argv-0.patch
+43f73e9e39bc388253c4c48986ef7b5c  download/0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch
 0f3606cd6720f525e7261cea87c11a61  download/CSWgit.postinstall


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



More information about the devel mailing list