[csw-devel] SF.net SVN: gar:[22074] csw/mgar/pkg/patch/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Oct 1 14:46:43 CEST 2013
Revision: 22074
http://gar.svn.sourceforge.net/gar/?rev=22074&view=rev
Author: dmichelsen
Date: 2013-10-01 12:46:43 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
patch/trunk: Update to 2.7.1
Modified Paths:
--------------
csw/mgar/pkg/patch/trunk/Makefile
csw/mgar/pkg/patch/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch
csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch
Modified: csw/mgar/pkg/patch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patch/trunk/Makefile 2013-10-01 12:22:20 UTC (rev 22073)
+++ csw/mgar/pkg/patch/trunk/Makefile 2013-10-01 12:46:43 UTC (rev 22074)
@@ -1,5 +1,5 @@
NAME = patch
-VERSION = 2.6.1
+VERSION = 2.7.1
GARTYPE = v2
DESCRIPTION = GNU patch utility
@@ -8,33 +8,23 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(DISTNAME).tar.xz
-# Add some missing files from gnulib until this is fixed:
-# https://savannah.gnu.org/bugs/?30378
-PATCHFILES = 0001-Add-missing-strnlen.c-from-GNUlib.patch
-PATCHFILES += 0002-Add-missing-m4-files.patch
+VENDOR_URL = https://savannah.gnu.org/projects/patch/
-PACKAGES = CSWgpatch
+PACKAGES += CSWgpatch
+SPKG_DESC_CSWgpatch = GNU patch utility
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-DEP_PKGS = CSWlibgnugetopt
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --program-prefix=g
-EXTRA_LINKER_FLAGS = -lgnugetopt
-BUILD_ARGS = SHELL=bash
+BUILD64 = 1
+ISAEXEC = 1
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset.alias
+
include gar/category.mk
-post-extract-modulated:
- @# GARs usage of .git for patching in the package confuses the upstream building as
- @# if it was bootstrapped.
- -echo "exit 0" > $(WORKSRC)/update-version.sh
-
post-install-modulated:
ginstall -d $(DESTDIR)$(prefix)/gnu
$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
Modified: csw/mgar/pkg/patch/trunk/checksums
===================================================================
--- csw/mgar/pkg/patch/trunk/checksums 2013-10-01 12:22:20 UTC (rev 22073)
+++ csw/mgar/pkg/patch/trunk/checksums 2013-10-01 12:46:43 UTC (rev 22074)
@@ -1,3 +1 @@
-46d02b036813c195171f723f162e3786 0001-Add-missing-strnlen.c-from-GNUlib.patch
-f18f4ae6a5d427f20941a439fcd7d61a 0002-Add-missing-m4-files.patch
-d758eb96d3f75047efc004a720d33daf patch-2.6.1.tar.gz
+e9ae5393426d3ad783a300a338c09b72 patch-2.7.1.tar.xz
Deleted: csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch 2013-10-01 12:22:20 UTC (rev 22073)
+++ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch 2013-10-01 12:46:43 UTC (rev 22074)
@@ -1,50 +0,0 @@
-From e45bf18c6a3355d54dc29b6b259ae21e83ff8041 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 11 Feb 2010 10:19:05 +0100
-Subject: [PATCH 1/2] Add missing strnlen.c from GNUlib
-
----
- gl/lib/strnlen.c | 31 +++++++++++++++++++++++++++++++
- 1 files changed, 31 insertions(+), 0 deletions(-)
- create mode 100644 gl/lib/strnlen.c
-
-diff --git a/gl/lib/strnlen.c b/gl/lib/strnlen.c
-new file mode 100644
-index 0000000..d346d32
---- /dev/null
-+++ b/gl/lib/strnlen.c
-@@ -0,0 +1,31 @@
-+/* Find the length of STRING, but scan at most MAXLEN characters.
-+ Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-+ Written by Simon Josefsson.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+#include <config.h>
-+
-+#include <string.h>
-+
-+/* Find the length of STRING, but scan at most MAXLEN characters.
-+ If no '\0' terminator is found in that many characters, return MAXLEN. */
-+
-+size_t
-+strnlen (const char *string, size_t maxlen)
-+{
-+ const char *end = memchr (string, '\0', maxlen);
-+ return end ? (size_t) (end - string) : maxlen;
-+}
---
-1.7.1
-
Deleted: csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch 2013-10-01 12:22:20 UTC (rev 22073)
+++ csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch 2013-10-01 12:46:43 UTC (rev 22074)
@@ -1,76 +0,0 @@
-From e70f6d46e9a2f6df77a234e0a0404588c39bd142 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 30 Jun 2010 16:23:10 +0200
-Subject: [PATCH 2/2] Add missing m4 files
-
----
- gl/m4/safe-read.m4 | 18 ++++++++++++++++++
- gl/m4/strnlen.m4 | 31 +++++++++++++++++++++++++++++++
- 2 files changed, 49 insertions(+), 0 deletions(-)
- create mode 100644 gl/m4/safe-read.m4
- create mode 100644 gl/m4/strnlen.m4
-
-diff --git a/gl/m4/safe-read.m4 b/gl/m4/safe-read.m4
-new file mode 100644
-index 0000000..7a89d0a
---- /dev/null
-+++ b/gl/m4/safe-read.m4
-@@ -0,0 +1,18 @@
-+# safe-read.m4 serial 5
-+dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([gl_SAFE_READ],
-+[
-+ AC_LIBOBJ([safe-read])
-+
-+ gl_PREREQ_SAFE_READ
-+])
-+
-+# Prerequisites of lib/safe-read.c.
-+AC_DEFUN([gl_PREREQ_SAFE_READ],
-+[
-+ AC_REQUIRE([gt_TYPE_SSIZE_T])
-+])
-diff --git a/gl/m4/strnlen.m4 b/gl/m4/strnlen.m4
-new file mode 100644
-index 0000000..1c97859
---- /dev/null
-+++ b/gl/m4/strnlen.m4
-@@ -0,0 +1,31 @@
-+# strnlen.m4 serial 10
-+dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([gl_FUNC_STRNLEN],
-+[
-+ dnl Persuade glibc <string.h> to declare strnlen().
-+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+
-+ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-+ AC_CHECK_DECLS_ONCE([strnlen])
-+ if test $ac_cv_have_decl_strnlen = no; then
-+ HAVE_DECL_STRNLEN=0
-+ fi
-+
-+ AC_FUNC_STRNLEN
-+ if test $ac_cv_func_strnlen_working = no; then
-+ # This is necessary because automake-1.6.1 doesn't understand
-+ # that the above use of AC_FUNC_STRNLEN means we may have to use
-+ # lib/strnlen.c.
-+ #AC_LIBOBJ([strnlen])
-+ AC_DEFINE([strnlen], [rpl_strnlen],
-+ [Define to rpl_strnlen if the replacement function should be used.])
-+ gl_PREREQ_STRNLEN
-+ fi
-+])
-+
-+# Prerequisites of lib/strnlen.c.
-+AC_DEFUN([gl_PREREQ_STRNLEN], [:])
---
-1.7.1
-
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