CVS commit: pkgsrc/textproc/hs-Diff

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jan 31 02:20:14 UTC 2025

Modified Files:
        pkgsrc/textproc/hs-Diff: DESCR Makefile PLIST buildlink3.mk distinfo

Log Message:
textproc/hs-Diff: update to Diff-1.0.2

# 1.0.2

  - Output correct format when an input file is empty, e.g. `@@ --0,0 +1,3 @@`.

# 1.0.1.1

  - Require `base >= 4.11` (GHC 8.4).

# 1.0

  - Add Unix diff style annotations to output of `prettyContextDiff`,
    e.g `@@ -1,5 +1,4 @@`.  This required three changes to the
    signature of `getContextDiff` due to the addition of a wrapper type
    `Numbered`, which enumerates the elements of the input list.

  - Signature change 1: The element pretty printer type changes from
    `(a -> Doc)` to `(Numbered a -> Doc)`.  An unnumber function is
    provided so that the old behavior can be obtained by changing that
    argument from `pretty` to `(pretty . unnumber)`

  - Signature change 2: The result type of getContextDiff changes from
    `ContextDiff a` to `ContextDiff (Numbered a)`.  A function
    `unNumberContextDiff` is provided to convert the result back to
    the old type.

  - Signature change 3: the context argument is now `Maybe Int` rather
    than `Int`, reflecting the change made to `getContextDiffNew` in 0.5.

  - A `prettyContextDiffOld` function is provided to get the old
    style output.

  - The old broken version of getContextDiffOld is removed.

  - Document the behavior of `groupBy'`.

# 0.5

  - Bring space complexity down to D^2 (Bodigrim).
  - Add `Bifunctor` instance (Jonathan King).  Requires `base` >= 4.8.
  - Fix for the grouped context diff.  It was omitting all trailing contexts.
  - Allow unlimited number of context elements (`getContextDiffNew`).

# 0.4

  - Generalize `Diff a` to `PolyDiff a b`.
    `Diff` has been replaced with a specialized synonym `type Diff a = PolyDiff a a`,
    but it's still not backward compatible if you imported `Diff(..)`.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/hs-Diff/DESCR
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/hs-Diff/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/hs-Diff/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/hs-Diff/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/hs-Diff/distinfo

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

Modified files:

Index: pkgsrc/textproc/hs-Diff/DESCR
diff -u pkgsrc/textproc/hs-Diff/DESCR:1.1 pkgsrc/textproc/hs-Diff/DESCR:1.2
--- pkgsrc/textproc/hs-Diff/DESCR:1.1   Mon Mar 30 16:44:48 2020
+++ pkgsrc/textproc/hs-Diff/DESCR       Fri Jan 31 02:20:14 2025
@@ -1,4 +1,4 @@
-O(ND) diff algorithm in Haskell.
+Implementation of the standard diff algorithm in Haskell.
 
-Implementation of the standard diff algorithm, and utilities for
-pretty-printing.
+Time complexity is O(ND) (input length * number of differences). Space
+complexity is O(D^2). Includes utilities for pretty printing.

Index: pkgsrc/textproc/hs-Diff/Makefile
diff -u pkgsrc/textproc/hs-Diff/Makefile:1.12 pkgsrc/textproc/hs-Diff/Makefile:1.13
--- pkgsrc/textproc/hs-Diff/Makefile:1.12       Thu May  9 01:32:38 2024
+++ pkgsrc/textproc/hs-Diff/Makefile    Fri Jan 31 02:20:14 2025
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2024/05/09 01:32:38 pho Exp $
+# $NetBSD: Makefile,v 1.13 2025/01/31 02:20:14 pho Exp $
 
-DISTNAME=      Diff-0.5
-PKGREVISION=   2
+DISTNAME=      Diff-1.0.2
 CATEGORIES=    textproc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-COMMENT=       O(ND) diff algorithm in Haskell
+COMMENT=       Diff algorithm in pure Haskell
 LICENSE=       modified-bsd
 
 .include "../../mk/haskell.mk"

Index: pkgsrc/textproc/hs-Diff/PLIST
diff -u pkgsrc/textproc/hs-Diff/PLIST:1.4 pkgsrc/textproc/hs-Diff/PLIST:1.5
--- pkgsrc/textproc/hs-Diff/PLIST:1.4   Sun Apr 28 20:58:52 2024
+++ pkgsrc/textproc/hs-Diff/PLIST       Fri Jan 31 02:20:14 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/04/28 20:58:52 pho Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/01/31 02:20:14 pho Exp $
 lib/Diff-${PKGVERSION}/${HS_VERSION}/package-description
 lib/Diff-${PKGVERSION}/${HS_VERSION}/package-id
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Algorithm/Diff.dyn_hi
@@ -14,6 +14,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 share/doc/${HS_PLATFORM}/Diff-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/Diff-${PKGVERSION}/html/CHANGELOG.md
 ${PLIST.doc}share/doc/${HS_PLATFORM}/Diff-${PKGVERSION}/html/Data-Algorithm-Diff.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/Diff-${PKGVERSION}/html/Data-Algorithm-DiffContext.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/Diff-${PKGVERSION}/html/Data-Algorithm-DiffOutput.html

Index: pkgsrc/textproc/hs-Diff/buildlink3.mk
diff -u pkgsrc/textproc/hs-Diff/buildlink3.mk:1.11 pkgsrc/textproc/hs-Diff/buildlink3.mk:1.12
--- pkgsrc/textproc/hs-Diff/buildlink3.mk:1.11  Thu May  9 01:32:38 2024
+++ pkgsrc/textproc/hs-Diff/buildlink3.mk       Fri Jan 31 02:20:14 2025
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.11 2024/05/09 01:32:38 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2025/01/31 02:20:14 pho Exp $
 
 BUILDLINK_TREE+=       hs-Diff
 
 .if !defined(HS_DIFF_BUILDLINK3_MK)
 HS_DIFF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-Diff+=        hs-Diff>=0.5
-BUILDLINK_ABI_DEPENDS.hs-Diff+=        hs-Diff>=0.5nb2
+BUILDLINK_API_DEPENDS.hs-Diff+=        hs-Diff>=1.0.2
+BUILDLINK_ABI_DEPENDS.hs-Diff+=        hs-Diff>=1.0.2
 BUILDLINK_PKGSRCDIR.hs-Diff?=  ../../textproc/hs-Diff
 .endif # HS_DIFF_BUILDLINK3_MK
 

Index: pkgsrc/textproc/hs-Diff/distinfo
diff -u pkgsrc/textproc/hs-Diff/distinfo:1.5 pkgsrc/textproc/hs-Diff/distinfo:1.6
--- pkgsrc/textproc/hs-Diff/distinfo:1.5        Thu Oct 26 06:53:51 2023
+++ pkgsrc/textproc/hs-Diff/distinfo    Fri Jan 31 02:20:14 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2023/10/26 06:53:51 pho Exp $
+$NetBSD: distinfo,v 1.6 2025/01/31 02:20:14 pho Exp $
 
-BLAKE2s (Diff-0.5.tar.gz) = b476752a90f5cd327f28d38e9c08c4d51a741dd3da53bbf5ae171c0834f7ad97
-SHA512 (Diff-0.5.tar.gz) = 61c55aad6ac91c38e3105dbf209255e376c67850c92e8f4ee546252b25b0d056c534e1cc57fdc0c7be3b0b8cc06abe516e63ce1c4e7c2d3182b59e43338fb205
-Size (Diff-0.5.tar.gz) = 9122 bytes
+BLAKE2s (Diff-1.0.2.tar.gz) = ba4200b5ad9fcc7e3d6b5d2828eb12d99c737b22527dea419dbfffdfd755b322
+SHA512 (Diff-1.0.2.tar.gz) = 93b693e1117aa45d7c168d592b44feea49337f8f6df13e6f6910b6676b8aff1f7b3d67dab2e24254af238a61eb53603a8665c23f233d0dc4f59ca10d194c82f1
+Size (Diff-1.0.2.tar.gz) = 10936 bytes