6 files changed, 59 insertions, 60 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index d3aef2cd0033..a6d3d3f59dd2 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -6,24 +6,24 @@
 #
 
 PORTNAME=	opensc
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc.org/files/
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	ISO 7816 Smartcard API
 
-RUN_DEPENDS=	${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkgconfig
-
-INSTALLS_SHLIB= yes
+USE_GNOME=	pkgconfig
+INSTALLS_SHLIB=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL_VER=	15
 GNU_CONFIGURE=	yes
 
 MANCOMPRESSED=	no
 MAN1=	pkcs15-crypt.1 pkcs15-init.1 pkcs15-tool.1 opensc-tool.1 \
-	opensc-explorer.1 opensc-config.1 cryptoflex-tool.1
+	opensc-explorer.1 opensc-config.1 cryptoflex-tool.1 \
+	pkcs11-tool.1 cardos-info.1
 MAN3=	sc_select_file.3 sc_release_context.3 sc_read_record.3 \
 	sc_read_binary.3 sc_pkcs15_compute_signature.3 sc_lock.3 \
 	sc_list_files.3 sc_file_new.3 sc_file_free.3 sc_file.3 \
@@ -36,7 +36,7 @@ MAN7=	pkcs15.7 opensc.7
 #
 # Define boolean switches:
 # WITHOUT_PAM WITHOUT_PCSC_LITE WITHOUT_LDAP
-# WITH_USBTOKEN WITH_DOCBOOK WITH_MOZILLA
+# WITH_DEBUG WITH_DOCBOOK WITH_FIREFOX_PLUGIN WITH_MOZILLA_PLUGIN
 #
 # Default: WITH_PAM, WITH_PCSC_LITE, WITH_LDAP.
 #
@@ -45,6 +45,7 @@ CONFIGURE_ARGS=		--prefix=${PREFIX} --disable-dependency-tracking
 .if !defined(WITHOUT_PAM)
 CONFIGURE_ARGS+=	--with-pam
 .endif
+
 .if !defined(WITHOUT_PCSC_LITE)
 LIB_DEPENDS+=		pcsclite.0:${PORTSDIR}/devel/pcsc-lite
 CONFIGURE_ARGS+=	--with-pcsclite=${LOCALBASE}
@@ -55,20 +56,32 @@ USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--enable-ldap			\
 			--with-ldap-lib=openldap	\
 			--with-ldap-dir=${LOCALBASE}
+PLIST_SUB+=		LDAP=""
 .else
 CONFIGURE_ARGS+=	--disable-ldap
+PLIST_SUB+=		LDAP="@comment "
+.endif
+
+.if defined(WITH_FIREFOX_PLUGIN)
+RUN_DEPENDS?=		firefox:${PORTSDIR}/www/firefox
+PLUGIN_DIR?=		lib/firefox/plugins
+CONFIGURE_ARGS+=	--with-plugin-dir="${PREFIX}/${PLUGIN_DIR}"
+.elif defined(WITH_MOZILLA_PLUGIN)
+RUN_DEPENDS?=		mozilla:${PORTSDIR}/www/mozilla
+PLUGIN_DIR?=		lib/browser_plugins
+CONFIGURE_ARGS+=	--with-plugin-dir="${PREFIX}/${PLUGIN_DIR}"
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if !defined(WITH_DOCBOOK)
 CONFIGURE_ARGS+=	--without-docbook
 .endif
 
-# XXX USB token support doesn't work yet on FreeBSD. Accepting patches.
-.if defined(WITH_USBTOKEN)
-CONFIGURE_ARGS+=	--enable-usbtoken
-.endif
-.if defined(WITH_MOZILLA)
-CONFIGURE_ARGS+=	--with-plugin-dir=${X11BASE}/lib/mozilla/plugins
+.if defined(WITH_OPENCT)
+CONFIGURE_ARGS+=	--with-openct=${LOCALBASE}
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 4a80403a3b8d..18259aca6163 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,2 +1,2 @@
-MD5 (opensc-0.8.1.tar.gz) = 2b64a8e629bd28a00e707e35fd3eb9c7
-SIZE (opensc-0.8.1.tar.gz) = 894529
+MD5 (opensc-0.9.4.tar.gz) = 76c18fc9bd9fad9c45396ea81f317551
+SIZE (opensc-0.9.4.tar.gz) = 1000969
diff --git a/security/opensc/files/patch-src::libopensc::Makefile.in b/security/opensc/files/patch-src::libopensc::Makefile.in
index b21bd45b8d17..638b53d5dd43 100644
--- a/security/opensc/files/patch-src::libopensc::Makefile.in
+++ b/security/opensc/files/patch-src::libopensc::Makefile.in
@@ -1,11 +1,11 @@
---- src/libopensc/Makefile.in.orig	Tue Sep 30 12:05:16 2003
-+++ src/libopensc/Makefile.in	Mon Aug 30 14:57:57 2004
-@@ -163,7 +163,7 @@
+--- src/libopensc/Makefile.in.orig	Fri Jan 14 14:53:56 2005
++++ src/libopensc/Makefile.in	Fri Jan 14 14:54:23 2005
+@@ -234,7 +234,7 @@
  
- noinst_HEADERS = ctbcs.h internal.h
+ noinst_HEADERS = ctbcs.h internal.h esteid.h
  
 -pkgconfigdir = @libdir@/pkgconfig
 +pkgconfigdir = @prefix@/libdata/pkgconfig
  pkgconfig_DATA = libopensc.pc
  subdir = src/libopensc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/security/opensc/files/patch-src::sslengines::engine_opensc.c b/security/opensc/files/patch-src::sslengines::engine_opensc.c
deleted file mode 100644
index 82c5da34dc40..000000000000
--- a/security/opensc/files/patch-src::sslengines::engine_opensc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sslengines/engine_opensc.c.orig	Wed Dec 10 12:20:59 2003
-+++ src/sslengines/engine_opensc.c	Wed Dec 10 12:21:11 2003
-@@ -27,6 +27,7 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#include <sys/types.h>
- #include <stdio.h>
- #include <string.h>
- #include <openssl/crypto.h>
diff --git a/security/opensc/files/patch-src::sslengines::hw_opensc.c b/security/opensc/files/patch-src::sslengines::hw_opensc.c
deleted file mode 100644
index f932e6b7c43f..000000000000
--- a/security/opensc/files/patch-src::sslengines::hw_opensc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sslengines/hw_opensc.c.orig	Wed Dec 10 12:21:02 2003
-+++ src/sslengines/hw_opensc.c	Wed Dec 10 12:21:21 2003
-@@ -62,6 +62,7 @@
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
-+#include <sys/types.h>
- #include <stdio.h>
- #include <string.h>
- #include <openssl/engine.h>
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 7ca614c14707..19c4e1f184cc 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -1,25 +1,27 @@
-share/opensc/scldap.conf.example
-share/opensc/pkcs15.profile
-share/opensc/pkcs15-small.profile
-share/opensc/opensc.conf.example
-share/opensc/miocos.profile
-share/opensc/gpk.profile
-share/opensc/flex_so.profile
-share/opensc/flex_onepin.profile
-share/opensc/flex.profile
-share/opensc/etoken.profile
-@dirrm share/opensc
+%%DATADIR%%/starcos.profile
+%%DATADIR%%/scldap.conf.example
+%%DATADIR%%/pkcs15.profile
+%%DATADIR%%/opensc.conf.example
+%%DATADIR%%/oberthur.profile
+%%DATADIR%%/miocos.profile
+%%DATADIR%%/jcop.profile
+%%DATADIR%%/gpk.profile
+%%DATADIR%%/flex.profile
+%%DATADIR%%/etoken.profile
+%%DATADIR%%/cyberflex.profile
+@dirrm %%DATADIR%%
+libdata/pkgconfig/libopensc.pc
 lib/security/pam_opensc.so
 lib/security/pam_opensc.la
 lib/security/pam_opensc.a
-libdata/pkgconfig/libopensc.pc
+@unexec rmdir %D/lib/security 2>/dev/null || true
 lib/pkcs11/pkcs11-spy.so
 lib/pkcs11/pkcs11-spy.la
 lib/pkcs11/pkcs11-spy.a
 lib/pkcs11/opensc-pkcs11.so
 lib/pkcs11/opensc-pkcs11.la
 lib/pkcs11/opensc-pkcs11.a
-lib/pkcs11/libpkcs11.so.0
+lib/pkcs11/libpkcs11.so.1
 lib/pkcs11/libpkcs11.so
 lib/pkcs11/libpkcs11.la
 lib/pkcs11/libpkcs11.a
@@ -31,28 +33,32 @@ lib/opensc/engine_opensc.so
 lib/opensc/engine_opensc.la
 lib/opensc/engine_opensc.a
 @dirrm lib/opensc
-lib/libscldap.so.0
-lib/libscldap.so
-lib/libscldap.la
-lib/libscldap.a
-lib/libscconf.so.0
+%%LDAP%%lib/libscldap.so.1
+%%LDAP%%lib/libscldap.so
+%%LDAP%%lib/libscldap.la
+%%LDAP%%lib/libscldap.a
+lib/libscconf.so.1
 lib/libscconf.so
 lib/libscconf.la
 lib/libscconf.a
+lib/libscam.so.1
 lib/libscam.so
 lib/libscam.la
 lib/libscam.a
-lib/libpkcs15init.so.0
+lib/libpkcs15init.so.1
 lib/libpkcs15init.so
 lib/libpkcs15init.la
 lib/libpkcs15init.a
-lib/libopensc.so.0
+lib/libopensc.so.1
 lib/libopensc.so
 lib/libopensc.la
 lib/libopensc.a
+include/opensc/ui.h
 include/opensc/types.h
 include/opensc/scldap.h
 include/opensc/scconf.h
+include/opensc/rsaref/win32.h
+include/opensc/rsaref/unix.h
 include/opensc/rsaref/pkcs11t.h
 include/opensc/rsaref/pkcs11f.h
 include/opensc/rsaref/pkcs11.h