5 files changed, 23 insertions, 27 deletions

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index fd51ad1aa2c9..d8fcde5f2822 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	opensc
-PORTVERSION=	0.9.4
-PORTREVSION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc.org/files/
 
@@ -84,11 +83,14 @@ CONFIGURE_ARGS+=	--without-docbook
 
 .if defined(WITH_OPENCT)
 CONFIGURE_ARGS+=	--with-openct=${LOCALBASE}
+RUN_DEPENDS+=		openct-tool:${PORTSDIR}/security/openct
+BUILD_DEPENDS+=		${RUN_DEPENDS}
 .endif
 
 .include <bsd.port.pre.mk>
-
-post-patch:
-	${REINPLACE_CMD} -e "s,ulong,u_long," ${WRKSRC}/src/openscd/openscd.c
+#
+#
+#post-patch:
+#	${REINPLACE_CMD} -e "s,ulong,u_long," ${WRKSRC}/src/openscd/openscd.c
 
 .include <bsd.port.post.mk>
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 18259aca6163..46da3ea63344 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,2 +1,2 @@
-MD5 (opensc-0.9.4.tar.gz) = 76c18fc9bd9fad9c45396ea81f317551
-SIZE (opensc-0.9.4.tar.gz) = 1000969
+MD5 (opensc-0.9.6.tar.gz) = 38fdd64566cc6fc83338d659e816b4fb
+SIZE (opensc-0.9.6.tar.gz) = 1002151
diff --git a/security/opensc/files/patch-configure b/security/opensc/files/patch-configure
deleted file mode 100644
index 18ba94c929aa..000000000000
--- a/security/opensc/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Jan 22 21:37:40 2005
-+++ configure	Sat Jan 22 21:40:21 2005
-@@ -22456,7 +22456,7 @@
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
--		if test "x$GOOD_OPENSSL" == "xyes"
-+		if test "x$GOOD_OPENSSL" = "xyes"
- 		then
- 			# engine has to be there and working
- 			LIBS="$saved_LIBS $LIBCRYPTO $LIBDL"
diff --git a/security/opensc/files/patch-src::libopensc::Makefile.in b/security/opensc/files/patch-src::libopensc::Makefile.in
index 638b53d5dd43..631145e6dea0 100644
--- a/security/opensc/files/patch-src::libopensc::Makefile.in
+++ b/security/opensc/files/patch-src::libopensc::Makefile.in
@@ -1,11 +1,14 @@
---- 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 @@
+
+$FreeBSD$
+
+--- src/libopensc/Makefile.in.orig
++++ src/libopensc/Makefile.in
+@@ -240,7 +240,7 @@
  
- noinst_HEADERS = ctbcs.h internal.h esteid.h
+ noinst_HEADERS = ctbcs.h internal.h esteid.h card-oberthur.h pinpad-ccid.h
  
 -pkgconfigdir = @libdir@/pkgconfig
 +pkgconfigdir = @prefix@/libdata/pkgconfig
- pkgconfig_DATA = libopensc.pc
- subdir = src/libopensc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ pkgconfig_DATA = libopensc.pc libpkcs15init.pc \
+ 	libscam.pc libscconf.pc libscldap.pc
+ 
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 108f28c163d8..0792d7f01581 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -1,7 +1,5 @@
 %%DATADIR%%/starcos.profile
-%%DATADIR%%/scldap.conf.example
 %%DATADIR%%/pkcs15.profile
-%%DATADIR%%/opensc.conf.example
 %%DATADIR%%/oberthur.profile
 %%DATADIR%%/miocos.profile
 %%DATADIR%%/jcop.profile
@@ -11,6 +9,10 @@
 %%DATADIR%%/cyberflex.profile
 @dirrm %%DATADIR%%
 libdata/pkgconfig/libopensc.pc
+libdata/pkgconfig/libpkcs15init.pc
+libdata/pkgconfig/libscam.pc
+libdata/pkgconfig/libscconf.pc
+libdata/pkgconfig/libscldap.pc
 lib/security/pam_opensc.so
 @unexec rmdir %D/lib/security 2>/dev/null || true
 lib/pkcs11/pkcs11-spy.so