reverted unnecessary and broken patch-ad (aclocal -I ./m4 fixes the issue)
added configuration example for OpenCT ifdhandler
This commit is contained in:
Evaldo Gardenali
Thomas Klausner
parent
fe97adf732
commit
7831711946
5 changed files with 21 additions and 78 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2005/07/22 17:59:10 udontknow Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2005/07/23 22:07:04 udontknow Exp $
|
||||
|
||||
DISTNAME= pcsc-lite-1.2.9-beta7
|
||||
PKGNAME= pcsc-lite-1.2.9
|
||||
|
|
@ -17,7 +17,7 @@ USE_TOOLS+= automake gmake
|
|||
.include "options.mk"
|
||||
|
||||
RCD_SCRIPTS= pcscd
|
||||
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}/pcsc-lite/
|
||||
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
|
||||
CONFIGURE_ARGS+= --enable-confdir=${PKG_SYSCONFDIR}
|
||||
CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite
|
||||
CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers
|
||||
|
|
@ -26,12 +26,11 @@ MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite
|
|||
MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite/drivers
|
||||
|
||||
EGDIR= ${PREFIX}/share/examples/pcsc-lite
|
||||
OWN_DIRS+= ${PKG_SYSCONFDIR}/pcsc-lite
|
||||
CONF_FILES+= ${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/pcsc-lite/reader.conf
|
||||
CONF_FILES+= ${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf
|
||||
|
||||
pre-configure:
|
||||
cd ${WRKSRC} && \
|
||||
aclocal && \
|
||||
aclocal -I ./m4 && \
|
||||
autoheader && \
|
||||
libtoolize --force && \
|
||||
automake --copy --add-missing && \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/20 21:07:06 udontknow Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2005/07/23 22:07:04 udontknow Exp $
|
||||
bin/formaticc
|
||||
include/PCSC/debuglog.h
|
||||
include/PCSC/dyn_generic.h
|
||||
|
|
@ -30,4 +30,3 @@ share/examples/rc.d/pcscd
|
|||
@dirrm lib/pcsc-lite/drivers
|
||||
@dirrm lib/pcsc-lite
|
||||
@dirrm include/PCSC
|
||||
@dirrm etc/pcsc-lite
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.2 2005/07/22 17:59:11 udontknow Exp $
|
||||
$NetBSD: distinfo,v 1.3 2005/07/23 22:07:04 udontknow Exp $
|
||||
|
||||
SHA1 (pcsc-lite-1.2.9-beta7.tar.gz) = 9569b6072b9199d44e7c41c7df8044209609b1f5
|
||||
RMD160 (pcsc-lite-1.2.9-beta7.tar.gz) = 91fcf8642b72a5218a468117b05dae8ec819680c
|
||||
|
|
@ -6,4 +6,4 @@ Size (pcsc-lite-1.2.9-beta7.tar.gz) = 771887 bytes
|
|||
SHA1 (patch-aa) = 72deef389533a2ee4a3e9d329b78e04373af1f09
|
||||
SHA1 (patch-ab) = 6dec620974d937c6f07ba4abcdd549444e9d4844
|
||||
SHA1 (patch-ac) = 2c68e89a8c2401e14df6a5bdb7a9714159c2ce99
|
||||
SHA1 (patch-ad) = c8ee83550f344402626b0e30d5da64d9cd4b6c5e
|
||||
SHA1 (patch-ae) = 0d28ca0eda57739428091af6fd13eba931d32e22
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.1 2005/07/22 17:59:16 udontknow Exp $
|
||||
|
||||
--- configure.in.orig 2005-03-01 17:15:59.000000000 -0300
|
||||
+++ configure.in
|
||||
@@ -62,21 +62,38 @@ AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
|
||||
AC_PATH_PROG(TEST_MINUS_S_SH, sh)
|
||||
|
||||
dnl Special check for pthread support
|
||||
-ACX_PTHREAD(
|
||||
-[
|
||||
- AC_DEFINE(HAVE_PTHREAD, 1,
|
||||
- [Define if you have POSIX threads libraries and header files.])
|
||||
-], [
|
||||
- AC_MSG_ERROR([POSIX thread support required])
|
||||
-])
|
||||
-
|
||||
-LIBS="$PTHREAD_LIBS $LIBS"
|
||||
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
-CC="$PTHREAD_CC"
|
||||
+dnl ACX_PTHREAD(
|
||||
+dnl [
|
||||
+dnl AC_DEFINE(HAVE_PTHREAD, 1,
|
||||
+dnl [Define if you have POSIX threads libraries and header files.])
|
||||
+dnl ], [
|
||||
+dnl AC_MSG_ERROR([POSIX thread support required])
|
||||
+dnl ])
|
||||
+
|
||||
+dnl LIBS="$PTHREAD_LIBS $LIBS"
|
||||
+dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
+dnl CC="$PTHREAD_CC"
|
||||
|
||||
AC_SUBST(PTHREAD_LIBS)
|
||||
AC_SUBST(PTHREAD_CFLAGS)
|
||||
|
||||
+ for pthread_lib in pthread pthreads c c_r; do
|
||||
+ AC_CHECK_LIB($pthread_lib, pthread_kill)
|
||||
+ done
|
||||
+
|
||||
+ AC_DEFINE(HAVE_LIBPTHREAD,1, [Define if you have the pthread library.])
|
||||
+ case $pthread_lib in
|
||||
+ c)
|
||||
+ MAINLIBS="-pthread $MAINLIBS"
|
||||
+ ;;
|
||||
+ c_r)
|
||||
+ MAINLIBS="-pthread $MAINLIBS"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ LIBS="-l$pthread_lib $LIBS"
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
dnl Add libtool support
|
||||
AM_PROG_LIBTOOL
|
||||
dnl Automatically update the libtool script if it becomes out-of-date
|
||||
@@ -284,10 +301,10 @@ AC_SUBST(usbdropdir)
|
||||
AC_SUBST(confdir)
|
||||
AC_SUBST(runpid)
|
||||
AC_SUBST(extended_apdu)
|
||||
-AS_AC_EXPAND(confdir_exp,$confdir)
|
||||
-AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
|
||||
-AS_AC_EXPAND(sbindir_exp,$sbindir)
|
||||
-AS_AC_EXPAND(localstatedir_exp,$localstatedir)
|
||||
+dnl AS_AC_EXPAND(confdir_exp,$confdir)
|
||||
+dnl AS_AC_EXPAND(sysconfdir_exp,$sysconfdir)
|
||||
+dnl AS_AC_EXPAND(sbindir_exp,$sbindir)
|
||||
+dnl AS_AC_EXPAND(localstatedir_exp,$localstatedir)
|
||||
|
||||
dnl Write Makefiles
|
||||
AC_CONFIG_FILES([
|
||||
14
pcsc-lite/patches/patch-ae
Normal file
14
pcsc-lite/patches/patch-ae
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-ae,v 1.1 2005/07/23 22:07:04 udontknow Exp $
|
||||
|
||||
--- etc/reader.conf.in.orig 2004-05-14 04:01:01.000000000 -0300
|
||||
+++ etc/reader.conf.in
|
||||
@@ -10,4 +10,9 @@
|
||||
#LIBPATH @usbdropdir@/libgen_ifd.so
|
||||
#CHANNELID 0x0103F8
|
||||
|
||||
+#FRIENDLYNAME "OpenCT handled reader"
|
||||
+#DEVICENAME /dev/null
|
||||
+#LIBPATH @prefix@/lib/openct-ifd.bundle/Contents/NetBSD/openct-ifd.so
|
||||
+#CHANNELID 0
|
||||
+
|
||||
# End of file
|
||||
Loading…
Reference in a new issue