From 0424e54e0af728eabca9bac809b75f19bf32cf14 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Mon, 2 Jan 2006 13:48:29 +0000 Subject: [PATCH] * Update to 1.2.9.b.9 - libmusclecard was reintegrated * Takeover Maintainership [1] Approved by: old maintainer[1] --- devel/pcsc-lite/Makefile | 12 ++++---- devel/pcsc-lite/distinfo | 5 ++-- devel/pcsc-lite/files/patch-hotplug_generic.c | 30 +++++++++++++++++++ devel/pcsc-lite/files/patch-ltmain.sh | 27 ++--------------- devel/pcsc-lite/pkg-descr | 2 -- devel/pcsc-lite/pkg-plist | 12 +++++--- 6 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 devel/pcsc-lite/files/patch-hotplug_generic.c diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile index bdeba71c2af3..2847eabfe97f 100644 --- a/devel/pcsc-lite/Makefile +++ b/devel/pcsc-lite/Makefile @@ -6,13 +6,13 @@ # PORTNAME= pcsc-lite -PORTVERSION= 1.2.9.b.7 +PORTVERSION= 1.2.9.b.9 PORTEPOCH= 2 CATEGORIES= devel security -MASTER_SITES= http://alioth.debian.org/download.php/975/ +MASTER_SITES= http://alioth.debian.org/download.php/1289/ DISTNAME= pcsc-lite-${PORTVERSION:S/.b./-beta/} -MAINTAINER= toni@soth.at +MAINTAINER= arved@FreeBSD.org COMMENT= A smartcard development library GNU_CONFIGURE= yes @@ -20,7 +20,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig USE_AUTOTOOLS= libtool:15:inc -WRKSRC= ${WRKDIR}/pcsc-lite-1.2.9-beta7 +WRKSRC= ${WRKDIR}/pcsc-lite-1.2.9-beta9 INSTALLS_SHLIB= yes CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS+=--prefix=${PREFIX} \ @@ -42,7 +42,7 @@ MAN8= pcscd.8 .if !defined(WITHOUT_USB) LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb -CONFIGURE_ARGS+=--enable-libusb=${PREFIX} +CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} .endif post-patch: @@ -50,10 +50,12 @@ post-patch: ${REINPLACE_CMD} -e "s,^confdir,#sysconfdir,; s,^conf_DATA,#sysconf_DATA,; s,^EXTRA_DIST,#EXTRA_DIST," ${WRKSRC}/etc/Makefile.in pre-everything:: +.if !defined(WITHOUT_USB) @${ECHO_MSG} @${ECHO_MSG} "pcsc-lite has the following option(s):" @${ECHO_MSG} " WITHOUT_USB=yes Disable USB support" @${ECHO_MSG} +.endif post-install: .if !defined(NOPORTDOCS) diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo index c97ed7d34576..d6a099d0e41d 100644 --- a/devel/pcsc-lite/distinfo +++ b/devel/pcsc-lite/distinfo @@ -1,2 +1,3 @@ -MD5 (pcsc-lite-1.2.9-beta7.tar.gz) = 6457f8070e8950e66952000142b1b3bf -SIZE (pcsc-lite-1.2.9-beta7.tar.gz) = 771887 +MD5 (pcsc-lite-1.2.9-beta9.tar.gz) = 12742c0b06590a8fd20c357cc1483fbf +SHA256 (pcsc-lite-1.2.9-beta9.tar.gz) = c0a035e437f2518382b9f4d41da938300548722876f098c4c3dccea4ad1995c0 +SIZE (pcsc-lite-1.2.9-beta9.tar.gz) = 1048891 diff --git a/devel/pcsc-lite/files/patch-hotplug_generic.c b/devel/pcsc-lite/files/patch-hotplug_generic.c new file mode 100644 index 000000000000..b22c7d0b3622 --- /dev/null +++ b/devel/pcsc-lite/files/patch-hotplug_generic.c @@ -0,0 +1,30 @@ +--- src/hotplug_generic.c.orig Mon Aug 8 21:58:19 2005 ++++ src/hotplug_generic.c Sun Jan 1 17:34:00 2006 +@@ -20,8 +20,15 @@ + #include "config.h" + #include "pcsclite.h" + ++#ifndef TRUE ++#define TRUE 1 ++#define FALSE 0 ++#endif ++ + #if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__) + ++char ReCheckSerialReaders = FALSE; ++ + LONG HPSearchHotPluggables(void) + { + return 0; +@@ -35,6 +42,11 @@ + LONG HPStopHotPluggables(void) + { + return 0; ++} ++ ++void HPReCheckSerialReaders(void) ++{ ++ ReCheckSerialReaders = TRUE; + } + + #endif diff --git a/devel/pcsc-lite/files/patch-ltmain.sh b/devel/pcsc-lite/files/patch-ltmain.sh index 4179fc9729db..bc5e41220f5c 100644 --- a/devel/pcsc-lite/files/patch-ltmain.sh +++ b/devel/pcsc-lite/files/patch-ltmain.sh @@ -1,27 +1,6 @@ -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -1278,7 +1278,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ +--- ltmain.sh.orig Mon Jan 2 14:34:57 2006 ++++ ltmain.sh Mon Jan 2 14:37:12 2006 +@@ -5667,10 +5667,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/devel/pcsc-lite/pkg-descr b/devel/pcsc-lite/pkg-descr index a85cd684c50d..71a745816a3e 100644 --- a/devel/pcsc-lite/pkg-descr +++ b/devel/pcsc-lite/pkg-descr @@ -2,8 +2,6 @@ This is a port of the MUSCLE PC/SC-Lite architecture. Allows easy porting of Windows smartcard software to other operating systems. Supports many types of serial, PCMCIA, and USB smartcard readers and cryptographic tokens. -Tested under Linux, Solaris 8, HPUX 11, OS X (10.1), -OpenBSD, FreeBSD. Authors: David Corcoran , Ludovic Rousseau diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist index 33c0781a8e3f..a63ac204b4bb 100644 --- a/devel/pcsc-lite/pkg-plist +++ b/devel/pcsc-lite/pkg-plist @@ -2,20 +2,24 @@ bin/formaticc etc/rc.d/pcscd.sh.sample etc/reader.conf.d/reader.conf.sample include/PCSC/debuglog.h -include/PCSC/dyn_generic.h include/PCSC/ifdhandler.h -include/PCSC/parser.h +include/PCSC/mscdefines.h +include/PCSC/musclecard.h include/PCSC/pcsclite.h -include/PCSC/sys_generic.h -include/PCSC/thread_generic.h +include/PCSC/reader.h include/PCSC/winscard.h include/PCSC/wintypes.h +lib/libmusclecard.so.1 +lib/libmusclecard.so +lib/libmusclecard.a lib/libpcsclite.a lib/libpcsclite.so lib/libpcsclite.so.1 lib/pcsc/drivers/.keep_me lib/pcsc/services/.keep_me libdata/pkgconfig/libpcsclite.pc +libdata/pkgconfig/libmusclecard.pc +sbin/bundleTool sbin/installifd sbin/pcscd sbin/update-reader.conf