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

[bdwalton at users.sourceforge.net]

Revision: 7589
          http://gar.svn.sourceforge.net/gar/?rev=7589&view=rev
Author:   bdwalton
Date:     2009-12-10 03:35:34 +0000 (Thu, 10 Dec 2009)

Log Message:
-----------
git: depend on less, set less as default pager; revamp a few args that can be set in configure; prepare for 1.6.6

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2009-12-09 16:02:46 UTC (rev 7588)
+++ csw/mgar/pkg/git/trunk/Makefile	2009-12-10 03:35:34 UTC (rev 7589)
@@ -1,6 +1,6 @@
 GARNAME = git
-GARVERSION = 1.6.5.1
-#xPATCHLEVEL = rc3
+GARVERSION = 1.6.6
+PATCHLEVEL = rc2
 CATEGORIES = devel
 
 # disable tests until next version bump (at the top so it stands out)
@@ -33,7 +33,7 @@
 
 REQUIRED_PKGS_CSWgit = CSWzlib CSWperl CSWrsync CSWcurlrt CSWosslrt
 REQUIRED_PKGS_CSWgit += CSWosshclient CSWiconv CSWexpat CSWbash CSWpmerror
-REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl
+REQUIRED_PKGS_CSWgit += CSWpmtermreadkey CSWpmnetsmtpssl CSWless
 
 REQUIRED_PKGS_CSWgitk = CSWgit CSWtk
 
@@ -86,7 +86,6 @@
 GIT_TREEISH_git.git = v$(GARVERSION)$(if $(PATCHLEVEL),-$(PATCHLEVEL))
 
 DISTFILES = CSWgit.postinstall
-#PATCHFILES = 0001-ls-files-die-instead-of-fprintf-exit-in-i-error.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files
@@ -115,18 +114,19 @@
 CONFIGURE_ARGS += --with-perl=$(bindir)/perl
 CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish
 CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-default_pager=/opt/csw/bin/less
 CONFIGURE_ARGS += --with-iconv=$(prefix)
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-expat=$(prefix)
 CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread"
+CONFIGURE_ARGS += --with-gitconfig=$(sysconfdir)/gitconfig
+CONFIGURE_ARGS += --with-pager=/opt/csw/bin/less
 
 BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
-		ETC_GITCONFIG=$(sysconfdir)/gitconfig \
 		ASCIIDOC_NO_ROFF=YesPlease \
 		all doc
 
-INSTALL_ARGS = ETC_GITCONFIG=$(sysconfdir)/gitconfig \
-		INSTALLDIRS=vendor \
+INSTALL_ARGS = 	INSTALLDIRS=vendor \
 		install-man install-html
 
 # We want static libs installed for our devel package


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