pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/git-annex
Module Name: pkgsrc
Committed By: pho
Date: Sun Feb 2 04:31:03 UTC 2025
Modified Files:
pkgsrc/sysutils/git-annex: Makefile distinfo options.mk
pkgsrc/sysutils/git-annex/patches: patch-git-annex.cabal
Log Message:
sysutils/git-annex: update to git-annex-10.20250115
git-annex (10.20250115) upstream; urgency=medium
* Improve handing of ssh connection problems during
remote annex.uuid discovery.
* log: Support --key, as well as --branch and --unused.
* Avoid verification error when addurl --verifiable is used
with an url claimed by a special remote other than the web.
* Fix installation on Android.
* Allow enableremote of an existing webdav special remote that has
read-only access.
* git-remote-annex: Use enableremote rather than initremote.
* Windows: Fix permission denied error when dropping files that
have the readonly attribute set.
* Added freezecontent-annex and thawcontent-annex hooks that
correspond to the git configs annex.freezecontent and
annex.thawcontent.
* Added secure-erase-annex hook that corresponds to the git config
annex.secure-erase-command.
* Added commitmessage-annex hook that corresponds to the git config
annex.commitmessage-command.
* Added http-headers-annex hook that corresponds to the git config
annex.http-headers-command.
* Added git configs annex.post-update-command and annex.pre-commit-command
that correspond to the post-update-annex and pre-commit-annex hooks.
* Added annex.pre-init-command git config and pre-init-annex hook
that is run before git-annex repository initialization.
* Linux standalone builds' bundled rsync updated to fix security holes.
-- Joey Hess <id%joeyh.name@localhost> Wed, 15 Jan 2025 11:39:12 -0400
git-annex (10.20250102) upstream; urgency=medium
* Added config `url.<base>.annexInsteadOf` corresponding to git's
`url.<base>.pushInsteadOf`, to configure the urls to use for accessing
the git-annex repositories on a server without needing to configure
remote.name.annexUrl in each repository.
* Work around git hash-object --stdin-paths's odd stripping of carriage
return from the end of the line (some windows infection), avoiding
crashing when the repo contains a filename ending in a carriage return.
* Document that settting preferred content to "" is the same as the
default unset behavior.
* sync: Avoid misleading warning about future preferred content
transition when preferred content is set to "".
* Honor annex.addunlocked configuration when importing a tree from a
special remote.
* Removed the i386ancient standalone tarball build for linux, which
was increasingly unable to support new git-annex features.
* Removed support for building with ghc older than 9.0.2,
and with older versions of haskell libraries than are in current Debian
stable.
* stack.yaml: Update to lts-23.2.
-- Joey Hess <id%joeyh.name@localhost> Thu, 02 Jan 2025 12:31:58 -0400
git-annex (10.20241202) upstream; urgency=medium
* add: Consistently treat files in a dotdir as dotfiles, even
when ran inside that dotdir.
* add: When adding a dotfile as a non-large file, mention that it's a
dotfile.
* p2phttp: Added --directory option which serves multiple git-annex
repositories located inside a directory.
* When remote.name.annexUrl is an annex+http(s) url, that
uses the same hostname as remote.name.url, which is itself a http(s)
url, they are assumed to share a username and password. This avoids
unnecessary duplicate password prompts.
* git-remote-annex: Fix a reversion introduced in version 10.20241031
that broke cloning from a special remote.
* git-remote-annex: Fix cloning from a special remote on a crippled
filesystem.
* git-remote-annex: Fix buggy behavior when annex.stalldetection is
configured.
* git-remote-annex: Require git version 2.31 or newer, since old
ones had a buggy git bundle command.
* S3: Support versioning=yes with a readonly bucket.
(Needs aws-0.24.3)
* S3: Send git-annex or other configured User-Agent.
(Needs aws-0.24.3)
* S3: Fix infinite loop and memory blowup when importing from an
unversioned S3 bucket that is large enough to need pagination.
* S3: Use significantly less memory when importing from a
versioned S3 bucket.
* vpop: Only update state after successful checkout.
-- Joey Hess <id%joeyh.name@localhost> Mon, 02 Dec 2024 12:31:08 -0400
git-annex (10.20241031) upstream; urgency=medium
* Sped up proxied downloads from special remotes, by streaming.
* Added GETORDERED request to external special remote protocol.
When the external special remote responds with ORDERED, it can stream
through a proxy.
* p2phttp: Support serving unauthenticated users while requesting
authentication for operations that need it. Eg, --unauth-readonly
can be combined with --authenv.
* p2phttp: Allow unauthenticated users to lock content by default.
* p2phttp: Added --unauth-nolocking option to prevent unauthenticated
users from locking content.
* Allow enabling the servant build flag with older versions of stm,
allowing building with ghc 9.0.2.
* git-remote-annex: Fix bug that prevented using it with external special
remotes, leading to protocol error messages involving "GITMANIFEST".
* adjust: Allow any order of options when combining --hide-missing with
options like --unlock.
* Support P2P protocol version 4. This allows DATA-PRESENT to be sent
after PUT (and in the HTTP P2P protocol, v4/put has a data-present
parameter). When used with a proxy to a special remote like a S3
bucket, this allows a custom client to upload content to S3 itself,
and then use the P2P protocol to inform the proxy that the content has
been stored there, which will result in the same git-annex branch state
updates as sending DATA via the proxy.
* Fix hang when receiving a large file into a proxied special remote.
-- Joey Hess <id%joeyh.name@localhost> Thu, 31 Oct 2024 17:19:56 -0400
git-annex (10.20240927) upstream; urgency=medium
* Detect when a preferred content expression contains "not present",
which would lead to repeatedly getting and then dropping files,
and make it never match. This also applies to
"not balanced" and "not sizebalanced".
* Fix --explain display of onlyingroup preferred content expression.
* Allow maxsize to be set to 0 to stop checking maxsize for a repository.
* Fix bug that prevented anything being stored in an empty
repository whose preferred content expression uses sizebalanced.
* sim: New command, can be used to simulate networks of repositories
and see how preferred content and other configuration makes file
content flow through it.
-- Joey Hess <id%joeyh.name@localhost> Mon, 30 Sep 2024 19:15:35 -0400
git-annex (10.20240831) upstream; urgency=medium
* Special remotes configured with exporttree=yes annexobjects=yes
can store objects in .git/annex/objects, as well as an exported tree.
* Support proxying to special remotes configured with
exporttree=yes annexobjects=yes, and allow such remotes to be used as
cluster nodes.
* post-retrieve: When proxying is enabled for an exporttree=yes
special remote (or it is a cluster node) and the configured
remote.name.annex-tracking-branch is received, the tree is
exported to the special remote.
* Support "balanced=", "fullybalanced=", "sizebalanced=" and
"fullysizebalanced=" in preferred content expressions.
* Added --rebalance option.
* Added the annex.fullybalancedthreshhold git config.
* maxsize: New command to tell git-annex how large the expected maximum
size of a repository is, and to display repository sizes.
* vicfg: Include maxsize configuration.
* info: Improved speed by using new repository size tracking.
* lookupkey: Allow using --ref in a bare repository.
* export: Added --from option.
* git-remote-annex: Store objects in exportree=yes special remotes
in the same paths used by annexobjects=yes. This is a backwards
compatible change.
* updateproxy, updatecluster: Prevent using an exporttree=yes special
remote that does not have annexobjects=yes, since it will not work.
* The config versioning=true is now reserved for use by versioned special
remotes. External special remotes should not use that config for their
own purposes.
-- Joey Hess <id%joeyh.name@localhost> Sat, 31 Aug 2024 19:48:17 -0400
git-annex (10.20240808) upstream; urgency=medium
* Remove debug output (to stderr) accidentially included in
last version.
* When getting from a P2P HTTP remote, prompt for credentials when
required, instead of failing.
* When proxying an upload to a special remote, verify the hash.
* Avoid loading cluster log at startup.
-- Joey Hess <id%joeyh.name@localhost> Thu, 08 Aug 2024 15:26:26 -0400
git-annex (10.20240731) upstream; urgency=medium
* New HTTP API that is equivilant to the P2P protocol.
* New p2phttp command to serve the HTTP API.
* annex+http and annex+https urls can be configured for
remote.name.annexUrl to use the HTTP API to communicate with a server.
This supports writable repositories, as well as accessing clusters
and proxied remotes over HTTP.
* When a http remote has annex.url set to an annex+http url in
the git config file on the website, it will be copied into
remote.name.annexUrl the first time git-annex uses the remote.
* assistant: Fix a race condition that could cause a pointer file to
get ingested into the annex.
* Avoid potential data loss in unlikely situations where git-annex-shell
or git-annex remotedaemon is killed while locking a key to prevent its
removal.
* When proxying a download from a special remote, avoid unncessary hashing.
* When proxying an upload to a special remote, verify the hash.
* Propagate --force to git-annex transferrer.
* Added a build flag for servant, enabling annex+http urls and
git-annex p2phttp.
* Added a dependency on the haskell clock library.
* Updated stack.yaml to nightly-2024-07-29.
-- Joey Hess <id%joeyh.name@localhost> Wed, 31 Jul 2024 14:02:21 -0400
git-annex (10.20240701) upstream; urgency=medium
* git-annex remotes can now act as proxies that provide access to
their remotes. Configure this with remote.name.annex-proxy
and the git-annex update proxy command.
* Clusters are now supported. These are collections of nodes that can
be accessed as a single entity, accessed by one or more gateway
repositories.
* Added git-annex initcluster, updatecluster, and extendcluster commands.
* Fix a bug where interrupting git-annex while it is updating the
git-annex branch for an export could later lead to git fsck
complaining about missing tree objects.
* Tab completion of options like --from now includes special remotes,
as well as proxied remotes and clusters.
* Tab completion of many commands like info and trust now includes
remotes.
* P2P protocol version 2.
* Fix Windows build with Win32 2.13.4+
Thanks, Oleg Tolmatcev
* When --debugfilter or annex.debugfilter is set, avoid propigating
debug output from git-annex-shell, since it cannot be filtered.
-- Joey Hess <id%joeyh.name@localhost> Mon, 01 Jul 2024 15:11:48 -0400
git-annex (10.20240531) upstream; urgency=medium
* git-remote-annex: New program which allows pushing a git repo to a
git-annex special remote, and cloning from a special remote.
(Based on Michael Hanke's git-remote-datalad-annex.)
* initremote, enableremote: Added --with-url to enable using
git-remote-annex.
* When building an adjusted unlocked branch, make pointer files
executable when the annex object file is executable.
* group: Added --list option.
* fsck: Fix recent reversion that made it say it was checksumming files
whose content is not present.
* Avoid the --fast option preventing checksumming in some cases it
was not supposed to.
* testremote: Really fsck downloaded objects.
* Typo fixes.
Thanks, Yaroslav Halchenko
-- Joey Hess <id%joeyh.name@localhost> Fri, 31 May 2024 12:32:29 -0400
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/git-annex/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/git-annex/distinfo \
pkgsrc/sysutils/git-annex/options.mk
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/git-annex/Makefile
diff -u pkgsrc/sysutils/git-annex/Makefile:1.10 pkgsrc/sysutils/git-annex/Makefile:1.11
--- pkgsrc/sysutils/git-annex/Makefile:1.10 Thu Nov 14 22:21:39 2024
+++ pkgsrc/sysutils/git-annex/Makefile Sun Feb 2 04:31:03 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2024/11/14 22:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/02 04:31:03 pho Exp $
-DISTNAME= git-annex-10.20240430
+DISTNAME= git-annex-10.20250115
PKGNAME= ${DISTNAME}
-PKGREVISION= 5
CATEGORIES= sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -19,6 +18,12 @@ HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no
.include "options.mk"
+# Setup dependencies
+.include "../../devel/hs-split/buildlink3.mk"
+.include "../../sysutils/hs-filepath-bytestring/buildlink3.mk"
+.include "../../devel/hs-async/buildlink3.mk"
+.include "../../devel/hs-utf8-string/buildlink3.mk"
+
# Optional dependencies that we always enable
CONFIGURE_ARGS+= -f Pairing
.include "../../net/hs-network-multicast/buildlink3.mk"
@@ -33,67 +38,68 @@ CONFIGURE_ARGS+= -f MagicMime
CONFIGURE_ARGS+= -f Benchmark
.include "../../benchmarks/hs-criterion/buildlink3.mk"
-# Mandatory dependencies
-.include "../../converters/hs-aeson/buildlink3.mk"
-.include "../../devel/hs-ansi-terminal/buildlink3.mk"
-.include "../../devel/hs-async/buildlink3.mk"
-.include "../../textproc/hs-attoparsec/buildlink3.mk"
-.include "../../net/hs-aws/buildlink3.mk"
-.include "../../devel/hs-bloomfilter/buildlink3.mk"
-.include "../../devel/hs-byteable/buildlink3.mk"
-.include "../../textproc/hs-case-insensitive/buildlink3.mk"
-.include "../../devel/hs-concurrent-output/buildlink3.mk"
-.include "../../devel/hs-conduit/buildlink3.mk"
-.include "../../security/hs-crypto-api/buildlink3.mk"
+# Mandatory runtime dependencies
+.include "../../net/hs-network-uri/buildlink3.mk"
+.include "../../devel/hs-optparse-applicative/application.mk"
+.include "../../devel/hs-uuid/buildlink3.mk"
.include "../../devel/hs-data-default/buildlink3.mk"
-.include "../../www/hs-dav/buildlink3.mk"
-.include "../../sysutils/hs-disk-free-space/buildlink3.mk"
+.include "../../textproc/hs-case-insensitive/buildlink3.mk"
+.include "../../devel/hs-random/buildlink3.mk"
.include "../../devel/hs-dlist/buildlink3.mk"
-.include "../../textproc/hs-edit-distance/buildlink3.mk"
-.include "../../www/hs-feed/buildlink3.mk"
+.include "../../devel/hs-unix-compat/buildlink3.mk"
+.include "../../devel/hs-safesemaphore/buildlink3.mk"
+.include "../../devel/hs-async/buildlink3.mk"
+.include "../../sysutils/hs-disk-free-space/buildlink3.mk"
.include "../../sysutils/hs-filepath-bytestring/buildlink3.mk"
+.include "../../devel/hs-ifelse/buildlink3.mk"
+.include "../../devel/hs-monad-logger/buildlink3.mk"
.include "../../math/hs-free/buildlink3.mk"
-.include "../../devel/hs-git-lfs/buildlink3.mk"
+.include "../../devel/hs-utf8-string/buildlink3.mk"
+.include "../../converters/hs-sandi/buildlink3.mk"
+.include "../../devel/hs-monad-control/buildlink3.mk"
+.include "../../devel/hs-bloomfilter/buildlink3.mk"
+.include "../../textproc/hs-edit-distance/buildlink3.mk"
+.include "../../devel/hs-resourcet/buildlink3.mk"
.include "../../www/hs-http-client/buildlink3.mk"
-.include "../../www/hs-http-client-restricted/buildlink3.mk"
.include "../../www/hs-http-client-tls/buildlink3.mk"
-.include "../../www/hs-http-conduit/buildlink3.mk"
.include "../../www/hs-http-types/buildlink3.mk"
-.include "../../devel/hs-ifelse/buildlink3.mk"
-.include "../../devel/hs-memory/buildlink3.mk"
-.include "../../devel/hs-microlens/buildlink3.mk"
-.include "../../devel/hs-monad-control/buildlink3.mk"
-.include "../../devel/hs-monad-logger/buildlink3.mk"
-.include "../../net/hs-network/buildlink3.mk"
-.include "../../net/hs-network-bsd/buildlink3.mk"
-.include "../../net/hs-network-uri/buildlink3.mk"
+.include "../../www/hs-http-conduit/buildlink3.mk"
+.include "../../www/hs-http-client-restricted/buildlink3.mk"
+.include "../../devel/hs-conduit/buildlink3.mk"
.include "../../devel/hs-old-locale/buildlink3.mk"
-.include "../../devel/hs-optparse-applicative/application.mk"
-.include "../../devel/hs-persistent/buildlink3.mk"
.include "../../databases/hs-persistent-sqlite/buildlink3.mk"
+.include "../../devel/hs-persistent/buildlink3.mk"
.include "../../devel/hs-persistent-template/buildlink3.mk"
-.include "../../devel/hs-QuickCheck/buildlink3.mk"
-.include "../../devel/hs-random/buildlink3.mk"
+.include "../../devel/hs-unliftio-core/buildlink3.mk"
+.include "../../devel/hs-microlens/buildlink3.mk"
+.include "../../converters/hs-aeson/buildlink3.mk"
+.include "../../devel/hs-vector/buildlink3.mk"
+.include "../../textproc/hs-tagsoup/buildlink3.mk"
+.include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../www/hs-feed/buildlink3.mk"
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
-.include "../../devel/hs-resourcet/buildlink3.mk"
-.include "../../devel/hs-safesemaphore/buildlink3.mk"
-.include "../../converters/hs-sandi/buildlink3.mk"
-.include "../../security/hs-securemem/buildlink3.mk"
.include "../../net/hs-socks/buildlink3.mk"
-.include "../../devel/hs-split/buildlink3.mk"
+.include "../../devel/hs-byteable/buildlink3.mk"
.include "../../devel/hs-stm-chans/buildlink3.mk"
-.include "../../textproc/hs-tagsoup/buildlink3.mk"
+.include "../../security/hs-securemem/buildlink3.mk"
+.include "../../security/hs-crypto-api/buildlink3.mk"
+.include "../../devel/hs-memory/buildlink3.mk"
+.include "../../devel/hs-split/buildlink3.mk"
+.include "../../textproc/hs-attoparsec/buildlink3.mk"
+.include "../../devel/hs-concurrent-output/buildlink3.mk"
+.include "../../devel/hs-unbounded-delays/buildlink3.mk"
+.include "../../devel/hs-QuickCheck/buildlink3.mk"
.include "../../devel/hs-tasty/buildlink3.mk"
.include "../../devel/hs-tasty-hunit/buildlink3.mk"
.include "../../devel/hs-tasty-quickcheck/buildlink3.mk"
.include "../../devel/hs-tasty-rerun/buildlink3.mk"
-.include "../../devel/hs-unbounded-delays/buildlink3.mk"
-.include "../../devel/hs-unix-compat/buildlink3.mk"
-.include "../../devel/hs-unliftio-core/buildlink3.mk"
-.include "../../devel/hs-unordered-containers/buildlink3.mk"
-.include "../../devel/hs-utf8-string/buildlink3.mk"
-.include "../../devel/hs-uuid/buildlink3.mk"
-.include "../../devel/hs-vector/buildlink3.mk"
+.include "../../devel/hs-ansi-terminal/buildlink3.mk"
+.include "../../net/hs-aws/buildlink3.mk"
+.include "../../www/hs-dav/buildlink3.mk"
+.include "../../net/hs-network/buildlink3.mk"
+.include "../../net/hs-network-bsd/buildlink3.mk"
+.include "../../devel/hs-git-lfs/buildlink3.mk"
+.include "../../time/hs-clock/buildlink3.mk"
.include "../../security/hs-crypton/buildlink3.mk"
.include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/git-annex/distinfo
diff -u pkgsrc/sysutils/git-annex/distinfo:1.2 pkgsrc/sysutils/git-annex/distinfo:1.3
--- pkgsrc/sysutils/git-annex/distinfo:1.2 Sun May 5 12:54:51 2024
+++ pkgsrc/sysutils/git-annex/distinfo Sun Feb 2 04:31:03 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2024/05/05 12:54:51 pho Exp $
+$NetBSD: distinfo,v 1.3 2025/02/02 04:31:03 pho Exp $
-BLAKE2s (git-annex-10.20240430.tar.gz) = 94189511923bbb9bd0270998db428bdfca52a4b25178036fd1e914dc65d57e00
-SHA512 (git-annex-10.20240430.tar.gz) = 5d9031ed0dd7c7ea76298aa7a29541a0e14b27b6f494ca313c8a0e80f1d1a3699f544ba050940a0cb1831f8667100b9e519d332acbc204fd07c9e3aee4f05f9d
-Size (git-annex-10.20240430.tar.gz) = 1421604 bytes
+BLAKE2s (git-annex-10.20250115.tar.gz) = 2fe2666743941dfb881db34b23d0e8e5e858e142c693a9ba7e23291b4581a592
+SHA512 (git-annex-10.20250115.tar.gz) = 11d59302d71ab659bcd2208096f2f06f6834e2ab5a258340de23b03bee2071c6cacef347dd54068e3a029ced82eae03c36d095d116398a1166f3439fd91da051
+Size (git-annex-10.20250115.tar.gz) = 1533006 bytes
SHA1 (patch-Utility_DirWatcher_Kqueue.hs) = d4ef7908d32b9396cb3f5661f78f7d7176ab6e47
-SHA1 (patch-git-annex.cabal) = 986084229906436cabf1bfdad17af3990de70f81
+SHA1 (patch-git-annex.cabal) = 9dee8b00cb531d31a8a54c5fbb25f5242ab813a6
Index: pkgsrc/sysutils/git-annex/options.mk
diff -u pkgsrc/sysutils/git-annex/options.mk:1.2 pkgsrc/sysutils/git-annex/options.mk:1.3
--- pkgsrc/sysutils/git-annex/options.mk:1.2 Sun May 5 12:54:51 2024
+++ pkgsrc/sysutils/git-annex/options.mk Sun Feb 2 04:31:03 2025
@@ -1,55 +1,70 @@
-# $NetBSD: options.mk,v 1.2 2024/05/05 12:54:51 pho Exp $
+# $NetBSD: options.mk,v 1.3 2025/02/02 04:31:03 pho Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.git-annex
PKG_SUPPORTED_OPTIONS= ${PKG_SUGGESTED_OPTIONS} debug
-PKG_SUGGESTED_OPTIONS= dbus git-annex-assistant
+PKG_SUGGESTED_OPTIONS= dbus git-annex-servant git-annex-assistant
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
###
+### Enable seravnt, enabling using annex+http urls and git-annex p2phttp
+###
+.if ${PKG_OPTIONS:Mgit-annex-servant}
+CONFIGURE_ARGS+= -f +Servant
+. include "../../www/hs-servant/buildlink3.mk"
+. include "../../www/hs-servant-server/buildlink3.mk"
+. include "../../www/hs-servant-client/buildlink3.mk"
+. include "../../www/hs-servant-client-core/buildlink3.mk"
+. include "../../www/hs-warp/buildlink3.mk"
+. include "../../www/hs-warp-tls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= -f -Servant
+.endif
+
+###
### Enable git-annex assistant, webapp, and watch command
###
.if ${PKG_OPTIONS:Mgit-annex-assistant}
-CONFIGURE_ARGS+= -f assistant
-. include "../../devel/hs-blaze-builder/buildlink3.mk"
-. include "../../www/hs-clientsession/buildlink3.mk"
+CONFIGURE_ARGS+= -f +assistant
. include "../../sysutils/hs-mountpoints/buildlink3.mk"
+. include "../../www/hs-yesod/buildlink3.mk"
+. include "../../www/hs-yesod-static/buildlink3.mk"
+. include "../../www/hs-yesod-form/buildlink3.mk"
+. include "../../www/hs-yesod-core/buildlink3.mk"
. include "../../www/hs-path-pieces/buildlink3.mk"
-. include "../../textproc/hs-shakespeare/buildlink3.mk"
-. include "../../www/hs-wai/buildlink3.mk"
-. include "../../www/hs-wai-extra/buildlink3.mk"
. include "../../www/hs-warp/buildlink3.mk"
. include "../../www/hs-warp-tls/buildlink3.mk"
-. include "../../www/hs-yesod/buildlink3.mk"
-. include "../../www/hs-yesod-core/buildlink3.mk"
-. include "../../www/hs-yesod-form/buildlink3.mk"
-. include "../../www/hs-yesod-static/buildlink3.mk"
+. include "../../www/hs-wai/buildlink3.mk"
+. include "../../www/hs-wai-extra/buildlink3.mk"
+. include "../../devel/hs-blaze-builder/buildlink3.mk"
+. include "../../www/hs-clientsession/buildlink3.mk"
+. include "../../textproc/hs-shakespeare/buildlink3.mk"
. if ${OPSYS} == "Linux"
. include "../../devel/hs-hinotify/buildlink3.mk"
. elif ${OPSYS} == "Darwin"
. include "../../devel/hs-hfsevents/buildlink3.mk"
. endif
.else
-CONFIGURE_ARGS+= -f-assistant
+CONFIGURE_ARGS+= -f -assistant
.endif
###
### Enable D-Bus and desktop notification support
###
.if ${PKG_OPTIONS:Mdbus}
-CONFIGURE_ARGS+= -f Dbus
+CONFIGURE_ARGS+= -f +Dbus
. include "../../sysutils/hs-dbus/buildlink3.mk"
. include "../../sysutils/hs-fdo-notify/buildlink3.mk"
.else
-CONFIGURE_ARGS+= -f-Dbus
+CONFIGURE_ARGS+= -f -Dbus
.endif
###
### Enable debugging
###
.if ${PKG_OPTIONS:Mdebug}
-CONFIGURE_ARGS+= -f DebugLocks
+CONFIGURE_ARGS+= -f +DebugLocks
.else
-CONFIGURE_ARGS+= -f-DebugLocks
+CONFIGURE_ARGS+= -f -DebugLocks
.endif
Index: pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal
diff -u pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal:1.1 pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal:1.2
--- pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal:1.1 Thu Nov 2 03:15:01 2023
+++ pkgsrc/sysutils/git-annex/patches/patch-git-annex.cabal Sun Feb 2 04:31:03 2025
@@ -1,11 +1,39 @@
-$NetBSD: patch-git-annex.cabal,v 1.1 2023/11/02 03:15:01 pho Exp $
+$NetBSD: patch-git-annex.cabal,v 1.2 2025/02/02 04:31:03 pho Exp $
-No reason to restrict D-Bus support to Linux. It's a cross-platform thing,
-unlike SystemD.
+Hunk #0:
+ Remove -O or -j options. In pkgsrc we handle it via mk/haskell.mk. This
+ is pkgsrc-specific.
---- git-annex.cabal.orig 2023-11-02 01:33:00.571134681 +0000
+Hunk #1:
+ No reason to restrict D-Bus support to Linux. It's a cross-platform
+ thing unlike SystemD.
+
+ TODO: Upstream this hunk.
+
+--- git-annex.cabal.orig 2001-09-09 01:46:40.000000000 +0000
+++ git-annex.cabal
-@@ -460,7 +460,6 @@ Executable git-annex
+@@ -290,20 +290,6 @@ Executable git-annex
+ -- Some things don't work with the non-threaded RTS.
+ GHC-Options: -threaded
+
+- -- Fully optimize for production.
+- if flag(Production)
+- -- Lower memory systems can run out of memory with -O2, so
+- -- optimise slightly less.
+- if arch(arm)
+- GHC-Options: -O2 -optlo-O2
+- else
+- GHC-Options: -O2
+- else
+- GHC-Options: -O0
+-
+- if flag(ParallelBuild)
+- GHC-Options: -j
+-
+ -- Avoid linking with unused dynamic libraries.
+ if os(linux) || os(freebsd)
+ GHC-Options: -optl-Wl,--as-needed
+@@ -487,7 +473,6 @@ Executable git-annex
Other-Modules: Utility.DirWatcher.Kqueue
if flag(Dbus)
Home |
Main Index |
Thread Index |
Old Index