summaryrefslogtreecommitdiff
path: root/security/opensc
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2012-12-03 20:14:14 +0000
committergdt <gdt@pkgsrc.org>2012-12-03 20:14:14 +0000
commit8bce5d6b9698568b6cead8d1ab84b3e418578c30 (patch)
tree14e272320055ecd000d656069676e80be4eade8c /security/opensc
parent51a4e645264ef7fcf7b694a4e1d2e3f555e6ac5e (diff)
downloadpkgsrc-8bce5d6b9698568b6cead8d1ab84b3e418578c30.tar.gz
Merge Makefile.common into Makefile, because opensc-signer is gone.
This does not make any functional changes - it is just rearranging and comments.
Diffstat (limited to 'security/opensc')
-rw-r--r--security/opensc/Makefile31
-rw-r--r--security/opensc/Makefile.common29
2 files changed, 28 insertions, 32 deletions
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 2c46c56421d..106a974ca76 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -1,10 +1,34 @@
-# $NetBSD: Makefile,v 1.12 2012/11/30 14:44:34 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2012/12/03 20:14:14 gdt Exp $
+OPENSC_PKG_VERSION= 0.12.2
+DISTNAME= opensc-${OPENSC_PKG_VERSION}
+CATEGORIES= security
+MASTER_SITES= http://www.opensc-project.org/files/opensc/
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://www.opensc-project.org/opensc/
COMMENT= Smart Card drivers and middleware
LICENSE= gnu-lgpl-v2.1
-.include "../../security/opensc/Makefile.common"
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
+USE_OLD_DES_API= YES
+USE_TOOLS+= gmake pkg-config
+
+.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}
+
+# 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=${BUILDLINK_PREFIX.docbook-xsl}/share/xsl/docbook
EGDIR= ${PREFIX}/share/examples/opensc
@@ -14,12 +38,13 @@ INSTALLATION_DIRS= ${EGDIR}
post-install:
${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf ${DESTDIR}${EGDIR}
-# build tools for doc
+# build tools for doc; should be TOOLS
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/docbook-xsl/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/opensc/Makefile.common b/security/opensc/Makefile.common
deleted file mode 100644
index 28f82de5125..00000000000
--- a/security/opensc/Makefile.common
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile.common,v 1.9 2012/11/30 14:44:34 gdt Exp $
-#
-# used by security/opensc/Makefile
-# used by security/opensc-signer/Makefile
-
-OPENSC_PKG_VERSION= 0.12.2
-DISTNAME= opensc-${OPENSC_PKG_VERSION}
-CATEGORIES= security
-MASTER_SITES= http://www.opensc-project.org/files/opensc/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.opensc-project.org/opensc/
-
-BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_OLD_DES_API= YES
-USE_TOOLS+= gmake pkg-config
-
-.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
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC