Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Feb 2015 08:45:59 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r379416 - head/security/opensc
Message-ID:  <201502200845.t1K8jxfL033154@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Fri Feb 20 08:45:59 2015
New Revision: 379416
URL: https://svnweb.freebsd.org/changeset/ports/379416
QAT: https://qat.redports.org/buildarchive/r379416/

Log:
  Remove xstproc dependency if DOCS & MANPAGES are not selected.
  
  PR:		195935
  Submitted by:	jbeich

Modified:
  head/security/opensc/Makefile
  head/security/opensc/pkg-plist

Modified: head/security/opensc/Makefile
==============================================================================
--- head/security/opensc/Makefile	Fri Feb 20 08:26:20 2015	(r379415)
+++ head/security/opensc/Makefile	Fri Feb 20 08:45:59 2015	(r379416)
@@ -11,13 +11,10 @@ COMMENT=	Libraries and utilities to acce
 
 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"
-
-CONFIGURE_ARGS=	--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
 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

Modified: head/security/opensc/pkg-plist
==============================================================================
--- head/security/opensc/pkg-plist	Fri Feb 20 08:26:20 2015	(r379415)
+++ head/security/opensc/pkg-plist	Fri Feb 20 08:45:59 2015	(r379416)
@@ -58,21 +58,19 @@ 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
-@dirrm lib/pkcs11
-@dirrm %%DATADIR%%
+%%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502200845.t1K8jxfL033154>