diff options
Diffstat (limited to 'security/gpgme')
| -rw-r--r-- | security/gpgme/Makefile | 105 | ||||
| -rw-r--r-- | security/gpgme/distinfo | 6 | ||||
| -rw-r--r-- | security/gpgme/files/patch-configure | 23 | ||||
| -rw-r--r-- | security/gpgme/files/patch-lang_python_Makefile.in | 29 | ||||
| -rw-r--r-- | security/gpgme/pkg-plist | 4 |
5 files changed, 12 insertions, 155 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index ad66bed32308..92bba8a67faa 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,6 +1,5 @@ PORTNAME= gpgme -PORTVERSION= 1.24.2 -PORTREVISION?= 0 +PORTVERSION= 2.0.0 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme @@ -16,17 +15,14 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ USES= compiler:c11 cpe gmake libtool localbase:ldflags pathfix tar:bzip2 USE_LDCONFIG= yes +CPE_VENDOR= gnu GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--enable-languages="cl" CFLAGS+= -Wno-suggest-override -Wno-unknown-warning-option INSTALL_TARGET= install-strip TEST_TARGET= check -CPE_VENDOR= gnu - -.if !defined(_GPGME_BINDING) -CONFIGURE_ARGS+=--enable-languages="cl" - INFO= gpgme PORTDOCS= AUTHORS INSTALL NEWS README @@ -49,93 +45,11 @@ TEST_PREVENTS_MSG= TEST option is mainly designed for use with the GNUPG2 option UISERVER_DESC= GnuPG UI server support UISERVER_CONFIGURE_ENABLE= fd-passing -.else -LIB_DEPENDS+= libgpgme.so:security/gpgme -BUILD_WRKSRC= ${WRKSRC}/lang/${_GPGME_BINDING} -INSTALL_WRKSRC= ${WRKSRC}/lang/${_GPGME_BINDING} -TEST_WRKSRC= ${WRKSRC}/lang/${_GPGME_BINDING}/tests - -. if ${_GPGME_BINDING} == "cpp" -USES+= compiler:c++11-lang -CONFIGURE_ARGS+=--enable-languages="cpp" -NO_TEST= yes -. else -OPTIONS_DEFINE+= TEST -. endif - -. if ${_GPGME_BINDING} == "qt" -LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp - -FLAVORS= qt5 qt6 -FLAVOR?= ${FLAVORS:[1]} -qt5_PKGNAMESUFFIX= -qt5 -qt6_PKGNAMESUFFIX= -qt6 - -. if ${FLAVOR:U} == "qt5" -USES+= compiler:c++11-lang pkgconfig qt:5 -USE_QT= core \ - buildtools:build -TEST_USE= QT=testlib:build -PLIST_SUB= QGPGME_CMAKE_SUFFIX="" \ - QGPGME_INCLUDE_SUFFIX="${FLAVOR}" \ - QGPGME_LIB_SUFFIX="" -. else -USES+= compiler:c++17-lang pkgconfig qt:6 -USE_CXXSTD= c++17 -USE_QT= base -PLIST_SUB= QGPGME_CMAKE_SUFFIX="Qt${FLAVOR:S|qt||}" \ - QGPGME_INCLUDE_SUFFIX="${FLAVOR}" \ - QGPGME_LIB_SUFFIX="${FLAVOR}" -. endif - -CONFIGURE_ARGS+=--enable-languages="cpp ${FLAVOR}" -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} - -OPTIONS_DEFINE+= DOXYGEN -DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - dot:graphics/graphviz -. endif - -. if ${_GPGME_BINDING} == "python" -BUILD_DEPENDS+= swig:devel/swig \ - ${PY_SETUPTOOLS} -USES+= python:3.9+ -USE_PYTHON= flavors -CONFIGURE_ARGS+=--enable-languages="python" -CONFIGURE_ENV+= BSD_PYTHON="${PYTHON_CMD}" \ - BSD_PYTHON_VERSION="${PYTHON_VER}" \ - SWIG="${LOCALBASE}/bin/swig" -PLIST_SUB+= VERSION=${PORTVERSION} -. endif -.endif - -.include <bsd.port.pre.mk> post-patch: -.if ${COMPILER_TYPE} == "clang" - @${REINPLACE_CMD} -e 's|mno-direct-extern-access|fno-direct-access-external-data|g' \ - ${WRKSRC}/configure -.endif -.if defined(_GPGME_BINDING) - @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ - ${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g' -. if ${_GPGME_BINDING} == "qt" - @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ - ${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g' -. endif -.endif @${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \ ${WRKSRC}/lang/cl/Makefile.in -post-patch-DOXYGEN-off: - @${REINPLACE_CMD} -e '/SUBDIRS/s|doc||' \ - ${WRKSRC}/lang/qt/Makefile.in - -post-patch-TEST-off: - @${REINPLACE_CMD} -e '/SUBDIRS/s|tests||' \ - ${WRKSRC}/lang/python/Makefile.in \ - ${WRKSRC}/lang/qt/Makefile.in - # The gnupg programs will create sockets for the tests in a temporary directory # under /var/run/user/${UID} if it exists. Otherwise, they will try to create # them in the test build directories. To prevent errors in cases where the test @@ -165,17 +79,8 @@ pre-test: pre-build-TEST-on post-test: post-build-TEST-on -.if !defined(_GPGME_BINDING) post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif - -post-install-DOXYGEN-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/html - cd ${WRKSRC}/lang/qt/doc/generated/html && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html - @${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \ - ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 3f69026dd7d7..c0c75d7c36e4 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739544658 -SHA256 (gpgme-1.24.2.tar.bz2) = e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581 -SIZE (gpgme-1.24.2.tar.bz2) = 1891804 +TIMESTAMP = 1750274492 +SHA256 (gpgme-2.0.0.tar.bz2) = ddf161d3c41ff6a3fcbaf4be6c6e305ca4ef1cc3f1ecdfce0c8c2a167c0cc36d +SIZE (gpgme-2.0.0.tar.bz2) = 1383911 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 - diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist index 9034fa4ef44d..b79e4310fc92 100644 --- a/security/gpgme/pkg-plist +++ b/security/gpgme/pkg-plist @@ -7,8 +7,8 @@ lib/common-lisp/gpgme/gpgme-package.lisp lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp lib/libgpgme.so -lib/libgpgme.so.11 -lib/libgpgme.so.11.33.2 +lib/libgpgme.so.45 +lib/libgpgme.so.45.0.0 libdata/pkgconfig/gpgme-glib.pc libdata/pkgconfig/gpgme.pc share/aclocal/gpgme.m4 |