SF.net SVN: gar:[26228] csw/mgar/pkg/git/trunk

Fri Jun 9 09:17:22 CEST 2017

Revision: 26228
          http://sourceforge.net/p/gar/code/26228
Author:   dmichelsen
Date:     2017-06-09 07:17:22 +0000 (Fri, 09 Jun 2017)
Log Message:
-----------
git/trunk: Minor adjustments

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================

--- csw/mgar/pkg/git/trunk/Makefile	2017-06-08 19:26:04 UTC (rev 26227)
+++ csw/mgar/pkg/git/trunk/Makefile	2017-06-09 07:17:22 UTC (rev 26228)
@@ -3,74 +3,6 @@
 #PATCHLEVEL = rc4
 GARTYPE = v2
 
-
-VENDOR_URL = http://git-scm.org/
-
-NO_SVN_TESTS=YesPlease
-GIT_TEST_OPTS=-i -v -d
-EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS
-
-# disable tests until next version bump (at the top so it stands out)
-# 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
-# detected as the first available utf8 locale.  the failure is
-# harmless though.
-TEST_SCRIPTS =
-TEST_TARGET = test
-
-PACKAGES  = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs
-PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev
-
-CATALOGNAME_CSWgit = git
-CATALOGNAME_CSWgit-cvs = git_cvs
-CATALOGNAME_CSWgit-svn = git_svn
-CATALOGNAME_CSWgit-emacs = git_emacs
-CATALOGNAME_CSWgit-gui = git_gui
-CATALOGNAME_CSWgit-doc = git_doc
-CATALOGNAME_CSWgitk = gitk
-CATALOGNAME_CSWgit-completion = git_completion
-CATALOGNAME_CSWgit-dev = git_dev
-
-ARCHALL_CSWgit-svn = 1
-ARCHALL_CSWgit-cvs = 1
-ARCHALL_CSWgitk = 1
-ARCHALL_CSWgit-gui = 1
-ARCHALL_CSWgit-emacs = 1
-ARCHALL_CSWgit-doc = 1
-ARCHALL_CSWgit-completion = 1
-
-BUILD_DEP_PKGS = CSWasciidoc CSWlibssl-dev CSWxmlto CSWbash CSWlibcurl-dev
-BUILD_DEP_PKGS += CSWgsed CSWperl CSWtk CSWexpat
-BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs
-BUILD_DEP_PKGS += CSWpython
-BUILD_DEP_PKGS += CSWlibiconv-dev
-
-RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWgit += CSWopenssh-client CSWlibiconv2 CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWgit += CSWbash CSWpm-error CSWpm-term-readkey
-RUNTIME_DEP_PKGS_CSWgit += CSWpmnetsmtpssl CSWless
-RUNTIME_DEP_PKGS_CSWgit += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0
-
-RUNTIME_DEP_PKGS_CSWgitk = CSWgit CSWtk
-
-RUNTIME_DEP_PKGS_CSWgit-gui = CSWgit CSWtk
-
-RUNTIME_DEP_PKGS_CSWgit-svn = CSWgit CSWpmsvn
-
-RUNTIME_DEP_PKGS_CSWgit-cvs = CSWgit CSWcvs CSWcvsps
-
-RUNTIME_DEP_PKGS_CSWgit-emacs = CSWgit CSWemacs-common
-
-RUNTIME_DEP_PKGS_CSWgit-doc = CSWgit
-
-RUNTIME_DEP_PKGS_CSWgit-dev = CSWgit
-
-# We include bash here even though git itself depends on it because in theory
-# git could use any other POSIX compliant shell and drop the dependency...
-RUNTIME_DEP_PKGS_CSWgit-completion = CSWgit CSWbash CSWbashcmplt
-
-LICENSE = COPYING
-
 DESCRIPTION = Fast Version Control System
 define BLURB
   Git is a popular version control system designed to handle
@@ -96,8 +28,13 @@
 # to the selection of available utf8 locales.
 # PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 
+# Added for 2.13.1
+PATCHFILES += 0001-Do-not-return-values-in-void-functions.patch
+
 VENDOR_URL = http://git-scm.org/
 
+LICENSE = COPYING
+
 BUILD_DEP_PKGS += CSWasciidoc
 BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWxmlto
@@ -138,6 +75,7 @@
 RUNTIME_DEP_PKGS_CSWgit += CSWlibintl9
 RUNTIME_DEP_PKGS_CSWgit += CSWlibssl1-0-0
 # These can't be detected by checkpkg
+CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWrsync
 CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWbash
 CHECKPKG_OVERRIDES_CSWgit += surplus-dependency|CSWopenssh-client
@@ -215,6 +153,12 @@
 RUNTIME_DEP_PKGS_CSWgit-dev += CSWgit
 RUNTIME_DEP_PKGS_CSWgit-dev += CSWperl
 
+REINPLACE_USRLOCAL += git-compat-util.h
+REINPLACE_USRLOCAL += git-instaweb.sh
+
+REINPLACE_USRSHARE += builtin/init-db.c
+REINPLACE_USRSHARE += git-send-email.perl
+
 #set bashconfdir to sysconfdir when bash changes
 bashconfdir = $(sysconfdir)
 
@@ -246,7 +190,7 @@
 #EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS
 
 # There is currently one test failing, skip for now
-SKIPTEST ?= 1
+# SKIPTEST ?= 1
 
 # We need bash or the tests won't run
 TEST_ARGS += SHELL=/opt/csw/bin/bash
@@ -258,7 +202,6 @@
 # TEST_SCRIPTS =
 TEST_TARGET = test
 
-
 #INSTALL_ARGS = 	INSTALLDIRS=vendor \
 #		install-man install-html
 

Added: csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0001-Do-not-return-values-in-void-functions.patch	2017-06-09 07:17:22 UTC (rev 26228)
@@ -0,0 +1,25 @@
+From 7e6dbb2bfa53a7eb0ca489d406db41bab673021b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 9 Jun 2017 08:28:12 +0200
+Subject: [PATCH] Do not return values in void functions
+
+---
+ ref-filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ref-filter.c b/ref-filter.c
+index 2cc7b01..467c027 100644
+--- a/ref-filter.c
++++ b/ref-filter.c
+@@ -221,7 +221,7 @@ static void objectname_atom_parser(struct used_atom *atom, const char *arg)
+ 
+ static void refname_atom_parser(struct used_atom *atom, const char *arg)
+ {
+-	return refname_atom_parser_internal(&atom->u.refname, arg, atom->name);
++	refname_atom_parser_internal(&atom->u.refname, arg, atom->name);
+ }
+ 
+ static align_type parse_align_position(const char *s)
+-- 
+2.4.0
+

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

