CVS commit: pkgsrc/security/opensc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jun 20 19:08:19 UTC 2020

Modified Files:
        pkgsrc/security/opensc: Makefile PLIST distinfo
Removed Files:
        pkgsrc/security/opensc/patches: patch-src_common_compat__getopt.h
            patch-src_common_compat__getopt__main.c

Log Message:
opensc: make it build again


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/opensc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/opensc/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/opensc/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/security/opensc/patches/patch-src_common_compat__getopt.h \
    pkgsrc/security/opensc/patches/patch-src_common_compat__getopt__main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/opensc/Makefile
diff -u pkgsrc/security/opensc/Makefile:1.31 pkgsrc/security/opensc/Makefile:1.32
--- pkgsrc/security/opensc/Makefile:1.31        Tue Jun  2 08:24:41 2020
+++ pkgsrc/security/opensc/Makefile     Sat Jun 20 19:08:19 2020
@@ -1,52 +1,38 @@
-# $NetBSD: Makefile,v 1.31 2020/06/02 08:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/06/20 19:08:19 adam Exp $
 
-OPENSC_PKG_VERSION=    0.20.0
-DISTNAME=              opensc-${OPENSC_PKG_VERSION}
-#PKGREVISION=          1
-PKGREVISION=           1
-CATEGORIES=            security
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=opensc/}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://github.com/OpenSC/OpenSC/wiki
-COMMENT=               Smart Card drivers and middleware
-LICENSE=               gnu-lgpl-v2.1
+DISTNAME=      opensc-0.20.0
+PKGREVISION=   2
+CATEGORIES=    security
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenSC/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/OpenSC/OpenSC/wiki
+COMMENT=       Smart Card drivers and middleware
+LICENSE=       gnu-lgpl-v2.1
 
-BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-
-GNU_CONFIGURE=         YES
-USE_LIBTOOL=           YES
-USE_TOOLS+=            gmake pkg-config
-WRKSRC=                        ${WRKDIR}/OpenSC-${OPENSC_PKG_VERSION}
-
-USE_TOOLS+=            autoreconf autoconf automake
-AUTOCONF_REQD=         2.60
-AUTOMAKE_REQD=         1.15
-pre-configure:
-       cd ${WRKSRC:Q} && \
-       ./bootstrap \
-               -s ${OPENSC_VERSION_SUFFIX:Q} \
-               -r ${OPENSC_VERSION_REVISION:Q}
+WRKSRC=                ${WRKDIR}/OpenSC-${PKGVERSION_NOREV}
 
-.include "options.mk"
-
-# Previous versions needed these, but 0.12.2 configure does not
-# recognize them.
-#CONFIGURE_ARGS+=      --with-openssl=${SSLBASE:Q}
-#CONFIGURE_ARGS+=      --disable-sensitive-logging
-
-# Is this necessary (and non-default)?
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
+USE_LIBTOOL=           yes
+USE_TOOLS+=            autoreconf autoconf automake gmake pkg-config
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-autostart-items
+CONFIGURE_ARGS+=       --disable-strict  # avoid -Werror
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+# The stylesheets are not found without this.
+CONFIGURE_ARGS+=       --with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
 # This is perhaps an upstream bug.
 CONFIGURE_ENV+=                PCSC_CFLAGS=-I${PREFIX}/include/PCSC
 
-# The stylesheets are not found without this.
-CONFIGURE_ARGS+=       --with-xsl-stylesheetsdir=${PREFIX}/share/xsl/docbook
+.include "options.mk"
 
 EGDIR=                 ${PREFIX}/share/examples/opensc
 CONF_FILES+=           ${EGDIR}/opensc.conf ${PKG_SYSCONFDIR}/opensc.conf
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fi
+
 INSTALLATION_DIRS=     ${EGDIR}
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf.example ${DESTDIR}${EGDIR}/opensc.conf

Index: pkgsrc/security/opensc/PLIST
diff -u pkgsrc/security/opensc/PLIST:1.12 pkgsrc/security/opensc/PLIST:1.13
--- pkgsrc/security/opensc/PLIST:1.12   Thu Apr 30 15:29:33 2020
+++ pkgsrc/security/opensc/PLIST        Sat Jun 20 19:08:19 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2020/04/30 15:29:33 manu Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/06/20 19:08:19 adam Exp $
 bin/cardos-tool
 bin/cryptoflex-tool
 bin/dnie-tool
@@ -22,7 +22,6 @@ bin/pkcs15-init
 bin/pkcs15-tool
 bin/sc-hsm-tool
 bin/westcos-tool
-etc/xdg/autostart/pkcs11-register.desktop
 lib/libopensc.la
 lib/libsmm-local.la
 lib/onepin-opensc-pkcs11.la

Index: pkgsrc/security/opensc/distinfo
diff -u pkgsrc/security/opensc/distinfo:1.17 pkgsrc/security/opensc/distinfo:1.18
--- pkgsrc/security/opensc/distinfo:1.17        Thu Apr 30 15:29:33 2020
+++ pkgsrc/security/opensc/distinfo     Sat Jun 20 19:08:19 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2020/04/30 15:29:33 manu Exp $
+$NetBSD: distinfo,v 1.18 2020/06/20 19:08:19 adam Exp $
 
 SHA1 (opensc-0.20.0.tar.gz) = a03dab062dd033c5662f11ee39e53b84106c2c0d
 RMD160 (opensc-0.20.0.tar.gz) = 71003565bee88d9fb20723ad6b5ad68c627eff3b
@@ -8,6 +8,4 @@ SHA1 (patch-aa) = 5ca9245c763a9f8a8aa273
 SHA1 (patch-ab) = 5ea2a3e623df6bc2c814c37ce89fed491149f8b4
 SHA1 (patch-configure.ac) = 9031a51162d883b3e3118820d400e07ef99dbad9
 SHA1 (patch-doc_tools_Makefile.am) = 4535988c6fbe4b9f45838362f2f9604c91fecd53
-SHA1 (patch-src_common_compat__getopt.h) = a9c4fad2d1fd73f5b2c245a364cfd37d838f51eb
-SHA1 (patch-src_common_compat__getopt__main.c) = 96d51499ea6d48bd53a17e3849c44ae4e0c9b669
 SHA1 (patch-src_libopensc_log.c) = 00acff447b1890b05cd3bea10ece8d42e7b6cf26