updated devel/diffutils to 3.2

5 files changed, 52 insertions, 43 deletions

diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile
index e843cabda8a..ed57cabfb21 100644
--- a/devel/diffutils/Makefile
+++ b/devel/diffutils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2012/03/09 13:11:05 fhajny Exp $
+# $NetBSD: Makefile,v 1.26 2012/04/07 16:30:05 schwarz Exp $
 #
 
-DISTNAME=		diffutils-2.8.1
-PKGREVISION=		5
+DISTNAME=		diffutils-3.2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=diffutils/}
 
@@ -15,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
-INFO_FILES=		# PLIST
+INFO_FILES=		YES # PLIST
 
 CONFIGURE_ENV+=	gt_cv_func_gnugettext1_libintl=yes
 
@@ -33,7 +32,7 @@ BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 SUBST_CLASSES+=		diff
 SUBST_STAGE.diff=	pre-configure
-SUBST_FILES.diff=	configure
+SUBST_FILES.diff=	src/Makefile.in
 SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff;'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/diffutils/PLIST b/devel/diffutils/PLIST
index a63a588b926..24a9e2cedab 100644
--- a/devel/diffutils/PLIST
+++ b/devel/diffutils/PLIST
@@ -1,26 +1,39 @@
-@comment $NetBSD: PLIST,v 1.8 2006/07/20 17:09:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/04/07 16:30:05 schwarz Exp $
 bin/${GNU_PROGRAM_PREFIX}cmp
 bin/${GNU_PROGRAM_PREFIX}diff
 bin/${GNU_PROGRAM_PREFIX}diff3
 bin/${GNU_PROGRAM_PREFIX}sdiff
-info/diff.info
+info/diffutils.info
 man/man1/${GNU_PROGRAM_PREFIX}cmp.1
 man/man1/${GNU_PROGRAM_PREFIX}diff.1
 man/man1/${GNU_PROGRAM_PREFIX}diff3.1
 man/man1/${GNU_PROGRAM_PREFIX}sdiff.1
+share/locale/ca/LC_MESSAGES/diffutils.mo
 share/locale/cs/LC_MESSAGES/diffutils.mo
 share/locale/da/LC_MESSAGES/diffutils.mo
 share/locale/de/LC_MESSAGES/diffutils.mo
-share/locale/en_GB/LC_MESSAGES/diffutils.mo
+share/locale/el/LC_MESSAGES/diffutils.mo
 share/locale/eo/LC_MESSAGES/diffutils.mo
 share/locale/es/LC_MESSAGES/diffutils.mo
+share/locale/fi/LC_MESSAGES/diffutils.mo
 share/locale/fr/LC_MESSAGES/diffutils.mo
+share/locale/ga/LC_MESSAGES/diffutils.mo
 share/locale/gl/LC_MESSAGES/diffutils.mo
 share/locale/he/LC_MESSAGES/diffutils.mo
+share/locale/hu/LC_MESSAGES/diffutils.mo
 share/locale/id/LC_MESSAGES/diffutils.mo
+share/locale/it/LC_MESSAGES/diffutils.mo
 share/locale/ja/LC_MESSAGES/diffutils.mo
+share/locale/lv/LC_MESSAGES/diffutils.mo
+share/locale/ms/LC_MESSAGES/diffutils.mo
+share/locale/nl/LC_MESSAGES/diffutils.mo
 share/locale/pl/LC_MESSAGES/diffutils.mo
+share/locale/pt_BR/LC_MESSAGES/diffutils.mo
 share/locale/ru/LC_MESSAGES/diffutils.mo
+share/locale/sr/LC_MESSAGES/diffutils.mo
 share/locale/sv/LC_MESSAGES/diffutils.mo
 share/locale/tr/LC_MESSAGES/diffutils.mo
+share/locale/uk/LC_MESSAGES/diffutils.mo
+share/locale/vi/LC_MESSAGES/diffutils.mo
+share/locale/zh_CN/LC_MESSAGES/diffutils.mo
 share/locale/zh_TW/LC_MESSAGES/diffutils.mo
diff --git a/devel/diffutils/distinfo b/devel/diffutils/distinfo
index aca9861529a..e403ab7f61c 100644
--- a/devel/diffutils/distinfo
+++ b/devel/diffutils/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2009/03/10 14:06:06 apb Exp $
+$NetBSD: distinfo,v 1.7 2012/04/07 16:30:05 schwarz Exp $
 
-SHA1 (diffutils-2.8.1.tar.gz) = a4c467c3a6a08cde9f3d94d02067ec26436e7dc5
-RMD160 (diffutils-2.8.1.tar.gz) = a61b15401f140097d39dfe00cd2a8062bcdfaa0e
-Size (diffutils-2.8.1.tar.gz) = 780086 bytes
-SHA1 (patch-aa) = a1f55c41e585a9e0ba521a6272a3f1e1df803597
-SHA1 (patch-ab) = bed6cbc99da590177612675eccececb8b34c2140
+SHA1 (diffutils-3.2.tar.gz) = e145a54a8ff67fa6272de48ec0e2f4897f05dce7
+RMD160 (diffutils-3.2.tar.gz) = b4a544add6aed9678b25ed84146a40f60b6d9352
+Size (diffutils-3.2.tar.gz) = 2023539 bytes
+SHA1 (patch-aa) = 20e262ca71fe9ca36933e96f790f553130efcd88
+SHA1 (patch-ab) = f875decfb827c10aee02da58012a735a40f3d682
diff --git a/devel/diffutils/patches/patch-aa b/devel/diffutils/patches/patch-aa
index d7fe85efb20..be48a2a0a5d 100644
--- a/devel/diffutils/patches/patch-aa
+++ b/devel/diffutils/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2008/11/24 08:02:16 obache Exp $
+$NetBSD: patch-aa,v 1.2 2012/04/07 16:30:05 schwarz Exp $
 
-PR 39941
-
---- configure.orig	2002-04-05 21:48:26.000000000 +0000
-+++ configure
-@@ -3722,7 +3722,7 @@ _ACEOF
- 
- 
- cat >>confdefs.h <<\_ACEOF
--#define DEFAULT_DIFF_PROGRAM "diff"
-+#define DEFAULT_DIFF_PROGRAM "%DEFAULT_DIFF_PROGRAM%"
- _ACEOF
- 
- 
+--- src/Makefile.in.orig	2012-04-07 01:21:43.000000000 +0200
++++ src/Makefile.in	2012-04-07 01:22:34.000000000 +0200
+@@ -1034,7 +1034,7 @@
+ 
+ noinst_HEADERS = diff.h system.h
+ MOSTLYCLEANFILES = paths.h paths.ht
+-gdiff = `echo diff|sed '$(transform)'`
++gdiff = "%DEFAULT_DIFF_PROGRAM%"
+ BUILT_SOURCES = paths.h version.c version.h
+ noinst_LIBRARIES = libver.a
+ nodist_libver_a_SOURCES = version.c version.h
diff --git a/devel/diffutils/patches/patch-ab b/devel/diffutils/patches/patch-ab
index d3ec38f951d..2a643327a31 100644
--- a/devel/diffutils/patches/patch-ab
+++ b/devel/diffutils/patches/patch-ab
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2009/03/10 14:06:06 apb Exp $
+$NetBSD: patch-ab,v 1.2 2012/04/07 16:30:05 schwarz Exp $
 
---- src/context.c.orig	2002-02-28 06:22:42.000000000 +0200
-+++ src/context.c
-@@ -61,9 +61,9 @@ print_context_label (char const *mark,
-       int nsec = TIMESPEC_NS (inf->stat.st_mtim);
-       if (! (tm && nstrftime (buf, sizeof buf, time_format, tm, 0, nsec)))
- 	{
--	  long sec = inf->stat.st_mtime;
-+	  long long sec = inf->stat.st_mtime; /* should really be time_t */
- 	  verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec);
--	  sprintf (buf, "%ld.%.9d", sec, nsec);
-+	  sprintf (buf, "%lld.%.9d", sec, nsec);
- 	}
-       fprintf (outfile, "%s %s\t%s\n", mark, inf->name, buf);
-     }
+--- src/context.c.orig	2012-04-07 01:25:21.000000000 +0200
++++ src/context.c	2012-04-07 01:27:52.000000000 +0200
+@@ -56,8 +56,8 @@
+ 	  if (LONG_MIN <= TYPE_MINIMUM (time_t)
+ 	      && TYPE_MAXIMUM (time_t) <= LONG_MAX)
+ 	    {
+-	      long int sec = inf->stat.st_mtime;
+-	      sprintf (buf, "%ld.%.9d", sec, nsec);
++	      long long int sec = inf->stat.st_mtime; /* should really be time_t */
++	      sprintf (buf, "%lld.%.9d", sec, nsec);
+ 	    }
+ 	  else if (TYPE_MAXIMUM (time_t) <= INTMAX_MAX)
+ 	    {