- Update to 0.6.6

PR:		ports/87259
Submitted by:	maintainer

5 files changed, 52 insertions, 36 deletions

diff --git a/security/openct/Makefile b/security/openct/Makefile
index 028d501a4bc7..a16f382b72c5 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -6,32 +6,34 @@
 #
 
 PORTNAME=	openct
-PORTVERSION=	0.6.5
+PORTVERSION=	0.6.6
 CATEGORIES=	security
-MASTER_SITES=	http://www.opensc.org/files/
+MASTER_SITES=	http://www.opensc.org/files/ \
+		http://www.opensc.org/files/old/
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	A middleware framework for smart card terminals
 
 USE_LIBTOOL_VER=	15
+USE_LIBLTDL=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ARGS=	--prefix=${PREFIX}
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
 MAN1=		openct-tool.1
 
 DOC_FILES=	README export-wiki.sh export-wiki.xsl ${HTML_FILES}
 
-HTML_FILES=	AuthorsAndCredits.html FilesTools.html LicenseText.html \
-	OperatingSystems.html QuickStart.html RecentResults.html \
-	RemoteAccess.html SecureSetup.html SupportedReaders.html \
-	TroubleShooting.html cardman.html ccid.html egate.html \
-	etoken.html eutron.html gempc.html ikey2032.html \
-	ikey3000.html index.html kaan.html smartboard.html \
-	towitoko.html trac.css
+HTML_FILES=	AuthorsAndCredits.html DevelopmentPolicy.html FilesTools.html \
+	 	LicenseText.html MailingLists.html OperatingSystems.html \
+ 		OverView.html QuickStart.html RemoteAccess.html \
+	 	ResourcesLinks.html SecureSetup.html \
+ 	 	TroubleShooting.html cardman.html ccid.html egate.html \
+ 	 	etoken.html eutron.html gempc.html ikey2032.html \
+	 	ikey3000.html index.html kaan.html pertosmart1030.html smartboard.html \
+ 	 	towitoko.html trac.css
 
 .if !defined(WITHOUT_PCSC_LITE)
 LIB_DEPENDS+=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
diff --git a/security/openct/distinfo b/security/openct/distinfo
index f604e8ceadec..a4f9a89f10d9 100644
--- a/security/openct/distinfo
+++ b/security/openct/distinfo
@@ -1,2 +1,2 @@
-MD5 (openct-0.6.5.tar.gz) = 86bafd61788139f28671872da287fa0a
-SIZE (openct-0.6.5.tar.gz) = 486355
+MD5 (openct-0.6.6.tar.gz) = a9de3bef8e5e2827b8d72a2a50d0bc66
+SIZE (openct-0.6.6.tar.gz) = 563890
diff --git a/security/openct/files/patch-etc_openct.conf.in b/security/openct/files/patch-etc_openct.conf.in
new file mode 100644
index 000000000000..414c876363cc
--- /dev/null
+++ b/security/openct/files/patch-etc_openct.conf.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- etc/openct.conf.in.orig
++++ etc/openct.conf.in
+@@ -2,7 +2,7 @@
+ debug	= 0;
+ #
+ # Enable hot plugging
+-hotplug	= yes;
++hotplug	= no;
+ #
+ # Path to ifdhandler
+ ifdhandler = SBINDIR/ifdhandler;
diff --git a/security/openct/files/patch-src_ct_Makefile.in b/security/openct/files/patch-src_ct_Makefile.in
index ff0c47a37237..ecd143726c19 100644
--- a/security/openct/files/patch-src_ct_Makefile.in
+++ b/security/openct/files/patch-src_ct_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/ct/Makefile.in.orig	Tue Jul 20 23:56:08 2004
-+++ src/ct/Makefile.in	Wed Sep  8 18:38:25 2004
-@@ -169,7 +169,7 @@
+--- src/ct/Makefile.in.orig
++++ src/ct/Makefile.in
+@@ -215,7 +215,7 @@
+ 	socket.c status.c tlv.c
  
  libopenct_la_LDFLAGS = -version-info @OPENCT_LT_CURRENT@:@OPENCT_LT_REVISION@:@OPENCT_LT_AGE@
- 
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = @prefix@/libdata/pkgconfig
  pkgconfig_DATA = libopenct.pc
- subdir = src/ct
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ all: all-am
+ 
diff --git a/security/openct/pkg-plist b/security/openct/pkg-plist
index ab0e6d84097e..25932a45d17f 100644
--- a/security/openct/pkg-plist
+++ b/security/openct/pkg-plist
@@ -1,11 +1,9 @@
 bin/openct-tool
-sbin/ifdhandler
-sbin/ifdproxy
-sbin/openct-control
+etc/rc.d/openct.sh
+etc/openct.conf-sample
 include/openct/apdu.h
 include/openct/buffer.h
 include/openct/conf.h
-include/openct/ctapi.h
 include/openct/device.h
 include/openct/driver.h
 include/openct/error.h
@@ -17,21 +15,20 @@ include/openct/server.h
 include/openct/socket.h
 include/openct/tlv.h
 include/openct/types.h
-lib/openct-ifd.so
-lib/openct-ifd.bundle/Contents/Info.plist
-lib/openct-ifd.bundle/Contents/PkgInfo
-lib/openct-ifd.bundle/Contents/FreeBSD/openct-ifd.so
-lib/libopenct.a
-lib/libopenct.so
+include/openct/ctapi.h
 lib/libopenct.so.1
-lib/libopenctapi.a
+lib/libopenct.so
+lib/libopenct.a
 lib/libopenctapi.so
-lib/libifd.a
-lib/libifd.so
-lib/libifd.so.1
+lib/libopenctapi.a
+lib/openct-ifd.so
+lib/openct-ifd.bundle/Contents/FreeBSD/openct-ifd.so
+lib/openct-ifd.bundle/Contents/PkgInfo
+lib/openct-ifd.bundle/Contents/Info.plist
 libdata/pkgconfig/libopenct.pc
-etc/openct.conf-sample
-etc/rc.d/openct.sh
+sbin/ifdhandler
+sbin/ifdproxy
+sbin/openct-control
 @dirrm include/openct/
 @dirrm lib/openct-ifd.bundle/Contents/FreeBSD/
 @dirrm lib/openct-ifd.bundle/Contents/
@@ -40,14 +37,16 @@ etc/rc.d/openct.sh
 %%PORTDOCS%%%%DOCSDIR%%/export-wiki.sh
 %%PORTDOCS%%%%DOCSDIR%%/export-wiki.xsl
 %%PORTDOCS%%%%DOCSDIR%%/AuthorsAndCredits.html
+%%PORTDOCS%%%%DOCSDIR%%/DevelopmentPolicy.html
 %%PORTDOCS%%%%DOCSDIR%%/FilesTools.html
 %%PORTDOCS%%%%DOCSDIR%%/LicenseText.html
+%%PORTDOCS%%%%DOCSDIR%%/MailingLists.html
 %%PORTDOCS%%%%DOCSDIR%%/OperatingSystems.html
+%%PORTDOCS%%%%DOCSDIR%%/OverView.html
 %%PORTDOCS%%%%DOCSDIR%%/QuickStart.html
-%%PORTDOCS%%%%DOCSDIR%%/RecentResults.html
 %%PORTDOCS%%%%DOCSDIR%%/RemoteAccess.html
+%%PORTDOCS%%%%DOCSDIR%%/ResourcesLinks.html
 %%PORTDOCS%%%%DOCSDIR%%/SecureSetup.html
-%%PORTDOCS%%%%DOCSDIR%%/SupportedReaders.html
 %%PORTDOCS%%%%DOCSDIR%%/TroubleShooting.html
 %%PORTDOCS%%%%DOCSDIR%%/cardman.html
 %%PORTDOCS%%%%DOCSDIR%%/ccid.html
@@ -59,6 +58,7 @@ etc/rc.d/openct.sh
 %%PORTDOCS%%%%DOCSDIR%%/ikey3000.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/kaan.html
+%%PORTDOCS%%%%DOCSDIR%%/pertosmart1030.html
 %%PORTDOCS%%%%DOCSDIR%%/smartboard.html
 %%PORTDOCS%%%%DOCSDIR%%/towitoko.html
 %%PORTDOCS%%%%DOCSDIR%%/trac.css