5 files changed, 53 insertions, 36 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 00e462f4efca..c638689ac9c3 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	opensc
-DISTVERSION=	0.11.4
-PORTREVISION=	2
+PORTVERSION=	0.11.5
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/ \
 		http://www.opensc-project.org/files/${PORTNAME}/testing/
@@ -23,19 +22,14 @@ USE_AUTOTOOLS=	libltdl:15
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
+CONFIGURE_ENV=	LTLIB_CFLAGS="-I${LOCALBASE}/include" \
+		LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
-DOC_FILES=	README *.sh *.xsl *.css *.html api html tools
-
 PORTDOCS=	*
 
 MANCOMPRESSED=	no
@@ -68,14 +62,13 @@ MAN5=		pkcs15-profile.5
 
 .if !defined(WITHOUT_OPENCT)
 LIB_DEPENDS+=	openct.1:${PORTSDIR}/security/openct
-.else
-CONFIGURE_ARGS+=--disable-openct
+CONFIGURE_ARGS+=--enable-openct
 .endif
 
 .if defined(WITH_PCSC)
 LIB_DEPENDS+=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
-.else
-CONFIGURE_ARGS+=--disable-pcsc-lite
+CONFIGURE_ARGS+=--enable-pcsc \
+		--with-pcsc-provider=${LOCALBASE}/lib/libpcsclite.so
 .endif
 
 .if defined(WITH_SIGNER)
@@ -84,21 +77,34 @@ PINENTRY?=	${LOCALBASE}/bin/pinentry
 PINENTRY_PORT?=	security/pinentry
 RUN_DEPENDS+=	pinentry:${PORTSDIR}/${PINENTRY_PORT}
 USE_XORG=	x11
-CONFIGURE_ARGS+=--with-libassuan-prefix=${LOCALBASE} \
-		--with-plugin-dir=${LOCALBASE}/lib/browser_plugins \
-		--with-pin-entry=${PINENTRY}
+CONFIGURE_ARGS+=--enable-nsplugin \
+		--with-libassuan-prefix=${LOCALBASE} \
+		--with-plugindir=${LOCALBASE}/lib/browser_plugins \
+		--with-pinentry=${PINENTRY}
 PLIST_SUB+=	SIGNER=""
 .else
-CONFIGURE_ARGS+=--disable-nsplugin
 PLIST_SUB+=	SIGNER="@comment "
 .endif
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf ${PREFIX}/etc/opensc.conf-sample
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${CP} -R ${DOC_FILES} ${DOCSDIR})
+CONFIGURE_ARGS+=--enable-doc
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/configure
+.if !defined(WITH_SIGNER)
+	@${REINPLACE_CMD} 's|install-data-am: install-pluginDATA|install-data-am:|' \
+		${WRKSRC}/src/signer/Makefile.in
+.endif
+.ifdef(NOPORTDOCS)
+	@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA|install-data-am:|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} 's|install-data-am: install-dist_docDATA install-dist_htmlDATA|install-data-am:|' \
+		${WRKSRC}/doc/Makefile.in
+.endif
+
+post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index e133bd04693c..101dc6e22fe4 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,3 +1,3 @@
-MD5 (opensc-0.11.4.tar.gz) = 2031aa617be609d50d014d5d370bb8a2
-SHA256 (opensc-0.11.4.tar.gz) = 8534e82dd53208c82a29961455f29d8f3b6350fa2be721e537463d8f6f9d6164
-SIZE (opensc-0.11.4.tar.gz) = 1410650
+MD5 (opensc-0.11.5.tar.gz) = bcb65ead86dc477866e59f9a45bc69a4
+SHA256 (opensc-0.11.5.tar.gz) = ea675faba447ea0e10393b5b40fe510c360d60d9f25b37b2e7b411ac705bebb2
+SIZE (opensc-0.11.5.tar.gz) = 1437684
diff --git a/security/opensc/files/patch-configure b/security/opensc/files/patch-configure
deleted file mode 100644
index d70c83fdedda..000000000000
--- a/security/opensc/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2007-09-10 18:51:01.000000000 +0200
-+++ configure	2007-09-10 18:51:56.000000000 +0200
-@@ -23559,7 +23559,7 @@
- if test "x${ASSUAN_MSG}" != "xyes" -o "x${OPENSSL_MSG}" != "xyes"; then
- 	ENABLE_NSPLUGIN="no"
- fi
--if test "x${ENABLE_NSPLUGIN}" == "xyes"; then
-+if test "x${ENABLE_NSPLUGIN}" = "xyes"; then
- 
- 
- if true; then
diff --git a/security/opensc/files/patch-etc_Makefile.in b/security/opensc/files/patch-etc_Makefile.in
new file mode 100644
index 000000000000..1842f266ea85
--- /dev/null
+++ b/security/opensc/files/patch-etc_Makefile.in
@@ -0,0 +1,15 @@
+--- etc/Makefile.in.orig	2008-08-26 15:53:25.000000000 +0200
++++ etc/Makefile.in	2008-08-26 15:53:42.000000000 +0200
+@@ -423,11 +423,7 @@
+ 		-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
+ 		< $< > $@
+ install-exec-hook:	install-sysconfDATA opensc.conf
+-	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"; \
+ # 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.
+ .NOEXPORT:
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index b37f66016263..85381a0040fc 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -10,6 +10,7 @@ bin/pkcs11-tool
 bin/pkcs15-crypt
 bin/pkcs15-init
 bin/pkcs15-tool
+bin/rutoken-tool
 etc/opensc.conf-sample
 include/opensc/asn1.h
 include/opensc/cardctl.h
@@ -18,6 +19,7 @@ include/opensc/emv.h
 include/opensc/errors.h
 include/opensc/log.h
 include/opensc/opensc.h
+include/opensc/pkcs11-opensc.h
 include/opensc/pkcs11.h
 include/opensc/pkcs15-init.h
 include/opensc/pkcs15.h
@@ -52,6 +54,9 @@ lib/opensc-pkcs11.so
 lib/pkcs11-spy.a
 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
 %%DATADIR%%/cardos.profile
 %%DATADIR%%/cyberflex.profile
@@ -63,7 +68,9 @@ lib/pkcs11-spy.so
 %%DATADIR%%/muscle.profile
 %%DATADIR%%/oberthur.profile
 %%DATADIR%%/pkcs15.profile
+%%DATADIR%%/rutoken.profile
 %%DATADIR%%/setcos.profile
 %%DATADIR%%/starcos.profile
 @dirrm include/opensc
+@dirrm lib/pkcs11
 @dirrm %%DATADIR%%