summaryrefslogtreecommitdiff
path: root/security/gpgme/files
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2025-06-24 07:02:06 -0400
committerJason E. Hale <jhale@FreeBSD.org>2025-06-24 09:09:24 -0400
commit217815b0af27079f6b74cc7e5ca3ea05e53b0b15 (patch)
tree753fc27a434c5343428694e3923ed3420fed5d8c /security/gpgme/files
parentsecurity/rubygem-gpgme: Adapt for GpgME 2.0.0 (diff)
security/gpgme: Update to 2.0.0
Upstream has split most of the bindings out into separate projects with this release, so the child ports that were previously providing various bindings are now autonomous and have new origins. The python bindings should have been called py-gpg for many years now, since 'gpg' is the actual module name, so this also corrects that issue. security/gpgme-cpp -> security/gpgmepp security/gpgme-qt -> security/qgpgme security/py-gpgme -> security/py-gpg gpgmepp and qgpgme have been converted to CMake. py-gpg is now a "fun" autotools and FreeBSD ports system hybrid. Gpgme, itself, still uses autotools, but with much less parenting (patching) to do for its emancipated children. Adjust several ports to fix API incompatibility with upstream patches and with some of my own. Adjust all consumers to use the new port origins of the former child ports. https://dev.gnupg.org/T7673
Diffstat (limited to 'security/gpgme/files')
-rw-r--r--security/gpgme/files/patch-configure23
-rw-r--r--security/gpgme/files/patch-lang_python_Makefile.in29
2 files changed, 2 insertions, 50 deletions
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
index 9884bbddbdc4..02ee21a01cff 100644
--- a/security/gpgme/files/patch-configure
+++ b/security/gpgme/files/patch-configure
@@ -1,27 +1,8 @@
-Hunk 1:
-The configure script automatically detects all versions of Python and builds
-the bindings for each found version. This is a problem when building outside
-of a clean environment since the ports system can only build a package for one
-Python flavor at a time. The found versions of Python are overridden by
-environment variables set in the port Makefile.
-
-Hunk 2:
Fix path of pkgconfig files passed to gpgrt-config.
---- configure.orig 2023-11-28 15:45:04 UTC
+--- configure.orig 2025-06-03 11:26:27 UTC
+++ configure
-@@ -31428,6 +31428,10 @@ printf "%s\n" "$as_me: WARNING:
-
- fi
-
-+ # Override the automatically found Pythons with the selected version from ports.
-+ PYTHONS=$BSD_PYTHON
-+ PYTHON_VERSIONS=$BSD_PYTHON_VERSION
-+
- # Recover some values lost in the second attempt to find Python.
- PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)"
- PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)"
-@@ -32691,7 +32695,7 @@ fi
+@@ -16828,7 +16828,7 @@ fi
# Get the prefix of gpgrt-config assuming it's something like:
# <PREFIX>/bin/gpgrt-config
gpgrt_prefix=${GPGRT_CONFIG%/*/*}
diff --git a/security/gpgme/files/patch-lang_python_Makefile.in b/security/gpgme/files/patch-lang_python_Makefile.in
deleted file mode 100644
index e78760200c2a..000000000000
--- a/security/gpgme/files/patch-lang_python_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-First hunk:
-The swig executable from devel/swig30 is named 'swig3.0' and the build system
-only looks for an executable named 'swig':
-unable to execute 'swig': No such file or directory
-
-Second hunk:
-Fix staging and build the *.pyc and *.pyo files
-
---- lang/python/Makefile.in.orig 2023-08-21 07:46:32 UTC
-+++ lang/python/Makefile.in
-@@ -768,7 +768,7 @@ all-local: copystamp
- CFLAGS="$(CFLAGS)" \
- srcdir="$(srcdir)" \
- top_builddir="$(top_builddir)" \
-- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \
-+ $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" build_ext --swig=$(SWIG) ; \
- done
-
- python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp
-@@ -811,7 +811,8 @@ install-exec-local:
- build \
- --build-base="$$(basename "$${PYTHON}")-gpg" \
- install \
-- --prefix "$(DESTDIR)$(prefix)" \
-+ -c -O1 --prefix=$(prefix) \
-+ --root=$(DESTDIR) \
- --verbose ; \
- done
-