CVS commit: pkgsrc/devel/diffutils

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun May 26 07:05:45 UTC 2024

Modified Files:
        pkgsrc/devel/diffutils: Makefile distinfo options.mk

Log Message:
diffutils: updated to 3.10

Noteworthy changes in release 3.10 (2023-05-21)

** Bug fixes

  cmp/diff can again work with file dates past Y2K38

  diff -D no longer fails to output #ifndef lines.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/diffutils/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/diffutils/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/diffutils/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/diffutils/Makefile
diff -u pkgsrc/devel/diffutils/Makefile:1.43 pkgsrc/devel/diffutils/Makefile:1.44
--- pkgsrc/devel/diffutils/Makefile:1.43        Wed May  1 21:30:47 2024
+++ pkgsrc/devel/diffutils/Makefile     Sun May 26 07:05:45 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2024/05/01 21:30:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.44 2024/05/26 07:05:45 adam Exp $
 
-DISTNAME=      diffutils-3.9
+DISTNAME=      diffutils-3.10
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=diffutils/}
 EXTRACT_SUFX=  .tar.xz
@@ -10,10 +10,7 @@ HOMEPAGE=    https://www.gnu.org/software/d
 COMMENT=       GNU diff utilities - find the differences between files
 LICENSE=       gnu-gpl-v3
 
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-AUTO_MKDIRS=           yes
+USE_TOOLS+=            gmake
 INFO_FILES=            yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --program-prefix=g
@@ -25,7 +22,9 @@ SUBST_STAGE.diff=     pre-configure
 SUBST_FILES.diff=      src/Makefile.in
 SUBST_SED.diff=                -e 's;%DEFAULT_DIFF_PROGRAM%;${PREFIX}/bin/gdiff;'
 
-USE_TOOLS+=            gmake
+.include "options.mk"
+
+INSTALLATION_DIRS+=    ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 post-install:
 .for f in cmp diff diff3 sdiff

Index: pkgsrc/devel/diffutils/distinfo
diff -u pkgsrc/devel/diffutils/distinfo:1.20 pkgsrc/devel/diffutils/distinfo:1.21
--- pkgsrc/devel/diffutils/distinfo:1.20        Sat Feb 18 22:54:35 2023
+++ pkgsrc/devel/diffutils/distinfo     Sun May 26 07:05:45 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2023/02/18 22:54:35 fcambus Exp $
+$NetBSD: distinfo,v 1.21 2024/05/26 07:05:45 adam Exp $
 
-BLAKE2s (diffutils-3.9.tar.xz) = fa5b6842550ab43800a5506223e6c3e37258b0837ac40c685fa2ea58ad397164
-SHA512 (diffutils-3.9.tar.xz) = d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
-Size (diffutils-3.9.tar.xz) = 1587916 bytes
+BLAKE2s (diffutils-3.10.tar.xz) = c191e4b33c082bc3486dd326ab52cddc676b8e4164dc6d9a99ec673932917a33
+SHA512 (diffutils-3.10.tar.xz) = 219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb
+Size (diffutils-3.10.tar.xz) = 1624240 bytes
 SHA1 (patch-po_Makefile.in.in) = 0e7ed6eb85613f272e43a911a35a8b9cfbfb0536
 SHA1 (patch-src_Makefile.in) = ad797a73086d177d53207312a7219f78178895e1

Index: pkgsrc/devel/diffutils/options.mk
diff -u pkgsrc/devel/diffutils/options.mk:1.1 pkgsrc/devel/diffutils/options.mk:1.2
--- pkgsrc/devel/diffutils/options.mk:1.1       Wed May  1 21:30:47 2024
+++ pkgsrc/devel/diffutils/options.mk   Sun May 26 07:05:45 2024
@@ -1,9 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2024/05/01 21:30:47 cheusov Exp $
-
-PKG_OPTIONS_VAR=               PKG_OPTIONS.diffutils
+# $NetBSD: options.mk,v 1.2 2024/05/26 07:05:45 adam Exp $
 
+PKG_OPTIONS_VAR=       PKG_OPTIONS.diffutils
 PKG_SUPPORTED_OPTIONS+=        nls
-PKG_SUGGESTED_OPTIONS=         nls
+PKG_SUGGESTED_OPTIONS= nls
 
 PLIST_VARS+=   nls