diff options
| author | roam <roam@FreeBSD.org> | 2006-10-05 21:37:17 +0800 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2006-10-05 21:37:17 +0800 |
| commit | d07b984dd1e90146e200c52671184bfba09fbf89 (patch) | |
| tree | 11daf4dff694e8b65e62b1cdc76bbf017ed74908 | |
| parent | 1f9f5b2bbb2a0fb713420f59c054772ea8156e01 (diff) | |
| download | freebsd-ports-gnome-d07b984dd1e90146e200c52671184bfba09fbf89.tar.gz freebsd-ports-gnome-d07b984dd1e90146e200c52671184bfba09fbf89.tar.zst freebsd-ports-gnome-d07b984dd1e90146e200c52671184bfba09fbf89.zip | |
Fix GnuPG's hidden dependency on cURL - add cURL support to OPTIONS and
either explicitly depend on it, or disable it in the configure options.
PR: 103427
Silence from: kuriyama (maintainer)
| -rw-r--r-- | security/gnupg/Makefile | 13 | ||||
| -rw-r--r-- | security/gnupg1/Makefile | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index b636bca9684d..92377e4eb934 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -34,7 +35,8 @@ OPTIONS= LDAP "LDAP keyserver interface" off \ LIBICONV "use libiconv" off \ LIBUSB "use libusb" off \ SUID_GPG "install GPG with suid" off \ - NLS "Native Language Support" on + NLS "Native Language Support" on \ + CURL "use libcurl for the keyserver interface" on .include <bsd.port.pre.mk> @@ -69,6 +71,15 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif +.if !defined(WITHOUT_CURL) +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} +# Work around a GnuPG configure buglet +CONFIGURE_ENV+= _libcurl_config=${LOCALBASE}/bin/curl-config +.else +CONFIGURE_ARGS+=--without-libcurl +.endif + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index b636bca9684d..92377e4eb934 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -34,7 +35,8 @@ OPTIONS= LDAP "LDAP keyserver interface" off \ LIBICONV "use libiconv" off \ LIBUSB "use libusb" off \ SUID_GPG "install GPG with suid" off \ - NLS "Native Language Support" on + NLS "Native Language Support" on \ + CURL "use libcurl for the keyserver interface" on .include <bsd.port.pre.mk> @@ -69,6 +71,15 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif +.if !defined(WITHOUT_CURL) +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} +# Work around a GnuPG configure buglet +CONFIGURE_ENV+= _libcurl_config=${LOCALBASE}/bin/curl-config +.else +CONFIGURE_ARGS+=--without-libcurl +.endif + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} |