diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index a285ea20c890..fbc1c3565982 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,86 +1,88 @@ PORTNAME= gnupg DISTVERSION= 2.4.6 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= GNUPG MAINTAINER= adridg@FreeBSD.org COMMENT= Complete and free PGP implementation WWW= https://www.gnupg.org/ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3 LIB_DEPENDS= libassuan.so:security/libassuan \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libksba.so:security/libksba \ libnpth.so:devel/npth RUN_DEPENDS= pinentry:security/pinentry -USES= autoreconf compiler:c11 cpe gettext-tools gmake iconv makeinfo pkgconfig \ - readline sqlite tar:bzip2 +USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite \ + tar:bzip2 CPE_VENDOR= gnupg GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ntbtls \ --enable-gpg-is-gpg2 TEST_ARGS= TESTARGS=--parallel TEST_TARGET= check CONFLICTS= dirmngr INFO= gnupg OPTIONS_DEFINE= DOCS GNUTLS LARGE_RSA LDAP NLS SCDAEMON SUID_GPG \ WKS_SERVER OPTIONS_DEFAULT= GNUTLS SCDAEMON WKS_SERVER OPTIONS_SUB= yes LARGE_RSA_DESC= Enable support for 8192-bit RSA keys LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) SUID_GPG_DESC= Install GPG as SUID root WKS_SERVER_DESC= Install the Web Key Service server GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls LARGE_RSA_CONFIGURE_ENABLE= large-secmem LDAP_USES= ldap LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} LDAP_LIBS= -L${LOCALBASE}/lib NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls SCDAEMON_CONFIGURE_ENABLE= scdaemon WKS_SERVER_CONFIGURE_ENABLE= wks-tools .include .if ${PORT_OPTIONS:MGNUTLS} && ${PORT_OPTIONS:MLDAP} PLIST_SUB+= DIRMNGRLDAP="" .else PLIST_SUB+= DIRMNGRLDAP="@comment " .endif # Touch the texinfo files to force makeinfo to run. This fixes Linuxisms in # the paths in the man pages. pre-build: ${TOUCH} ${WRKSRC}/doc/*.texi post-install: + ${RMDIR} ${STAGEDIR}${PREFIX}/share/man/manh ${MV} ${STAGEDIR}${PREFIX}/bin/gpgsplit ${STAGEDIR}${PREFIX}/bin/gpgsplit2 ${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR} # Necessary because of --enable-gpg-is-gpg2 pre-test: ${LN} -s gpg ${WRKSRC}/bin/gpg2 .include diff --git a/security/gnupg/files/patch-m4_gpg-error.m4 b/security/gnupg/files/patch-configure similarity index 73% rename from security/gnupg/files/patch-m4_gpg-error.m4 rename to security/gnupg/files/patch-configure index 251a053014e3..20e250e38430 100644 --- a/security/gnupg/files/patch-m4_gpg-error.m4 +++ b/security/gnupg/files/patch-configure @@ -1,11 +1,13 @@ ---- m4/gpg-error.m4.orig 2024-05-15 10:33:38 UTC -+++ m4/gpg-error.m4 -@@ -67,7 +67,7 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl +Fix path of pkgconfig files passed to gpgrt-config. + +--- configure.orig 2024-01-25 10:09:44 UTC ++++ configure +@@ -8428,7 +8428,7 @@ fi # Get the prefix of gpgrt-config assuming it's something like: # /bin/gpgrt-config gpgrt_prefix=${GPGRT_CONFIG%/*/*} - possible_libdir1=${gpgrt_prefix}/lib + possible_libdir1=${gpgrt_prefix}/libdata # Determine by using system libdir-format with CC, it's like: # Normal style: /usr/lib # GNU cross style: /usr//lib diff --git a/security/gnupg/files/patch-doc_Makefile.am b/security/gnupg/files/patch-doc_Makefile.in similarity index 59% rename from security/gnupg/files/patch-doc_Makefile.am rename to security/gnupg/files/patch-doc_Makefile.in index c0fda8df0e82..9149a0b4ab89 100644 --- a/security/gnupg/files/patch-doc_Makefile.am +++ b/security/gnupg/files/patch-doc_Makefile.in @@ -1,35 +1,28 @@ ---- doc/Makefile.am.orig 2024-09-20 10:07:25 UTC -+++ doc/Makefile.am -@@ -79,13 +79,13 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-ag - myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \ +--- doc/Makefile.in.orig 2024-10-29 12:52:23 UTC ++++ doc/Makefile.in +@@ -521,14 +521,14 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-ag dirmngr.texi scdaemon.texi tools.texi wks.texi \ gpg-card.texi --myman_pages = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ -+myman_pages = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ + +-myman_pages = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ ++myman_pages = gpg2.1 gpgv2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \ watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ gpg-connect-agent.1 gpgparsemail.1 gpgtar.1 gpg-mail-tube.1 \ applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \ dirmngr-client.1 gpg-card.1 gpg-check-pattern.1 + myhtmlman_pages = \ - gpg.1.html gpgv.1.html gpgsm.1.html \ -+ gpgsm.1.html \ ++ gpg2.1.html gpgv2.1.html gpgsm.1.html \ gpg-agent.1.html dirmngr.8.html scdaemon.1.html \ watchgnupg.1.html gpgconf.1.html addgnupghome.8.html \ gpg-preset-passphrase.1.html \ -@@ -95,7 +95,15 @@ myhtmlman_pages = \ +@@ -538,7 +538,7 @@ myhtmlman_pages = \ gpg-wks-server.1.html \ dirmngr-client.1.html gpg-card.1.html gpg-check-pattern.1.html -man_MANS = $(myman_pages) gnupg.7 gnupg.7.html -+if USE_GPG2_HACK -+myman_pages += gpg2.1 gpgv2.1 -+myhtmlman_pages += gpg2.1.html gpgv2.1.html -+else -+myman_pages += gpg.1 gpgv.1 -+myhtmlman_pages += gpg.1.html gpgv.1.html -+endif -+ +man_MANS = $(myman_pages) gnupg.7 - watchgnupg_SOURCE = gnupg.texi - + CLEANFILES = yat2m mkdefsinc defs.inc + DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \