Attachment 150533 Details for Bug 195935 – v2

[patch] v2

manpages.diff (text/plain), 3.08 KB, created by Jan Beich on 2014-12-13 06:14:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-12-13 06:14:38 UTC

Size: 3.08 KB

patch

obsolete

>Index: security/opensc/Makefile
>===================================================================
>--- security/opensc/Makefile	(revision 374600)
>+++ security/opensc/Makefile	(working copy)
>@@ -11,13 +11,10 @@ COMMENT=	Libraries and utilities to access smart c
> 
> LICENSE=	LGPL21
> 
>-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
>-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
>-
> OPTIONS_SINGLE=	BACKEND
> OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI
>-OPTIONS_DEFINE=	SM DOCS
>-OPTIONS_DEFAULT=PCSC SM
>+OPTIONS_DEFINE=	SM DOCS MANPAGES
>+OPTIONS_DEFAULT=PCSC SM MANPAGES
> 
> PCSC_DESC=	Use PC/SC backend
> OPENCT_DESC=	Use OpenCT backend
>@@ -32,15 +29,29 @@ INSTALL_TARGET=	install-strip
> 
> CONFIGURE_ENV=	\
> 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
>-		XSLTPROC="${LOCALBASE}/bin/xsltproc"
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
> 
>-CONFIGURE_ARGS=	--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
>-
> PORTDOCS=	*
> 
> .include <bsd.port.options.mk>
> 
>+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
>+BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
>+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
>+CONFIGURE_ENV+=	XSLTPROC="${LOCALBASE}/bin/xsltproc"
>+CONFIGURE_ARGS+=--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
>+.else
>+CONFIGURE_ENV+=	XSLTPROC="${FALSE}"
>+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:${PORTSDIR}/security/openct
> CONFIGURE_ARGS+=--enable-openct
>Index: security/opensc/pkg-plist
>===================================================================
>--- security/opensc/pkg-plist	(revision 374600)
>+++ security/opensc/pkg-plist	(working copy)
>@@ -58,21 +58,21 @@ lib/pkcs11/pkcs11-spy.so
> %%DATADIR%%/setcos.profile
> %%DATADIR%%/starcos.profile
> %%DATADIR%%/westcos.profile
>-man/man1/cardos-tool.1.gz
>-man/man1/cryptoflex-tool.1.gz
>-man/man1/eidenv.1.gz
>-man/man1/iasecc-tool.1.gz
>-man/man1/netkey-tool.1.gz
>-man/man1/openpgp-tool.1.gz
>-man/man1/opensc-explorer.1.gz
>-man/man1/opensc-tool.1.gz
>-man/man1/piv-tool.1.gz
>-man/man1/pkcs11-tool.1.gz
>-man/man1/pkcs15-crypt.1.gz
>-man/man1/pkcs15-init.1.gz
>-man/man1/pkcs15-tool.1.gz
>-man/man1/sc-hsm-tool.1.gz
>-man/man1/westcos-tool.1.gz
>-man/man5/pkcs15-profile.5.gz
>+%%MANPAGES%%man/man1/cardos-tool.1.gz
>+%%MANPAGES%%man/man1/cryptoflex-tool.1.gz
>+%%MANPAGES%%man/man1/eidenv.1.gz
>+%%MANPAGES%%man/man1/iasecc-tool.1.gz
>+%%MANPAGES%%man/man1/netkey-tool.1.gz
>+%%MANPAGES%%man/man1/openpgp-tool.1.gz
>+%%MANPAGES%%man/man1/opensc-explorer.1.gz
>+%%MANPAGES%%man/man1/opensc-tool.1.gz
>+%%MANPAGES%%man/man1/piv-tool.1.gz
>+%%MANPAGES%%man/man1/pkcs11-tool.1.gz
>+%%MANPAGES%%man/man1/pkcs15-crypt.1.gz
>+%%MANPAGES%%man/man1/pkcs15-init.1.gz
>+%%MANPAGES%%man/man1/pkcs15-tool.1.gz
>+%%MANPAGES%%man/man1/sc-hsm-tool.1.gz
>+%%MANPAGES%%man/man1/westcos-tool.1.gz
>+%%MANPAGES%%man/man5/pkcs15-profile.5.gz
> @dirrm lib/pkcs11
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 195935: 150531 | 150532 | 150533 | 150534 | 150535