Import of pkgsrc-2013Q2

devel/diffutils/DESCR

@@ -0,0 +1,21 @@
+GNU diff utilities:
+
+   You can use the `diff' command to show differences between two
+files, or each corresponding file in two directories.  `diff' outputs
+differences between files line by line in any of several formats,
+selectable by command line options.  This set of differences is often
+called a "diff" or "patch".  For files that are identical, `diff'
+normally produces no output; for binary (non-text) files, `diff'
+normally reports only that they are different.
+
+   You can use the `cmp' command to show the offsets and line numbers
+where two files differ.  `cmp' can also show all the characters that
+differ between the two files, side by side.
+
+   You can use the `diff3' command to show differences among three
+files.  When two people have made independent changes to a common
+original, `diff3' can report the differences between the original and
+the two changed versions, and can produce a merged file that contains
+both persons' changes together with warnings about conflicts.
+
+   You can use the `sdiff' command to merge two files interactively.

devel/diffutils/Makefile

@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.33 2013/05/30 16:31:33 richard Exp $
+#
+
+DISTNAME=		diffutils-3.3
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_GNU:=diffutils/}
+EXTRACT_SUFX=		.tar.xz
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://www.gnu.org/software/diffutils/diffutils.html
+COMMENT=		GNU diff utilities - find the differences between files
+LICENSE=		gnu-gpl-v2
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+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
+
+AUTO_MKDIRS=		yes
+
+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

@@ -0,0 +1,49 @@
+@comment $NetBSD: PLIST,v 1.13 2013/05/22 09:12:27 jperkin Exp $
+bin/gcmp
+bin/gdiff
+bin/gdiff3
+bin/gsdiff
+gnu/bin/cmp
+gnu/bin/diff
+gnu/bin/diff3
+gnu/bin/sdiff
+gnu/man/man1/cmp.1
+gnu/man/man1/diff.1
+gnu/man/man1/diff3.1
+gnu/man/man1/sdiff.1
+info/diffutils.info
+man/man1/gcmp.1
+man/man1/gdiff.1
+man/man1/gdiff3.1
+man/man1/gsdiff.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/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/hr/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/ro/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

devel/diffutils/distinfo

@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.10 2013/05/30 16:31:33 richard 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

devel/diffutils/patches/patch-aa

@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.2 2012/04/07 16:30:05 schwarz Exp $
+
+--- 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

devel/diffutils/patches/patch-ab

@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.2 2012/04/07 16:30:05 schwarz Exp $
+
+--- 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)
+ 	    {