Import of pkgsrc-2016Q3

devel/diffutils/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2014/10/09 14:06:08 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2016/08/09 13:35:28 mef Exp $
 #
 
-DISTNAME=		diffutils-3.3
+DISTNAME=		diffutils-3.4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=diffutils/}
 EXTRACT_SUFX=		.tar.xz
@@ -14,28 +14,22 @@ LICENSE=		gnu-gpl-v2
 GNU_CONFIGURE=		YES
 INFO_FILES=		YES # PLIST
 
-CONFIGURE_ENV+=	gt_cv_func_gnugettext1_libintl=yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=	ac_cv_sys_xsi_stack_overflow_heuristic=no
-.endif
+CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
+CONFIGURE_ENV.SunOS+=	ac_cv_sys_xsi_stack_overflow_heuristic=no
 
 AUTO_MKDIRS=		yes
 
+SUBST_CLASSES+=		diff
+SUBST_STAGE.diff=	pre-configure
+SUBST_FILES.diff=	src/Makefile.in
+SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
+
 post-install:
 .for f in cmp diff diff3 sdiff
 	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
 	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor
 
-CONFIGURE_ARGS+=	--program-prefix=g
-
-SUBST_CLASSES+=		diff
-SUBST_STAGE.diff=	pre-configure
-SUBST_FILES.diff=	src/Makefile.in
-SUBST_SED.diff=		-e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

devel/diffutils/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2013/05/22 09:12:27 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/08/09 13:35:28 mef Exp $
 bin/gcmp
 bin/gdiff
 bin/gdiff3
@@ -35,6 +35,7 @@ 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/nb/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

devel/diffutils/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2013/08/21 14:08:08 richard Exp $
+$NetBSD: distinfo,v 1.13 2016/08/09 13:35:28 mef Exp $
 
-SHA1 (diffutils-3.3.tar.xz) = 6463cce7d3eb73489996baefd0e4425928ecd61e
-RMD160 (diffutils-3.3.tar.xz) = 5785f14f89923ad115957b88c0bb4766cd4ededc
-Size (diffutils-3.3.tar.xz) = 1197832 bytes
-SHA1 (patch-aa) = 20e262ca71fe9ca36933e96f790f553130efcd88
-SHA1 (patch-ab) = f875decfb827c10aee02da58012a735a40f3d682
-SHA1 (patch-po_Makefile.in.in) = 311daf695a5f84ff703e1659bfc9468ed0c42236
+SHA1 (diffutils-3.4.tar.xz) = a31084c387d6e5fc8e39fdddc6764720cf4b7479
+RMD160 (diffutils-3.4.tar.xz) = d88508102f7c2e4bdf802e066f8db14665ca8d3e
+SHA512 (diffutils-3.4.tar.xz) = 0fc273007e35e67e217116e776956c6a24421f298d3e6fe60aa1d4250938a65bb8e685cd815517317b5637f5c412c1550d7c1994a9e0283ebbcae9bde24a260d
+Size (diffutils-3.4.tar.xz) = 1358392 bytes
+SHA1 (patch-aa) = 8eb95b462bc59130fca771d9273c6ae0c784520e
+SHA1 (patch-ab) = 9a332a371114d79587286fec9d42d96ecea699b1
+SHA1 (patch-po_Makefile.in.in) = 64ffbae9c85a026e89ad18320ba766db9c4e2bbd

devel/diffutils/patches/patch-aa

@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2012/04/07 16:30:05 schwarz Exp $
+$NetBSD: patch-aa,v 1.3 2016/08/09 13:35:28 mef Exp $
+
+Let to exactly point to own diff program.
+Fixes PR 39941.
 
 --- src/Makefile.in.orig	2012-04-07 01:21:43.000000000 +0200
 +++ src/Makefile.in	2012-04-07 01:22:34.000000000 +0200

devel/diffutils/patches/patch-ab

@@ -1,4 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2012/04/07 16:30:05 schwarz Exp $
+$NetBSD: patch-ab,v 1.3 2016/08/09 13:35:28 mef Exp $
+
+date: 2009-03-10 23:06:06 +0900;  author: apb;  state: Exp;
+Fix a build failure on platforms where time_t is larger than long, by
+using long long instead.  (Not using time_t, because there's no easy and
+portable printf format for time_t.)
 
 --- src/context.c.orig	2012-04-07 01:25:21.000000000 +0200
 +++ src/context.c	2012-04-07 01:27:52.000000000 +0200

devel/diffutils/patches/patch-po_Makefile.in.in

@@ -1,14 +1,14 @@
-$NetBSD: patch-po_Makefile.in.in,v 1.1 2013/08/21 14:08:08 richard Exp $
+$NetBSD: patch-po_Makefile.in.in,v 1.2 2016/08/09 13:35:28 mef Exp $
 
 some misc fixes in order to get over the automake deprecated
 `@mkdir_p@` as well as adverse effects of SHELL in this file.
 
---- po/Makefile.in.in.orig	2013-03-23 14:51:10.000000000 +0000
-+++ po/Makefile.in.in
-@@ -15,7 +15,6 @@ PACKAGE = @PACKAGE@
- VERSION = @VERSION@
+--- po/Makefile.in.in.orig	2016-08-05 08:38:01.000000000 +0900
++++ po/Makefile.in.in	2016-08-09 22:19:28.000000000 +0900
+@@ -16,7 +16,6 @@ VERSION = @VERSION@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  
+ SED = @SED@
 -SHELL = /bin/sh
  @SET_MAKE@