Attachment 187506 Details for Bug 220383 – Johannes' options patch merged with 0.17.0

[patch] Johannes' options patch merged with 0.17.0

opensc-1.7.0-options-merged.patch (text/plain), 2.63 KB, created by Emanuel Haupt on 2017-10-27 06:49:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emanuel Haupt

Created: 2017-10-27 06:49:43 UTC

Size: 2.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 452964)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	opensc
> PORTVERSION=	0.17.0
>+PORTREVISION=	1
> CATEGORIES=	security devel
> MASTER_SITES=	https://github.com/OpenSC/OpenSC/releases/download/0.17.0/
> 
>@@ -15,6 +16,7 @@
> OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI
> OPTIONS_DEFINE=	SM DOCS MANPAGES
> OPTIONS_DEFAULT=PCSC SM MANPAGES
>+OPTIONS_SUB=	yes
> 
> PCSC_DESC=	Use PC/SC backend
> OPENCT_DESC=	Use OpenCT backend
>@@ -32,6 +34,17 @@
> 
> PORTDOCS=	*
> 
>+MANPAGES_CONFIGURE_ARGS_OFF=--disable-man
>+
>+OPENCT_LIB_DEPENDS=	libopenct.so:security/openct
>+OPENCT_CONFIGURE_ARGS=	--enable-openct
>+
>+PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
>+PCSC_CONFIGURE_ARGS_OFF=--disable-pcsc
>+CTAPI_CONFIGURE_ARGS=	--enable-ctapi
>+SM_CONFIGURE_ARGS_OFF=	--disable-sm
>+DOCS_CONFIGURE_ARGS+=	--enable-doc
>+
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
>@@ -44,37 +57,4 @@
> CONFIGURE_ARGS+=--without-xsl-stylesheetsdir
> .endif
> 
>-.if ${PORT_OPTIONS:MMANPAGES}
>-PLIST_SUB+=	MANPAGES=""
>-.else
>-CONFIGURE_ARGS+=--disable-man
>-PLIST_SUB+=	MANPAGES="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPENCT}
>-LIB_DEPENDS+=	libopenct.so:security/openct
>-CONFIGURE_ARGS+=--enable-openct
>-.endif
>-
>-.if ${PORT_OPTIONS:MPCSC}
>-LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
>-.else
>-CONFIGURE_ARGS+=--disable-pcsc
>-.endif
>-
>-.if ${PORT_OPTIONS:MCTAPI}
>-CONFIGURE_ARGS+=--enable-ctapi
>-.endif
>-
>-.if ${PORT_OPTIONS:MSM}
>-PLIST_SUB+=	SM=""
>-.else
>-CONFIGURE_ARGS+=--disable-sm
>-PLIST_SUB+=	SM="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-CONFIGURE_ARGS+=--enable-doc
>-.endif
>-
> .include <bsd.port.mk>
>Index: files/patch-etc_Makefile.in
>===================================================================
>--- files/patch-etc_Makefile.in	(revision 452964)
>+++ files/patch-etc_Makefile.in	(working copy)
>@@ -9,7 +9,7 @@
> -	else \
> -		$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \
> -	fi
>-+	$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf-sample"
>++	$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.sample"
>  
>  uninstall-hook: opensc.conf
>  	rm -f "$(DESTDIR)$(sysconfdir)/opensc.conf.new" "$(DESTDIR)$(sysconfdir)/opensc.conf"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 452964)
>+++ pkg-plist	(working copy)
>@@ -33,7 +33,7 @@
> etc/bash_completion.d/pkcs15-tool
> etc/bash_completion.d/sc-hsm-tool
> etc/bash_completion.d/westcos-tool
>-etc/opensc.conf-sample
>+@sample etc/opensc.conf.sample
> lib/libopensc.a
> lib/libopensc.so
> lib/libopensc.so.5

Actions: View | Diff

Attachments on bug 220383: 183940 | 187506