Backout bad (over)import

5 files changed, 24 insertions, 26 deletions

diff --git a/security/libyubikey/DESCR b/security/libyubikey/DESCR
index 956b455df8e..2f20298a06d 100644
--- a/security/libyubikey/DESCR
+++ b/security/libyubikey/DESCR
@@ -1,2 +1,2 @@
-This package implements online validation of Yubikey OTPs. It is written in C
-and provides a shared library for use by other software.
+This package make up the low-level C software development kit for the
+Yubico authentication device, the Yubikey.
diff --git a/security/libyubikey/Makefile b/security/libyubikey/Makefile
index 3846134affc..1909c01c03e 100644
--- a/security/libyubikey/Makefile
+++ b/security/libyubikey/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.2 2012/03/13 15:15:15 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/13 15:25:33 pettai Exp $
 
-DISTNAME=	ykclient-2.7
+DISTNAME=	libyubikey-1.8
 CATEGORIES=	security
-MASTER_SITES=	http://yubico-c-client.googlecode.com/files/
+MASTER_SITES=	http://yubico-c.googlecode.com/files/
 
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/yubico-c/
-COMMENT=	Libraries for online validation of Yubikey OTPs
+COMMENT=	Yubikey library
 
 LICENSE=	modified-bsd
 
@@ -14,5 +14,4 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
-.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libyubikey/PLIST b/security/libyubikey/PLIST
index eda39245f35..b71f06007dd 100644
--- a/security/libyubikey/PLIST
+++ b/security/libyubikey/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2012/03/13 15:15:15 pettai Exp $
-bin/ykclient
-include/ykclient.h
-include/ykclient_server_response.h
-lib/libykclient.la
+@comment $NetBSD: PLIST,v 1.2 2012/03/13 15:25:33 pettai Exp $
+bin/modhex
+bin/ykgenerate
+bin/ykparse
+include/yubikey.h
+lib/libyubikey.la
diff --git a/security/libyubikey/buildlink3.mk b/security/libyubikey/buildlink3.mk
index 45c13506816..92bb828a46a 100644
--- a/security/libyubikey/buildlink3.mk
+++ b/security/libyubikey/buildlink3.mk
@@ -1,14 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.2 2012/03/13 15:15:15 pettai Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/03/13 15:25:33 pettai Exp $
 
-BUILDLINK_TREE+=	ykclient
+BUILDLINK_TREE+=	libyubikey
 
-.if !defined(YKCLIENT_BUILDLINK3_MK)
-YKCLIENT_BUILDLINK3_MK:=
+.if !defined(LIBYUBIKEY_BUILDLINK3_MK)
+LIBYUBIKEY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ykclient+=	ykclient>=2.7
-BUILDLINK_PKGSRCDIR.ykclient?=	../../security/ykclient
+BUILDLINK_API_DEPENDS.libyubikey+=	libyubikey>=1.7
+BUILDLINK_PKGSRCDIR.libyubikey?=	../../security/libyubikey
+.endif	# LIBYUBIKEY_BUILDLINK3_MK
 
-.include "../../www/curl/buildlink3.mk"
-.endif	# YKCLIENT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ykclient
+BUILDLINK_TREE+=	-libyubikey
diff --git a/security/libyubikey/distinfo b/security/libyubikey/distinfo
index 5f6f44b6c2c..e0b8b4b15ff 100644
--- a/security/libyubikey/distinfo
+++ b/security/libyubikey/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.2 2012/03/13 15:15:15 pettai Exp $
+$NetBSD: distinfo,v 1.2 2012/03/13 15:25:33 pettai Exp $
 
-SHA1 (ykclient-2.7.tar.gz) = 947e69f165bdcdbb4c5bd746e2251622e7f37bac
-RMD160 (ykclient-2.7.tar.gz) = e6889c346cc5fbbc7f1f7af668b1e44f44653925
-Size (ykclient-2.7.tar.gz) = 344385 bytes
+SHA1 (libyubikey-1.8.tar.gz) = 9193d49bb4cfccf15d46016b3fe9d11bac4a46bd
+RMD160 (libyubikey-1.8.tar.gz) = 5d02638b0411d65466fa8c217732d8079b159636
+Size (libyubikey-1.8.tar.gz) = 320998 bytes