Attachment 174338 Details for Bug 212352 – OPTIONS helpers

[patch] OPTIONS helpers

gnupg1.patch (text/plain), 2.85 KB, created by Adam Weinberger on 2016-09-03 15:38:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2016-09-03 15:38:51 UTC

Size: 2.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 421293)
>+++ Makefile	(working copy)
>@@ -9,7 +9,7 @@
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
>-MAINTAINER=	kuriyama@FreeBSD.org
>+MAINTAINER=	adamw@FreeBSD.org
> COMMENT=	The GNU Privacy Guard
> 
> USES=		charsetfix cpe gmake tar:bzip2
>@@ -24,13 +24,31 @@
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	LDAP LIBICONV LIBUSB SUID_GPG NLS CURL DOCS
>-OPTIONS_DEFAULT=	CURL
>+OPTIONS_DEFAULT=CURL
>+OPTIONS_SUB=	yes
>+
>+CURL_DESC=	use libcurl for the keyserver interface
> LDAP_DESC=	LDAP keyserver interface
> LIBICONV_DESC=	use libiconv
> LIBUSB_DESC=	use libusb
> SUID_GPG_DESC=	install GPG with suid
>-CURL_DESC=	use libcurl for the keyserver interface
> 
>+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
>+CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
>+# Work around a GnuPG configure buglet
>+CURL_CONFIGURE_ENV=	_libcurl_config=${LOCALBASE}/bin/curl-config
>+
>+LIBICONV_USES=	iconv
>+LIBICONV_CONFIGURE_ENABLE=	gnupg-iconv
>+
>+LIBUSB_CONFIGURE_WITH=	libusb=${LOCALBASE}
>+
>+LDAP_USE=	OPENLDAP=yes
>+LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
>+
>+NLS_USES=	gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+
> .include <bsd.port.options.mk>
> 
> .if ${CC} == "clang" || ${OSVERSION} >= 1000024
>@@ -40,45 +58,6 @@
> .endif
> .endif
> 
>-.if ${PORT_OPTIONS:MLIBICONV}
>-USES+=		iconv
>-.else
>-CONFIGURE_ARGS+=	--disable-gnupg-iconv
>-.endif
>-
>-.if ${PORT_OPTIONS:MLIBUSB}
>-CONFIGURE_ARGS+=	--with-libusb=${LOCALBASE}
>-.else
>-CONFIGURE_ARGS+=	--without-libusb
>-.endif
>-
>-.if ${PORT_OPTIONS:MLDAP}
>-USE_OPENLDAP=	yes
>-PLIST_SUB+=	WITH_LDAP=""
>-CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
>-#CONFIGURE_ENV+=	LDFLAGS="-L/usr/lib"
>-.else
>-PLIST_SUB+=	WITH_LDAP="@comment "
>-CONFIGURE_ARGS+=	--disable-ldap
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-PLIST_SUB+=	NLS=""
>-.else
>-CONFIGURE_ARGS+=--disable-nls
>-PLIST_SUB+=	NLS="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MCURL}
>-LIB_DEPENDS+=	libcurl.so: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:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for i in DETAILS FAQ HACKING OpenPGP
>@@ -88,9 +67,9 @@
> 	README THANKS TODO VERSION
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
> .endfor
>-.if ${PORT_OPTIONS:MSUID_GPG}
>+
>+post-install-SUID_GPG-on:
> 	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg
>-.endif
> 
> check:
> 	(cd ${WRKSRC}; ${MAKE} check)
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 421293)
>+++ pkg-plist	(working copy)
>@@ -2,7 +2,7 @@
> bin/gpg-zip
> bin/gpgsplit
> bin/gpgv
>-%%WITH_LDAP%%libexec/gnupg/gpgkeys_ldap
>+%%LDAP%%libexec/gnupg/gpgkeys_ldap
> libexec/gnupg/gpgkeys_curl
> libexec/gnupg/gpgkeys_finger
> libexec/gnupg/gpgkeys_hkp

Actions: View | Diff

Attachments on bug 212352: 174338