Re: pkg/39315 Update to 1.4.102. Patches ag and ah are deleted because they are no longer required (change included in unmodified system).diff -r1.2 -r1.3 pkgsrc/security/pcsc-lite/Makefile
(shannonjr)
@@ -1,40 +1,42 @@ | @@ -1,40 +1,42 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2008/06/12 02:14:44 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2008/08/08 21:25:48 shannonjr Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= pcsc-lite-1.4.99 | 4 | DISTNAME= pcsc-lite-1.4.102 | |
5 | CATEGORIES= security | 5 | CATEGORIES= security | |
6 | MASTER_SITES= http://alioth.debian.org/frs/download.php/2257/ | 6 | MASTER_SITES= http://alioth.debian.org/frs/download.php/2479/ | |
7 | EXTRACT_SUFX= .tar.bz2 | |||
7 | 8 | |||
8 | MAINTAINER= shannonjr@NetBSD.org | 9 | MAINTAINER= shannonjr@NetBSD.org | |
9 | HOMEPAGE= http://alioth.debian.org/frs/download.php/2257/ | 10 | HOMEPAGE= http://pcsclite.alioth.debian.org/ | |
10 | COMMENT= Middleware to access a smart card using SCard API (PC/SC). | 11 | COMMENT= Middleware to access a smart card using SCard API (PC/SC). | |
11 | 12 | |||
12 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
13 | 14 | |||
14 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= pkg-config | 17 | USE_TOOLS+= pkg-config | |
17 | USE_TOOLS+= autoconf automake aclocal autoheader | 18 | USE_TOOLS+= autoconf automake aclocal autoheader | |
18 | AUTOMAKE_REQD= 1.10 | 19 | AUTOMAKE_REQD= 1.10 | |
19 | AUTOCONF_REQD= 2.58 | 20 | AUTOCONF_REQD= 2.58 | |
20 | USE_LANGUAGES= c c++ | 21 | USE_LANGUAGES= c c++ | |
21 | 22 | |||
22 | .include "options.mk" | 23 | .include "options.mk" | |
23 | 24 | |||
24 | CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} | 25 | CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} | |
25 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | 26 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} | |
26 | CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite | 27 | CONFIGURE_ARGS+= --enable-ipcdir=${VARBASE}/pcsc-lite | |
27 | CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers | 28 | CONFIGURE_ARGS+= --enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers | |
29 | CONFIGURE_ARGS+= --disable-libhal | |||
28 | MAKE_DIRS+= ${VARBASE}/pcsc-lite | 30 | MAKE_DIRS+= ${VARBASE}/pcsc-lite | |
29 | MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite | 31 | MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite | |
30 | MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite/drivers | 32 | MAKE_DIRS+= ${PREFIX}/lib/pcsc-lite/drivers | |
31 | 33 | |||
32 | EGDIR= ${PREFIX}/share/examples/pcsc-lite | 34 | EGDIR= ${PREFIX}/share/examples/pcsc-lite | |
33 | CONF_FILES+= ${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf | 35 | CONF_FILES+= ${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf | |
34 | 36 | |||
35 | PKGCONFIG_OVERRIDE+= src/libpcsclite.pc.in | 37 | PKGCONFIG_OVERRIDE+= src/libpcsclite.pc.in | |
36 | 38 | |||
37 | INSTALLATION_DIRS= ${EGDIR} | 39 | INSTALLATION_DIRS= ${EGDIR} | |
38 | 40 | |||
39 | pre-configure: | 41 | pre-configure: | |
40 | cd ${WRKSRC} && ${SH} bootstrap | 42 | cd ${WRKSRC} && ${SH} bootstrap |
@@ -1,13 +1,11 @@ | @@ -1,13 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2008/04/30 13:34:28 shannonjr Exp $ | 1 | $NetBSD: distinfo,v 1.3 2008/08/08 21:25:48 shannonjr Exp $ | |
2 | 2 | |||
3 | SHA1 (pcsc-lite-1.4.99.tar.gz) = 7f5ff7d8e187c1d46f3bc26567d393107ac0e362 | 3 | SHA1 (pcsc-lite-1.4.102.tar.bz2) = bd7cf389e99de0960cc0b21758a4ca65eb8b65ac | |
4 | RMD160 (pcsc-lite-1.4.99.tar.gz) = 689d99ae26a13dc78856670b0deafbd5fed517ab | 4 | RMD160 (pcsc-lite-1.4.102.tar.bz2) = a99730a937515885200f71d36cfdf1c2ff6768ce | |
5 | Size (pcsc-lite-1.4.99.tar.gz) = 637727 bytes | 5 | Size (pcsc-lite-1.4.102.tar.bz2) = 460324 bytes | |
6 | SHA1 (patch-aa) = d58fa48e3778f5dc07fcc8234c9b8aa064a498db | 6 | SHA1 (patch-aa) = d58fa48e3778f5dc07fcc8234c9b8aa064a498db | |
7 | SHA1 (patch-ab) = 61bf6dbc2b245e888cbb561dae0a380b14bb1700 | 7 | SHA1 (patch-ab) = 40437e4db3295318942f292dcfc7dc7a59b5c77e | |
8 | SHA1 (patch-ac) = 4404dec1418df59baafdc5c45fae9dc810418991 | 8 | SHA1 (patch-ac) = dfeb4bb8eef71e161ee5738d4640a00888a43b49 | |
9 | SHA1 (patch-ad) = 3172e6063cc48b1302d08865cd8e9039b502a807 | 9 | SHA1 (patch-ad) = 3172e6063cc48b1302d08865cd8e9039b502a807 | |
10 | SHA1 (patch-ae) = 79978e1a6e1b6cd11ba4411e69bbf6f7d83c90ae | 10 | SHA1 (patch-ae) = 79978e1a6e1b6cd11ba4411e69bbf6f7d83c90ae | |
11 | SHA1 (patch-af) = 931c031eba226336ceb1c12bc2ffd9193cb24e44 | 11 | SHA1 (patch-af) = 931c031eba226336ceb1c12bc2ffd9193cb24e44 | |
12 | SHA1 (patch-ag) = 3b404ecb91d976989969803577410f61d40aab73 | |||
13 | SHA1 (patch-ah) = 3335320a7005644baca1fbf58985e2e8099ef728 |
@@ -1,10 +1,11 @@ | @@ -1,10 +1,11 @@ | |||
1 | $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2008/08/08 21:25:49 shannonjr Exp $ | |
2 | 2 | |||
3 | --- src/Makefile.am.orig 2007-10-13 15:21:11.000000000 -0600 | 3 | --- src/Makefile.am.orig 2008-05-21 09:58:33 +0300 | |
4 | +++ src/Makefile.am | 4 | +++ src/Makefile.am 2008-08-07 22:16:36 +0300 | |
5 | @@ -150,3 +150,5 @@ tokenparser.c: tokenparser.l | 5 | @@ -152,3 +152,6 @@ tokenparser.c: tokenparser.l | |
6 | 6 | |||
7 | EXTRA_DIST = README_INTERNALS.txt dyn_win32.c thread_win32.c winscard_scf.c | 7 | EXTRA_DIST = README_INTERNALS.txt winscard_scf.c | |
8 | 8 | |||
9 | +install-data-local: | 9 | +install-data-local: | |
10 | + ${INSTALL} -d ${DESTDIR}${includedir}/PCSC | 10 | + ${INSTALL} -d ${DESTDIR}${includedir}/PCSC | |
11 | + |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: patch-ac,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $ | 1 | $NetBSD: patch-ac,v 1.2 2008/08/08 21:25:49 shannonjr Exp $ | |
2 | 2 | |||
3 | --- Makefile.am.orig 2007-10-13 15:21:11.000000000 -0600 | 3 | --- Makefile.am.orig 2008-05-21 09:58:30 +0300 | |
4 | +++ Makefile.am | 4 | +++ Makefile.am 2008-08-07 22:20:34 +0300 | |
5 | @@ -1,6 +1,6 @@ | 5 | @@ -1,6 +1,6 @@ | |
6 | # Process this file with automake to create Makefile.in. | 6 | AUTOMAKE_OPTIONS = dist-bzip2 | |
7 | 7 | |||
8 | -SUBDIRS = m4 win32 src etc doc | 8 | -SUBDIRS = m4 src etc doc | |
9 | +SUBDIRS = m4 win32 src doc | 9 | +SUBDIRS = m4 src doc | |
10 | 10 | |||
11 | ACLOCAL_AMFLAGS = -I m4 | 11 | ACLOCAL_AMFLAGS = -I m4 | |
12 | 12 |