Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Dec 2012 10:22:19 +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: r308321 - in head/security/opensc: . files
Message-ID:  <201212051022.qB5AMJLc028287@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Wed Dec  5 10:22:18 2012
New Revision: 308321
URL: http://svnweb.freebsd.org/changeset/ports/308321

Log:
  Update to 0.13.0 release.
  
  Feature safe:	yes

Added:
  head/security/opensc/files/patch-configure   (contents, props changed)
Modified:
  head/security/opensc/Makefile
  head/security/opensc/distinfo
  head/security/opensc/files/patch-etc_Makefile.in
  head/security/opensc/pkg-plist

Modified: head/security/opensc/Makefile
==============================================================================
--- head/security/opensc/Makefile	Wed Dec  5 09:27:37 2012	(r308320)
+++ head/security/opensc/Makefile	Wed Dec  5 10:22:18 2012	(r308321)
@@ -1,33 +1,33 @@
-# New ports collection makefile for:	opensc
-# Date created:		10 September 2002
-# Whom:			Bruce M Simpson
-#
+# Created by: Bruce M Simpson
 # $FreeBSD$
-#
 
 PORTNAME=	opensc
-PORTVERSION=	0.12.2
+PORTVERSION=	0.13.0
 CATEGORIES=	security devel
-MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/ \
-		http://www.opensc-project.org/files/${PORTNAME}/testing/
+MASTER_SITES=	SF/${PORTNAME}/OpenSC/${DISTNAME}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Libraries and utilities to access smart cards
 
+LICENSE=	LGPL21
+
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-OPTIONS=	PCSC "Enable PC/SC backend support" on \
-		OPENCT "Enable direct OpenCT backend support" off \
-		CTAPI "Enable CT-API backend support" off
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
+OPTIONS_SINGLE=	BACKEND
+OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI
+OPTIONS_DEFINE=	SM DOCS
+OPTIONS_DEFAULT=PCSC
+
+PCSC_DESC=	Use PC/SC backend
+OPENCT_DESC=	Use OpenCT backend
+CTAPI_DESC=	Use CT-API backend
+SM_DESC=	Enable secure messaging support
 
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	\
@@ -40,41 +40,49 @@ CONFIGURE_ARGS=	--with-xsl-stylesheetsdi
 PORTDOCS=	*
 
 MANCOMPRESSED=	no
-MAN1=		cardos-tool.1 cryptoflex-tool.1 eidenv.1 netkey-tool.1 \
+MAN1=		cardos-tool.1 cryptoflex-tool.1 eidenv.1 iasecc-tool.1 \
+		netkey-tool.1 openpgp-tool.1 \
 		opensc-explorer.1 opensc-tool.1 piv-tool.1 \
 		pkcs11-tool.1 pkcs15-crypt.1 pkcs15-init.1 pkcs15-tool.1 \
-		westcos-tool.1
+		sc-hsm-tool.1 westcos-tool.1
 MAN5=		pkcs15-profile.5
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OPENCT)
-LIB_DEPENDS+=	openct.1:${PORTSDIR}/security/openct
+.if ${PORT_OPTIONS:MOPENCT}
+LIB_DEPENDS+=	openct:${PORTSDIR}/security/openct
 CONFIGURE_ARGS+=--enable-openct
 .endif
 
-.if !defined(WITHOUT_PCSC)
-LIB_DEPENDS+=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
+.if ${PORT_OPTIONS:MPCSC}
+LIB_DEPENDS+=	pcsclite:${PORTSDIR}/devel/pcsc-lite
 .else
 CONFIGURE_ARGS+=--disable-pcsc
 .endif
 
-.if defined(WITH_CTAPI)
+.if ${PORT_OPTIONS:MCTAPI}
 CONFIGURE_ARGS+=--enable-ctapi
 .endif
 
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MSM}
+CONFIGURE_ARGS+=--enable-sm
+PLIST_SUB+=	SM=""
+.else
+PLIST_SUB+=	SM="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--enable-doc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/configure
-.ifdef(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's|install-data-am: install-htmlDATA install-man|install-data-am: install-man|' \
-		${WRKSRC}/doc/Makefile.in
+		${WRKSRC}/doc/Makefile.in ${WRKSRC}/doc/tools/Makefile.in
 .endif
 
 post-install:

Modified: head/security/opensc/distinfo
==============================================================================
--- head/security/opensc/distinfo	Wed Dec  5 09:27:37 2012	(r308320)
+++ head/security/opensc/distinfo	Wed Dec  5 10:22:18 2012	(r308321)
@@ -1,2 +1,2 @@
-SHA256 (opensc-0.12.2.tar.gz) = 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675
-SIZE (opensc-0.12.2.tar.gz) = 1738553
+SHA256 (opensc-0.13.0.tar.gz) = abde46ae53b12b3273e40c532ffd4f7d423a51e0919a5234761453c17c089b14
+SIZE (opensc-0.13.0.tar.gz) = 1946899

Added: head/security/opensc/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/opensc/files/patch-configure	Wed Dec  5 10:22:18 2012	(r308321)
@@ -0,0 +1,27 @@
+--- configure.orig	2012-12-05 10:09:59.000000000 +0100
++++ configure	2012-12-05 10:13:45.000000000 +0100
+@@ -12867,13 +12867,13 @@
+ 
+ 
+ if test "${WIN32}" = "no"; then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
++LIBS="$LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -12908,7 +12908,7 @@
+ #define HAVE_LIBDL 1
+ _ACEOF
+ 
+-  LIBS="-ldl $LIBS"
++  LIBS="$LIBS"
+ 
+ else
+   as_fn_error $? "libdl required" "$LINENO" 5

Modified: head/security/opensc/files/patch-etc_Makefile.in
==============================================================================
--- head/security/opensc/files/patch-etc_Makefile.in	Wed Dec  5 09:27:37 2012	(r308320)
+++ head/security/opensc/files/patch-etc_Makefile.in	Wed Dec  5 10:22:18 2012	(r308321)
@@ -1,15 +1,15 @@
---- etc/Makefile.in.orig	2009-12-18 14:26:18.000000000 +0100
-+++ etc/Makefile.in	2009-12-29 17:48:48.000000000 +0100
-@@ -472,11 +472,7 @@
- 		-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
- 		< $< > $@
- install-exec-hook:	install-sysconfDATA opensc.conf
+--- etc/Makefile.in.orig	2012-12-04 15:43:57.000000000 +0100
++++ etc/Makefile.in	2012-12-05 10:07:46.000000000 +0100
+@@ -429,11 +429,7 @@
+ 
+ install-exec-hook: opensc.conf
+ 	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
 -	if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
 -		$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
 -	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"
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.

Modified: head/security/opensc/pkg-plist
==============================================================================
--- head/security/opensc/pkg-plist	Wed Dec  5 09:27:37 2012	(r308320)
+++ head/security/opensc/pkg-plist	Wed Dec  5 10:22:18 2012	(r308321)
@@ -1,7 +1,9 @@
 bin/cardos-tool
 bin/cryptoflex-tool
 bin/eidenv
+bin/iasecc-tool
 bin/netkey-tool
+bin/openpgp-tool
 bin/opensc-explorer
 bin/opensc-tool
 bin/piv-tool
@@ -9,19 +11,21 @@ bin/pkcs11-tool
 bin/pkcs15-crypt
 bin/pkcs15-init
 bin/pkcs15-tool
+bin/sc-hsm-tool
 bin/westcos-tool
 etc/opensc.conf-sample
 lib/libopensc.a
 lib/libopensc.la
 lib/libopensc.so
 lib/libopensc.so.3
-lib/onepin-opensc-pkcs11.la
-lib/onepin-opensc-pkcs11.so
+%%SM%%lib/libsmm-local.a
+%%SM%%lib/libsmm-local.la
+%%SM%%lib/libsmm-local.so
+%%SM%%lib/libsmm-local.so.3
 lib/opensc-pkcs11.la
 lib/opensc-pkcs11.so
 lib/pkcs11-spy.la
 lib/pkcs11-spy.so
-lib/pkcs11/onepin-opensc-pkcs11.so
 lib/pkcs11/opensc-pkcs11.so
 lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/asepcos.profile
@@ -29,6 +33,7 @@ lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/cardos.profile
 %%DATADIR%%/cyberflex.profile
 %%DATADIR%%/entersafe.profile
+%%DATADIR%%/epass2003.profile
 %%DATADIR%%/flex.profile
 %%DATADIR%%/gpk.profile
 %%DATADIR%%/ias_adele_admin1.profile
@@ -44,9 +49,11 @@ lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/muscle.profile
 %%DATADIR%%/myeid.profile
 %%DATADIR%%/oberthur.profile
+%%DATADIR%%/openpgp.profile
 %%DATADIR%%/pkcs15.profile
 %%DATADIR%%/rutoken.profile
 %%DATADIR%%/rutoken_ecp.profile
+%%DATADIR%%/sc-hsm.profile
 %%DATADIR%%/setcos.profile
 %%DATADIR%%/starcos.profile
 %%DATADIR%%/westcos.profile



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