Attachment 163460 Details for Bug 204760 – [patch] r2: use --with*-libsecret for configure and use config knobs framework

[patch] [patch] r2: use --with*-libsecret for configure and use config knobs framework

pr-libsecret+opts-2.diff (text/plain), 3.67 KB, created by John Hein on 2015-11-23 20:24:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2015-11-23 20:24:32 UTC

Size: 3.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 402233)
>+++ Makefile	(working copy)
>@@ -17,78 +17,53 @@
> LDFLAGS+=	-L${LOCALBASE}/lib
> INFO=	msmtp
> 
>-OPTIONS_DEFINE=	GSASL NLS IDN GNOMEKEYRING MSMTPQ
>+OPTIONS_DEFINE=	DOCS GSASL NLS IDN LIBSECRET MSMTPQ
> OPTIONS_RADIO=	TLS
> OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
> OPTIONS_DEFAULT=	MSMTPQ OPENSSL
>+OPTIONS_SUB=	yes
> 
> GSASL_DESC=	GSASL support
>+LIBSECRET_DESC=	GNOME password management
> MSMTPQ_DESC=	Install offline messaging scripts
> 
>-.include       <bsd.port.options.mk>
>+GSASL_CONFIGURE_WITH=	libgsasl
>+GSASL_LIB_DEPENDS=	libgsasl.so:${PORTSDIR}/security/gsasl
>+IDN_CONFIGURE_WITH=	libidn
>+IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
>+LIBSECRET_CONFIGURE_WITH=	libsecret
>+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
>+MSMTPQ_PORTDOCS=	README.msmtpq
>+NLS_CONFIGURE_OFF=	--disable-nls
>+NLS_CONFIGURE_ON=	--enable-nls
>+NLS_USES=		gettext
> 
>-.if ${PORT_OPTIONS:MGNUTLS}
>-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
>-CONFIGURE_ARGS+=	--with-ssl=gnutls
>-.elif ${PORT_OPTIONS:MOPENSSL}
>-USE_OPENSSL=	yes
>-CONFIGURE_ARGS+=	--with-ssl=openssl
>-CONFIGURE_ENV+=		libssl_CFLAGS="-I${OPENSSLINC}" \
>+GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
>+OPENSSL_VARS=		USE_OPENSSL=yes
>+OPENSSL_CONFIGURE_ON=	--with-ssl=openssl
>+OPENSSL_CONFIGURE_ENV=	libssl_CFLAGS="-I${OPENSSLINC}" \
> 			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
>-.else
>-CONFIGURE_ARGS+=	--with-ssl=no
>-.endif
>+CERTSFILE=		${LOCALBASE}/share/certs/ca-root-nss.crt
> 
>+.include <bsd.port.options.mk>
>+
> .if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL}
>-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
>-.endif
>-
>-.if ${PORT_OPTIONS:MGSASL}
>-LIB_DEPENDS+=	libgsasl.so:${PORTSDIR}/security/gsasl
>-CONFIGURE_ARGS+=	--with-libgsasl
>+RUN_DEPENDS+=	${CERTSFILE}:${PORTSDIR}/security/ca_root_nss
> .else
>-CONFIGURE_ARGS+=	--without-libgsasl
>+CONFIGURE_ARGS+=	--with-ssl=no
> .endif
> 
>-.if ${PORT_OPTIONS:MIDN}
>-LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
>-CONFIGURE_ARGS+=	--with-libidn
>-.else
>-CONFIGURE_ARGS+=	--without-libidn
>-.endif
>-
>-.if ${PORT_OPTIONS:MGNOMEKEYRING}
>-CONFIGURE_ARGS+=	--with-gnome-keyring
>-LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/gnome-keyring
>-.else
>-CONFIGURE_ARGS+=	--without-gnome-keyring
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-CONFIGURE_ARGS+=	--enable-nls
>-PLIST_SUB+=		NLS=""
>-.else
>-CONFIGURE_ARGS+=	--disable-nls
>-PLIST_SUB+=		NLS="@comment "
>-.endif
>-
>-.include <bsd.port.pre.mk>
>-
> post-extract:
>-	@${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${LOCALBASE}/share/certs/ca\\-root\\-nss.crt|' \
>+	@${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${CERTSFILE}|' \
> 		${WRKSRC}/doc/msmtp.1
> 
> .if ${PORT_OPTIONS:MMSMTPQ}
>-PLIST_SUB+=	MSMTPQ=""
>-
>-post-install:
>+post-stage:
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR}
>-.else
>-PLIST_SUB+=	MSMTPQ="@comment "
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/README.msmtpq ${STAGEDIR}${DOCSDIR}
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 402233)
>+++ pkg-plist	(working copy)
>@@ -2,5 +2,4 @@
> man/man1/msmtp.1.gz
> %%MSMTPQ%%bin/msmtp-queue
> %%MSMTPQ%%bin/msmtpq
>-%%MSMTPQ%%%%DOCSDIR%%/README.msmtpq
> %%NLS%%share/locale/de/LC_MESSAGES/msmtp.mo

Actions: View | Diff

Attachments on bug 204760: 163446 | 163449 | 163460 | 163490