- Updated to 2.6, including some gymnastics to get it to link on

  FreeBSD 6.x/7.x

10 files changed, 208 insertions, 5 deletions

diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 0962cf4452a1..ba3e058d5e67 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	patch
-PORTVERSION=	2.5.9
+PORTVERSION=	2.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	patch
@@ -14,8 +14,9 @@ MASTER_SITE_SUBDIR=	patch
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	GNU patch utility
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf262 aclocal:110
 CONFIGURE_ARGS=	--program-prefix=g
+USE_GMAKE=	yes
 
 MAN1=		gpatch.1
 PLIST_FILES=	bin/gpatch
diff --git a/devel/patch/distinfo b/devel/patch/distinfo
index 4ae7271940d2..9c5d40d79ed7 100644
--- a/devel/patch/distinfo
+++ b/devel/patch/distinfo
@@ -1,3 +1,3 @@
-MD5 (patch-2.5.9.tar.gz) = dacfb618082f8d3a2194601193cf8716
-SHA256 (patch-2.5.9.tar.gz) = ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a
-SIZE (patch-2.5.9.tar.gz) = 201926
+MD5 (patch-2.6.tar.gz) = bc71d33c35004db3768465bcaf9ed23c
+SHA256 (patch-2.6.tar.gz) = d3912c36c3b8952e1d6579717075c69fb2621b0efd8d27bfe28eb4a43e27dc4c
+SIZE (patch-2.6.tar.gz) = 300563
diff --git a/devel/patch/files/patch-Makefile.in b/devel/patch/files/patch-Makefile.in
new file mode 100644
index 000000000000..3d67fe63aa50
--- /dev/null
+++ b/devel/patch/files/patch-Makefile.in
@@ -0,0 +1,22 @@
+--- ./Makefile.in.orig	2009-11-02 14:09:57.000000000 -0500
++++ ./Makefile.in	2009-11-15 15:34:13.000000000 -0500
+@@ -172,8 +172,7 @@
+ 	install-sh \
+ 	mkinstalldirs \
+ 	patch.man \
+-	tests/test-lib.sh \
+-	update-version.sh
++	tests/test-lib.sh
+ 
+ DISTFILES = $(MISC) $(SRCS) $(HDRS) $(M4FILES) \
+ 	pc/chdirsaf.c \
+@@ -249,9 +248,6 @@
+ 
+ Makefile: Makefile.in $(CONFIG_STATUS)
+ 	$(SHELL) $(CONFIG_STATUS)
+-FORCE:
+-VERSION: FORCE
+-	@cd $(srcdir) && $(SHELL) ./update-version.sh VERSION
+ config.status: configure
+ 	$(SHELL) $(CONFIG_STATUS) --recheck
+ configure: configure.ac $(srcdir)/aclocal.m4 $(srcdir)/VERSION
diff --git a/devel/patch/files/patch-aclocal.m4 b/devel/patch/files/patch-aclocal.m4
new file mode 100644
index 000000000000..1d238e356b18
--- /dev/null
+++ b/devel/patch/files/patch-aclocal.m4
@@ -0,0 +1,21 @@
+--- ./aclocal.m4.orig	2009-11-03 07:46:26.000000000 -0500
++++ ./aclocal.m4	2009-11-15 15:45:29.000000000 -0500
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,8 @@
+ m4_include([gl/m4/ssize_t.m4])
+ m4_include([gl/m4/stdbool.m4])
+ m4_include([gl/m4/strcase.m4])
++m4_include([gl/m4/strndup.m4])
++m4_include([gl/m4/strnlen.m4])
+ m4_include([gl/m4/unlocked-io.m4])
+ m4_include([gl/m4/utimbuf.m4])
+ m4_include([gl/m4/xalloc.m4])
diff --git a/devel/patch/files/patch-configure.ac b/devel/patch/files/patch-configure.ac
new file mode 100644
index 000000000000..066ed431d89e
--- /dev/null
+++ b/devel/patch/files/patch-configure.ac
@@ -0,0 +1,22 @@
+--- ./configure.ac.orig	2009-11-02 14:09:57.000000000 -0500
++++ ./configure.ac	2009-11-15 15:34:13.000000000 -0500
+@@ -21,7 +21,6 @@
+ AC_PREREQ(2.57)
+ define(AC_PACKAGE_VERSION, m4_normalize(esyscmd(
+ [
+-    . ./update-version.sh VERSION
+     cat VERSION
+ ])))
+ AC_INIT(patch, AC_PACKAGE_VERSION, bug-patch@gnu.org)
+@@ -63,8 +62,11 @@
+ gl_PREREQ_XMALLOC
+ gl_QUOTE
+ gl_QUOTEARG
++gl_SAFE_READ
+ gl_SAFE_WRITE
+ gl_STRCASE
++gl_FUNC_STRNDUP
++gl_FUNC_STRNLEN
+ gl_XALLOC
+ gl_XSTRNDUP
+ 
diff --git a/devel/patch/files/patch-gl__lib__safe-read.h b/devel/patch/files/patch-gl__lib__safe-read.h
new file mode 100644
index 000000000000..9707d13e124c
--- /dev/null
+++ b/devel/patch/files/patch-gl__lib__safe-read.h
@@ -0,0 +1,37 @@
+--- ./gl/lib/safe-read.h.orig	2009-11-15 15:34:13.000000000 -0500
++++ ./gl/lib/safe-read.h	2009-11-15 15:36:38.000000000 -0500
+@@ -0,0 +1,34 @@
++/* An interface to read() that retries after interrupts.
++   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
++
++   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 3 of the License, 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, see <http://www.gnu.org/licenses/>.  */
++
++#include <stddef.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++#define SAFE_READ_ERROR ((size_t) -1)
++
++/* Read up to COUNT bytes at BUF from descriptor FD, retrying if interrupted.
++   Return the actual number of bytes read, zero for EOF, or SAFE_READ_ERROR
++   upon error.  */
++extern size_t safe_read (int fd, void *buf, size_t count);
++
++
++#ifdef __cplusplus
++}
++#endif
diff --git a/devel/patch/files/patch-gl__lib__strnlen.c b/devel/patch/files/patch-gl__lib__strnlen.c
new file mode 100644
index 000000000000..b8a324a4d660
--- /dev/null
+++ b/devel/patch/files/patch-gl__lib__strnlen.c
@@ -0,0 +1,34 @@
+--- ./gl/lib/strnlen.c.orig	2009-11-15 15:34:13.000000000 -0500
++++ ./gl/lib/strnlen.c	2009-11-15 15:34:13.000000000 -0500
+@@ -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;
++}
diff --git a/devel/patch/files/patch-gl__m4__safe-read.m4 b/devel/patch/files/patch-gl__m4__safe-read.m4
new file mode 100644
index 000000000000..2cc7deebdece
--- /dev/null
+++ b/devel/patch/files/patch-gl__m4__safe-read.m4
@@ -0,0 +1,21 @@
+--- ./gl/m4/safe-read.m4.orig	2009-11-15 15:34:14.000000000 -0500
++++ ./gl/m4/safe-read.m4	2009-11-15 15:37:34.000000000 -0500
+@@ -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/devel/patch/files/patch-gl__m4__strndup.m4 b/devel/patch/files/patch-gl__m4__strndup.m4
new file mode 100644
index 000000000000..90c3165771e8
--- /dev/null
+++ b/devel/patch/files/patch-gl__m4__strndup.m4
@@ -0,0 +1,11 @@
+--- ./gl/m4/strndup.m4.orig	2009-11-02 14:09:57.000000000 -0500
++++ ./gl/m4/strndup.m4	2009-11-15 15:34:14.000000000 -0500
+@@ -9,7 +9,7 @@
+   dnl Persuade glibc <string.h> to declare strndup().
+   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+ 
+-  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
++  dnl AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+   AC_CHECK_DECLS_ONCE([strndup])
+   if test $ac_cv_have_decl_strndup = no; then
+     HAVE_DECL_STRNDUP=0
diff --git a/devel/patch/files/patch-gl__m4__strnlen.m4 b/devel/patch/files/patch-gl__m4__strnlen.m4
new file mode 100644
index 000000000000..4030e3f487fd
--- /dev/null
+++ b/devel/patch/files/patch-gl__m4__strnlen.m4
@@ -0,0 +1,34 @@
+--- ./gl/m4/strnlen.m4.orig	2009-11-15 15:34:14.000000000 -0500
++++ ./gl/m4/strnlen.m4	2009-11-15 15:34:14.000000000 -0500
+@@ -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])
++
++  dnl 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], [:])