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

[bdwalton at users.sourceforge.net]

Revision: 19129
          http://gar.svn.sourceforge.net/gar/?rev=19129&view=rev
Author:   bdwalton
Date:     2012-08-31 02:14:56 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
git/trunk: version bump; patch cleanup; tweak how we inject the -lintl flag

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-08-30 15:11:04 UTC (rev 19128)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-08-31 02:14:56 UTC (rev 19129)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 1.7.11.3
+VERSION = 1.7.12
 #PATCHLEVEL = rc4
 DISTNAME = $(NAME)-$(VERSION)
 CATEGORIES = devel
@@ -121,10 +121,6 @@
 # to the selection of available utf8 locales.
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch
-PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
-PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch
-PATCHFILES += 0010-t1304-improve-setfacl-prerequisite-setup.patch
-PATCHFILES += 0011-Use-getpassphrase-instead-of-getpass-when-prompting-.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files
@@ -212,6 +208,7 @@
 post-configure-modulated:
 	@echo "Forcing GIT_TEST_CMP tool"
 	@( cd $(WORKSRC); echo 'GIT_TEST_CMP=gdiff' > config.mak )
+	@( cd $(WORKSRC); echo 'EXTLIBS += -lintl' > config.mak )
 	@$(MAKECOOKIE)
 
 # force the elisp extension to be built too.

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2012-08-30 15:11:04 UTC (rev 19128)
+++ csw/mgar/pkg/git/trunk/checksums	2012-08-31 02:14:56 UTC (rev 19129)
@@ -1 +1 @@
-23caacd9f3f421b6c05b40796df3505d  git-1.7.11.3.tar.gz
+ceb1a6b17a3e33bbc70eadf8fce5876c  git-1.7.12.tar.gz

Deleted: csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch	2012-08-30 15:11:04 UTC (rev 19128)
+++ csw/mgar/pkg/git/trunk/files/0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch	2012-08-31 02:14:56 UTC (rev 19129)
@@ -1,31 +0,0 @@
-From 108e986bc5da901b6447afb3ce9687384ad90249 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 24 Mar 2012 22:10:17 -0400
-Subject: [PATCH 2/2] Makefile: Set EXTRA_CPPFLAGS during the compilation of
- run-command
-
-When building run-command.o, we want to pass in a define for
-SHELL_PATH to ensure that the shell configured at build time is used
-at run time when spawning external commands.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index be1957a..344e2e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1913,6 +1913,8 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
- 	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
- 	'-DGIT_INFO_PATH="$(infodir_SQ)"'
- 
-+run-command.o: EXTRA_CPPFLAGS = -DSHELL_PATH='"$(SHELL_PATH)"'
-+
- $(BUILT_INS): git$X
- 	$(QUIET_BUILT_IN)$(RM) $@ && \
- 	ln git$X $@ 2>/dev/null || \
--- 
-1.7.5.4
-

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