Lots of changes incl. many firmware updates;  I'm seeing no issues with
my "Yubico Yubikey NEO OTP+U2F+CCID" rev 2.00/3.50.

No actual changes in the Makefile.in patch, just update churn.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/ccid/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile    12 Jul 2019 21:02:24 -0000      1.30
+++ Makefile    5 Nov 2019 21:03:51 -0000
@@ -2,15 +2,14 @@
 
 COMMENT =      USB Chip/Smart Card Interface Devices driver
 
-DISTNAME =     ccid-1.4.27
+V =            1.4.30
+DISTNAME =     ccid-${V}
 
 CATEGORIES =   security
 
-REVISION =     1
+HOMEPAGE =     https://ccid.apdu.fr/
 
-HOMEPAGE =     https://pcsclite.apdu.fr/
-
-MASTER_SITES = https://alioth-archive.debian.org/releases/pcsclite/ccid/
+MASTER_SITES = https://ccid.apdu.fr/files/
 
 EXTRACT_SUFX = .tar.bz2
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/ccid/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo    6 Jun 2017 14:58:58 -0000       1.20
+++ distinfo    5 Nov 2019 21:03:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (ccid-1.4.27.tar.bz2) = pmDiaWBphsuUhArVuoAv+wzSPdErmPaaNQNeDeud0Tc=
-SIZE (ccid-1.4.27.tar.bz2) = 632817
+SHA256 (ccid-1.4.30.tar.bz2) = rBcIe+CIgKDN+ZqKJ5mk7wBNxv+gi02bCtmV85pT/3w=
+SIZE (ccid-1.4.30.tar.bz2) = 642342
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/security/ccid/patches/patch-src_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_Makefile_in
--- patches/patch-src_Makefile_in       6 Jun 2017 14:58:58 -0000       1.10
+++ patches/patch-src_Makefile_in       5 Nov 2019 21:05:27 -0000
@@ -1,8 +1,12 @@
 $OpenBSD: patch-src_Makefile_in,v 1.10 2017/06/06 14:58:58 dcoppa Exp $
+
+- avoid udev
+- fix examples directory
+
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -486,7 +486,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
+@@ -517,7 +517,6 @@ EXTRA_DIST = Info.plist.src create_Info_plist.pl reade
        towitoko/COPYING towitoko/README openct/LICENSE openct/README \
        convert_version.pl 92_pcscd_ccid.rules
  
@@ -10,19 +14,19 @@ Index: src/Makefile.in
  DISTCLEANFILES = tokenparser.c Info.plist
  all: all-am
  
-@@ -1193,13 +1192,12 @@ install_ccid: libccid.la Info.plist
-       $(mkinstalldirs) 
$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/
-       cp Info.plist $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/
-       cp .libs/$(CCID_LIB) 
$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)
+@@ -1299,13 +1298,12 @@ install_ccid: libccid.la Info.plist
+       $(mkinstalldirs) 
"$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/"
+       cp Info.plist "$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/"
+       cp .libs/$(CCID_LIB) 
"$(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)/Contents/$(BUNDLE_HOST)/$(CCID_LIB)"
 -      $(INSTALL_UDEV_RULE_FILE)
  
  install_ccidtwin: libccidtwin.la
-       $(mkinstalldirs) $(DESTDIR)$(ccidtwindir)
-       cp .libs/$(CCIDTWIN_LIB) $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
--      $(mkinstalldirs) $(DESTDIR)/$(serialconfdir) ; \
--              perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" 
$(srcdir)/reader.conf.in > $(DESTDIR)/$(serialconfdir)/libccidtwin
-+      $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/ccid ; \
-+              perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" 
$(srcdir)/reader.conf.in > $(DESTDIR)$(datadir)/examples/ccid/libccidtwin
+       $(mkinstalldirs) "$(DESTDIR)$(ccidtwindir)"
+       cp .libs/$(CCIDTWIN_LIB) "$(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)"
+-      $(mkinstalldirs) "$(DESTDIR)/$(serialconfdir)" ; \
+-              perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" 
$(srcdir)/reader.conf.in > "$(DESTDIR)/$(serialconfdir)/libccidtwin"
++      $(mkinstalldirs) "$(DESTDIR)$(datadir)/examples/ccid" ; \
++              perl -ne "s|TARGET|$(ccidtwindir)/$(CCIDTWIN_LIB)| ; print" 
$(srcdir)/reader.conf.in > "$(DESTDIR)$(datadir)/examples/ccid/libccidtwin"
  
  # do not uninstall the serial driver by default
  # use explicitely 'make uninstall_ccidtwin'

Reply via email to