pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cabal2pkg: Update to cabal2pkg-0.1.2



Module Name:	pkgsrc-wip
Committed By:	PHO <pho%cielonegro.org@localhost>
Pushed By:	pho
Date:		Sun Nov 8 22:17:55 2026 +0900
Changeset:	f77b3f0d0154caf4f84b84b1949af6676fc3f133

Modified Files:
	cabal2pkg/Makefile
	cabal2pkg/PLIST
	cabal2pkg/distinfo
Removed Files:
	cabal2pkg/patches/patch-cabal2pkg.cabal
	cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs

Log Message:
cabal2pkg: Update to cabal2pkg-0.1.2

## 0.1.2 -- 2026-11-08

Compatibility changes:

* Fixed build with GHC 9.10. `cabal2pkg` no longer supports GHC 9.8.

New features:

* Added a global option `--fill-column=COLUMN` for specifying page
  width. Currently only used for generating `DESCR` files. Previously it
  was fixed to 80, but now it's defaulted to 76. This options is only meant
  to be used for debugging.
* `cabal2pkg init` now infers a package from the name of the directory if
  no package URI is given. The package is assumed to be available in
  Hackage in this case.

Behaviour changes:

* `cabal2pkg` no longer hard-codes the path to GHC found at compile
  time. It now instead searches in PATH at run-time. This is because
  `cabal2pkg` is intended to be used while the pkgsrc tree is in an
  inconsistent state where it isn't always possible to rebuild `cabal2pkg`
  immediately after updating GHC.
* `cabal2pkg update` now temporarily removes
  `HASKELL_UNRESTRICT_DEPENDENCIES` before merging local changes. The
  variable is now completely overwritten rather than being patched during
  updates. This is because its value is not determined solely by the
  package itself but also by the surrounding environment (i.e. the versions
  of packages it depends on, including the ones that come along with GHC),
  and the environment might have changed since when the last time the
  package was updated. Attempting to merge changes to them thus tended to
  create merge conflicts that didn't really make sense.
* `cabal2pkg update` now tries to update `HASKELL_UNRESTRICT_DEPENDENCIES`
  even when the package is already the latest one.
* Newlines in `COMMENT` are now replaced with spaces.
* `cabal2pkg` now displays warnings about unknown dependencies.
* `cabal2pkg` now treats `custom-setup` as a Cabal package component,
  although it is technically not. Setup dependencies were previously
  ignored but are now build-dependend. (Yes, they are build-depended, not
  tool-depended because buildlink `BUILDLINK_DEPMETHOD` doesn't support
  tool dependencies. They have to be buildlinked, otherwise `Setup` cannot
  be linked.)
* Description of Manual Cabal flags are now parsed and rendered as a
  Haddock text on terminal.

Bug fixes:

* Fixed the `COMMIT_MSG` saying "no release notes have been provided"
  having no newlines at the end of file.
* Fixed an issue where `cabal2pkg update` aborts with an error for some
  packages on Hackage. It failed when the package to be updated had
  versions marked as `unpreferred` in its version list.
* Fixed a bug where `PKGNAME` could be incorrectly generated sometimes.
* Fixed a bug where `OPTPARSE_APPLICATIVE_EXECUTABLES` in some cases didn't
  get defined when it should.
* Fixed an issue where ordered, unordered, or definition lists in `DESCR`
  files were sometimes rendered incorrectly.
* Fixed a bug where `cabal2pkg update` could show a bogus message saying
  `Deleted buildlink3.mk` when there was no `buildlink3.mk` in the first
  place.
* Fixed an issue where package components (e.g. `lib:*`) with no visible
  dependencies could survive garbage collection in certain cases, leaving
  empty sections in Makefiles.
* Fixed an issue where Makefile conditionals could be rendered with wrong
  indentation.
* Cabal conditionals like `if !arch(x86_64)` are now translated to Makefile
  conditionals like `.if ${MACHINE_ARCH} != "x86_64"`. Previously they were
  translated to `.if !(${MACHINE_ARCH} == "x86_64")`, which were correct
  but weren't optimal.
* Fix an issue where `cabal2pkg` sometimes fails to simplify Makefile
  conditionals properly, leaving empty `.else` .. `.endif` blocks.
* Fixed an issue where a series of Cabal conditionals that are independent
  to each other could be wrongly translated to a single `.if` ... `.elif`
  ... `.endif` as opposed to a series of `.if` ... `.endif`.
* Fixed an issue where `USE_TOOLS+= pkg-config` would not be produced in
  certain cases even when there were pkg-config dependencies.
* Fixed an issue where `DESCR` files are rendered incorrectly in some
  cases.

Internal changes:

* Dropped dependency on `haddock-library`. `cabal2pkg` now has its own
  Haddock AST and a parser. There should be no behaviour changes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f77b3f0d0154caf4f84b84b1949af6676fc3f133

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

diffstat:
 cabal2pkg/Makefile                                 |   7 +-
 cabal2pkg/PLIST                                    | 219 +++++++++++++++++++++
 cabal2pkg/distinfo                                 |   8 +-
 cabal2pkg/patches/patch-cabal2pkg.cabal            |  20 --
 .../patch-src_System_OsString_Posix_Instances.hs   |  15 --
 5 files changed, 226 insertions(+), 43 deletions(-)

diffs:
diff --git a/cabal2pkg/Makefile b/cabal2pkg/Makefile
index c4bb4c5d58..6decbd742d 100644
--- a/cabal2pkg/Makefile
+++ b/cabal2pkg/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	cabal2pkg-0.1.1
+DISTNAME=	cabal2pkg-0.1.2
 PKGNAME=	${DISTNAME}
 CATEGORIES=	pkgtools
 MASTER_SITES=	${MASTER_SITE_GITHUB:=depressed-pho/}
@@ -33,16 +33,17 @@ post-install:
 	${INSTALL_MAN} "${WRKSRC}/doc/cabal2pkg.8" "${DESTDIR}${PREFIX}/${PKGMANDIR}/man8"
 
 .include "../../textproc/hs-Diff/buildlink3.mk"
+.include "../../wip/hs-isnull/buildlink3.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"
+.include "../../textproc/hs-attoparsec/buildlink3.mk"
 .include "../../textproc/hs-case-insensitive/buildlink3.mk"
 .include "../../devel/hs-conduit/buildlink3.mk"
 .include "../../devel/hs-conduit-extra/buildlink3.mk"
 .include "../../textproc/hs-diff3/buildlink3.mk"
 .include "../../devel/hs-either/buildlink3.mk"
 .include "../../misc/hs-extra/buildlink3.mk"
-.include "../../devel/hs-ghc-paths/buildlink3.mk"
-.include "../../textproc/hs-haddock-library/buildlink3.mk"
+.include "../../devel/hs-filtrable/buildlink3.mk"
 .include "../../www/hs-http-conduit/buildlink3.mk"
 .include "../../www/hs-http-media/buildlink3.mk"
 .include "../../www/hs-http-types/buildlink3.mk"
diff --git a/cabal2pkg/PLIST b/cabal2pkg/PLIST
index 42f6643bb9..438bdb39aa 100644
--- a/cabal2pkg/PLIST
+++ b/cabal2pkg/PLIST
@@ -1,4 +1,223 @@
 @comment $NetBSD$
 bin/cabal2pkg
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/CmdLine.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/CmdLine.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/CmdLine.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Common.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Common.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Common.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Init.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Init.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Init.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Update.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Update.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Command/Update.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Component.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Component.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Component.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Conditional.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Conditional.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Conditional.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Executable.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Executable.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Executable.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/ExternalLib.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/ExternalLib.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/ExternalLib.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Library.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Library.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Library.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/PkgConfig.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/PkgConfig.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/PkgConfig.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Version.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Version.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Dependency/Version.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Haddock.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Haddock.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/Haddock.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/License.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/License.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Extractor/License.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Buildlink3.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Buildlink3.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Buildlink3.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/CommitMsg.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/CommitMsg.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/CommitMsg.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Description.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Description.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Description.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Makefile.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Makefile.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Generator/Makefile.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Pretty.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Pretty.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Pretty.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/RawMeta.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/RawMeta.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/RawMeta.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/Common.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/Common.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/Common.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/GitHub.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/GitHub.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/GitHub.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/GitLab.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/GitLab.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/GitLab.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/Hackage.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/Hackage.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Site/Hackage.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Static.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Static.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Cabal2Pkg/Static.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Deferred.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Deferred.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Deferred.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Lazy/Merge.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Lazy/Merge.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Lazy/Merge.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Database/Pkgsrc/SrcDb.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Database/Pkgsrc/SrcDb.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Database/Pkgsrc/SrcDb.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/ExactPrint.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/ExactPrint.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/ExactPrint.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Extension.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Extension.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Extension.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Parse.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Parse.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Parse.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Plain.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Plain.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Plain.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Pretty.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Pretty.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Pretty.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Types.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Types.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/BMake/AST/Types.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST/Parse.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST/Parse.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST/Parse.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST/Types.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST/Types.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haddock/AST/Types.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/PackageInfo_cabal2pkg.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PackageInfo_cabal2pkg.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/PackageInfo_cabal2pkg.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/Directory/PosixPath.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Directory/PosixPath.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/Directory/PosixPath.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/File/PosixPath/Alt.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/File/PosixPath/Alt.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/File/PosixPath/Alt.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/OsString/Posix/Instances.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/OsString/Posix/Instances.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/OsString/Posix/Instances.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+lib/${PKGNAME}/${HS_VERSION}/package-description
+lib/${PKGNAME}/${HS_VERSION}/package-id
 man/man8/cabal2pkg.8
 share/doc/${HS_PLATFORM}/${PKGNAME}/UNLICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-CmdLine.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Command-Common.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Command-Init.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Command-Update.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Component.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Conditional.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Dependency-Executable.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Dependency-ExternalLib.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Dependency-Library.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Dependency-PkgConfig.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Dependency-Version.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Dependency.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-Haddock.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor-License.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Extractor.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Generator-Buildlink3.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Generator-CommitMsg.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Generator-Description.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Generator-Makefile.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Pretty.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-RawMeta.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Site-Common.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Site-GitHub.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Site-GitLab.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Site-Hackage.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Site.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Cabal2Pkg-Static.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Concurrent-Deferred.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Data-Text-Lazy-Merge.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Database-Pkgsrc-SrcDb.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST-ExactPrint.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST-Extension.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST-Parse.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST-Plain.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST-Pretty.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST-Types.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-BMake-AST.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-Haddock-AST-Parse.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-Haddock-AST-Types.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-Haddock-AST.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/NEWS.md
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/PackageInfo_cabal2pkg.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/README.md
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/System-Directory-PosixPath.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/System-File-PosixPath-Alt.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/System-OsString-Posix-Instances.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/cabal2pkg.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-35.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-46.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-63.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-95.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-A.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-All.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-B.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-C.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-D.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-E.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-F.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-G.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-H.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-I.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-K.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-L.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-M.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-N.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-O.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-P.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Q.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-R.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-S.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-T.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-U.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-V.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-W.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-X.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png
diff --git a/cabal2pkg/distinfo b/cabal2pkg/distinfo
index 4d24f0a50f..ff07933da8 100644
--- a/cabal2pkg/distinfo
+++ b/cabal2pkg/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-BLAKE2s (cabal2pkg-0.1.1.tar.gz) = 7bd5cf4f91134301df766b7296e88db6ad3fb9056ca411b66591c341143fd6ca
-SHA512 (cabal2pkg-0.1.1.tar.gz) = b1208d8adf3cabd8e0be965f469ac289a6d0cbb3f65c7a31dd05a2dc4b5f2ddb938e397ee45a6c0f8dacf9f2956f9a4a7c50bf88db6d3132ae0d021ec4298603
-Size (cabal2pkg-0.1.1.tar.gz) = 67842 bytes
-SHA1 (patch-cabal2pkg.cabal) = b2d8cb1344dd82c38b93cd53c58d95214f40f1cc
-SHA1 (patch-src_System_OsString_Posix_Instances.hs) = 71f3c9b663a444301baa20ffd333f27daf7128d6
+BLAKE2s (cabal2pkg-0.1.2.tar.gz) = 8e7869fc617889f25a42179f9ca6d8472c47573e3e09bc549e2661ad5c2e38c5
+SHA512 (cabal2pkg-0.1.2.tar.gz) = 11db341e79bc7c73d7317b1d73f7d1abe3a13de67abdb89702e869c8597e0b9f141ce0da81399f9e4a69acdbf5e1d482d63952d0b63c1ff43671664fb8aa2794
+Size (cabal2pkg-0.1.2.tar.gz) = 99501 bytes
diff --git a/cabal2pkg/patches/patch-cabal2pkg.cabal b/cabal2pkg/patches/patch-cabal2pkg.cabal
deleted file mode 100644
index 14594e4ac1..0000000000
--- a/cabal2pkg/patches/patch-cabal2pkg.cabal
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Fix build with GHC 9.10
-
---- cabal2pkg.cabal.orig	2025-02-02 07:32:42.492143593 +0000
-+++ cabal2pkg.cabal
-@@ -1,4 +1,4 @@
--cabal-version:      3.4
-+cabal-version:      3.12
- name:               cabal2pkg
- version:            0.1.1
- synopsis:           A tool to automate importing/updating Haskell packages in pkgsrc
-@@ -118,6 +118,7 @@ executable cabal2pkg
-       , network-uri          ^>= 2.6.4
-       , optparse-applicative ^>= 0.18.1
-       , ordered-containers   ^>= 0.2.3
-+      , os-string            ^>= 2.0.2
-       , prettyprinter        ^>= 1.7.1
-       , prettyprinter-ansi-terminal ^>= 1.1.3
-       , pretty-show          ^>= 1.10
diff --git a/cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs b/cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs
deleted file mode 100644
index b125090a85..0000000000
--- a/cabal2pkg/patches/patch-src_System_OsString_Posix_Instances.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix build with GHC 9.10
-
---- src/System/OsString/Posix/Instances.hs.orig	2025-02-02 07:36:16.634791582 +0000
-+++ src/System/OsString/Posix/Instances.hs
-@@ -3,7 +3,7 @@
- module System.OsString.Posix.Instances () where
- 
- import Data.CaseInsensitive (FoldCase(..))
--import System.OsPath.Data.ByteString.Short (fromShort, toShort)
-+import System.OsString.Data.ByteString.Short (fromShort, toShort)
- import System.OsString.Internal.Types (PosixString(..))
- 
- instance FoldCase PosixString where


Home | Main Index | Thread Index | Old Index