* Make it build with compilers not having -fgnu89-inline switch (like gcc

  4.1.2 on DragonFly).
* Make it build on systems not having nonstandard ENODATA (like DragonFly).
* There is no C++ or Fortran code in this package.

4 files changed, 42 insertions, 4 deletions

diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index 20d0b99eb88..b0dfe61dd41 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/02/26 21:51:06 plunky Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/10 18:25:34 hasso Exp $
 
 DISTNAME=	libfprint-0.0.6
 CATEGORIES=	security devel
@@ -11,16 +11,18 @@ COMMENT=	Fingerprint reader access library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LANGUAGES=	c c++ fortran
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config autoconf automake autoheader autoreconf
 
 CPPFLAGS+=	-DHAVE_MEMMEM
 
 CONFIGURE_ARGS+=CRYPTO_CFLAGS=-I${SSLBASE}/include/openssl \
 		CRYPTO_LIBS="-L${SSLBASE}/lib -lcrypto"
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vif
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
diff --git a/security/libfprint/distinfo b/security/libfprint/distinfo
index 4568aa0ffd4..1d0eb126d1b 100644
--- a/security/libfprint/distinfo
+++ b/security/libfprint/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/26 21:51:06 plunky Exp $
+$NetBSD: distinfo,v 1.2 2009/05/10 18:25:34 hasso Exp $
 
 SHA1 (libfprint-0.0.6.tar.bz2) = 430af91efbefeb2b98fe30215fb33051e4f8efc5
 RMD160 (libfprint-0.0.6.tar.bz2) = 3677a0997da641ba3e8586222ca88640e1f6373f
 Size (libfprint-0.0.6.tar.bz2) = 431957 bytes
+SHA1 (patch-aa) = 839a4c7f402b3e4e55b7ac3b6b829c50cb6d2d77
+SHA1 (patch-ab) = 0bde246ce6e1d223637ba0decce6fa5db9e88eb1
diff --git a/security/libfprint/patches/patch-aa b/security/libfprint/patches/patch-aa
new file mode 100644
index 00000000000..7a96cacfec8
--- /dev/null
+++ b/security/libfprint/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2009/05/10 18:25:34 hasso Exp $
+
+--- configure.ac.orig	2009-05-10 19:25:36 +0300
++++ configure.ac	2009-05-10 19:36:05 +0300
+@@ -89,9 +89,15 @@ if test "x$debug_log_enabled" != "xno"; 
+ 	AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Debug message logging])
+ fi
+ 
++# Restore gnu89 inline semantics on gcc 4.3 and newer
++saved_cflags="$CFLAGS"
++CFLAGS="$CFLAGS -fgnu89-inline"
++AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), inline_cflags="-fgnu89-inline", inline_cflags="")
++CFLAGS="$saved_cflags"
++
+ 
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 -fgnu89-inline -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+ 
+ AC_CONFIG_FILES([libfprint.pc] [Makefile] [libfprint/Makefile] [examples/Makefile] [doc/Makefile])
diff --git a/security/libfprint/patches/patch-ab b/security/libfprint/patches/patch-ab
new file mode 100644
index 00000000000..aa6993d330d
--- /dev/null
+++ b/security/libfprint/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/05/10 18:25:34 hasso Exp $
+
+--- libfprint/imgdev.c.orig	2009-05-10 19:55:15 +0300
++++ libfprint/imgdev.c	2009-05-10 19:55:34 +0300
+@@ -175,7 +175,7 @@ int fpi_imgdev_capture(struct fp_img_dev
+ 
+ 	if (img == NULL) {
+ 		fp_err("capture succeeded but no image returned?");
+-		return -ENODATA;
++		return -EIO;
+ 	}
+ 
+ 	if (!unconditional && imgdrv->await_finger_off) {