svn commit: r452966 - in head/security/opensc: . files

[Emanuel Haupt]

Author: ehaupt
Date: Fri Oct 27 07:48:55 2017
New Revision: 452966
URL: https://svnweb.freebsd.org/changeset/ports/452966

Log:
  - convert to options helpers
  - use @sample
  
  PR:		220383
  Submitted by:	xmj
  Approved by:	ale (maintainer)

Modified:
  head/security/opensc/Makefile
  head/security/opensc/files/patch-etc_Makefile.in
  head/security/opensc/pkg-plist

Modified: head/security/opensc/Makefile
==============================================================================
--- head/security/opensc/Makefile	Fri Oct 27 07:32:34 2017	(r452965)
+++ head/security/opensc/Makefile	Fri Oct 27 07:48:55 2017	(r452966)
@@ -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
 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 @@ CONFIGURE_ENV=	\
 
 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}
@@ -42,39 +55,6 @@ CONFIGURE_ARGS+=--with-xsl-stylesheetsdir=${LOCALBASE}
 .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: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>

Modified: head/security/opensc/files/patch-etc_Makefile.in
==============================================================================
--- head/security/opensc/files/patch-etc_Makefile.in	Fri Oct 27 07:32:34 2017	(r452965)
+++ head/security/opensc/files/patch-etc_Makefile.in	Fri Oct 27 07:48:55 2017	(r452966)
@@ -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"

Modified: head/security/opensc/pkg-plist
==============================================================================
--- head/security/opensc/pkg-plist	Fri Oct 27 07:32:34 2017	(r452965)
+++ head/security/opensc/pkg-plist	Fri Oct 27 07:48:55 2017	(r452966)
@@ -33,7 +33,7 @@ etc/bash_completion.d/pkcs15-init
 etc/bash_completion.d/pkcs15-tool
 etc/bash_completion.d/sc-hsm-tool
 etc/bash_completion.d/westcos-tool
-etc/opensc.conf-sample
+ at sample etc/opensc.conf.sample
 lib/libopensc.a
 lib/libopensc.so
 lib/libopensc.so.5