View | Details | Raw Unified | Return to bug 161224
Collapse All | Expand All

(-)/usr/ports/security/libfprint/Makefile (-9 / +7 lines)
Lines 6-29 Link Here
6
#
6
#
7
7
8
PORTNAME=	libfprint
8
PORTNAME=	libfprint
9
PORTVERSION=	0.0.6
9
PORTVERSION=	0.4.0
10
PORTREVISION=	4
11
CATEGORIES=	security
10
CATEGORIES=	security
12
MASTER_SITES=	SF/fprint/${PORTNAME}/v${PORTVERSION}
11
MASTER_SITES=	http://people.freedesktop.org/~hadess/
13
12
14
MAINTAINER=	ports@FreeBSD.org
13
MAINTAINER=	lichray@gmail.com
15
COMMENT=	Library for fingerprint reader devices
14
COMMENT=	Library for fingerprint reader devices
16
15
17
LIB_DEPENDS+=	Magick:${PORTSDIR}/graphics/ImageMagick
16
LIB_DEPENDS+=	Magick:${PORTSDIR}/graphics/ImageMagick \
17
		nss3:${PORTSDIR}/security/nss
18
18
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
USE_BZIP2=	yes
20
USE_BZIP2=	yes
21
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
22
USE_OPENSSL=	yes
22
USE_OPENSSL=	yes
23
USE_GNOME=	glib20 pkgconfig
23
USE_GNOME=	gnomehack glib20 pkgconfig
24
24
25
CONFIGURE_ENV+=	CRYPTO_CFLAGS=-I${OPENSSLINC} \
26
		CRYPTO_LIBS=-lcrypto
27
CFLAGS+=	-DHAVE_MEMMEM
25
CFLAGS+=	-DHAVE_MEMMEM
28
26
29
.include <bsd.port.pre.mk>
27
.include <bsd.port.pre.mk>
Lines 31-37 Link Here
31
.if ${OSVERSION} < 800069
29
.if ${OSVERSION} < 800069
32
LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
30
LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
33
.else
31
.else
34
EXTRA_PATCHES=	${FILESDIR}/extra-patch-usb
32
CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
35
.endif
33
.endif
36
34
37
.include <bsd.port.post.mk>
35
.include <bsd.port.post.mk>
(-)/usr/ports/security/libfprint/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (libfprint-0.0.6.tar.bz2) = 5d16fadaecb432ab52ca97a59301dc8ca83cac75f3b57145266b562a1ebcc5dd
1
SHA256 (libfprint-0.4.0.tar.bz2) = 318d5c3910e37a71a1b2b27fe676726ec14cafafe2f86ecbe3b1412cbe2a2132
2
SIZE (libfprint-0.0.6.tar.bz2) = 431957
2
SIZE (libfprint-0.4.0.tar.bz2) = 476262
(-)/usr/ports/security/libfprint/files/extra-patch-usb (-118 lines)
Lines 1-118 Link Here
1
--- configure.orig	2008-03-20 16:57:56.000000000 +0300
2
+++ configure	2009-03-07 23:40:53.000000000 +0300
3
@@ -20182,113 +20182,10 @@
4
 { echo "$as_me:$LINENO: checking for LIBUSB" >&5
5
 echo $ECHO_N "checking for LIBUSB... $ECHO_C" >&6; }
6
 
7
-if test -n "$PKG_CONFIG"; then
8
-    if test -n "$LIBUSB_CFLAGS"; then
9
-        pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS"
10
-    else
11
-        if test -n "$PKG_CONFIG" && \
12
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libusb\"\"") >&5
13
-  ($PKG_CONFIG --exists --print-errors ""libusb"") 2>&5
14
-  ac_status=$?
15
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
16
-  (exit $ac_status); }; then
17
-  pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags ""libusb"" 2>/dev/null`
18
-else
19
-  pkg_failed=yes
20
-fi
21
-    fi
22
-else
23
-	pkg_failed=untried
24
-fi
25
-if test -n "$PKG_CONFIG"; then
26
-    if test -n "$LIBUSB_LIBS"; then
27
-        pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS"
28
-    else
29
-        if test -n "$PKG_CONFIG" && \
30
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libusb\"\"") >&5
31
-  ($PKG_CONFIG --exists --print-errors ""libusb"") 2>&5
32
-  ac_status=$?
33
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
34
-  (exit $ac_status); }; then
35
-  pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs ""libusb"" 2>/dev/null`
36
-else
37
-  pkg_failed=yes
38
-fi
39
-    fi
40
-else
41
-	pkg_failed=untried
42
-fi
43
-
44
-
45
-
46
-if test $pkg_failed = yes; then
47
-
48
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
49
-        _pkg_short_errors_supported=yes
50
-else
51
-        _pkg_short_errors_supported=no
52
-fi
53
-        if test $_pkg_short_errors_supported = yes; then
54
-	        LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libusb""`
55
-        else
56
-	        LIBUSB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libusb""`
57
-        fi
58
-	# Put the nasty error message in config.log where it belongs
59
-	echo "$LIBUSB_PKG_ERRORS" >&5
60
-
61
-	{ { echo "$as_me:$LINENO: error: Package requirements (\"libusb\") were not met:
62
-
63
-$LIBUSB_PKG_ERRORS
64
-
65
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
66
-installed software in a non-standard prefix.
67
-
68
-Alternatively, you may set the environment variables LIBUSB_CFLAGS
69
-and LIBUSB_LIBS to avoid the need to call pkg-config.
70
-See the pkg-config man page for more details.
71
-" >&5
72
-echo "$as_me: error: Package requirements (\"libusb\") were not met:
73
-
74
-$LIBUSB_PKG_ERRORS
75
-
76
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
77
-installed software in a non-standard prefix.
78
-
79
-Alternatively, you may set the environment variables LIBUSB_CFLAGS
80
-and LIBUSB_LIBS to avoid the need to call pkg-config.
81
-See the pkg-config man page for more details.
82
-" >&2;}
83
-   { (exit 1); exit 1; }; }
84
-elif test $pkg_failed = untried; then
85
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
86
-is in your PATH or set the PKG_CONFIG environment variable to the full
87
-path to pkg-config.
88
-
89
-Alternatively, you may set the environment variables LIBUSB_CFLAGS
90
-and LIBUSB_LIBS to avoid the need to call pkg-config.
91
-See the pkg-config man page for more details.
92
-
93
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
94
-See \`config.log' for more details." >&5
95
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
96
-is in your PATH or set the PKG_CONFIG environment variable to the full
97
-path to pkg-config.
98
-
99
-Alternatively, you may set the environment variables LIBUSB_CFLAGS
100
-and LIBUSB_LIBS to avoid the need to call pkg-config.
101
-See the pkg-config man page for more details.
102
-
103
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
104
-See \`config.log' for more details." >&2;}
105
-   { (exit 1); exit 1; }; }
106
-else
107
-	LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS
108
-	LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS
109
+	LIBUSB_CFLAGS=""
110
+	LIBUSB_LIBS="-lusb"
111
         { echo "$as_me:$LINENO: result: yes" >&5
112
 echo "${ECHO_T}yes" >&6; }
113
-	:
114
-fi
115
-
116
 
117
 
118
 # check for OpenSSL's libcrypto
(-)/usr/ports/security/libfprint/files/patch-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	2008-04-12 20:04:30.000000000 +0200
2
+++ Makefile.in	2008-04-12 20:04:59.000000000 +0200
3
@@ -209,7 +209,7 @@
4
 EXTRA_DIST = THANKS TODO HACKING libfprint.pc.in
5
 DISTCLEANFILES = ChangeLog libfprint.pc
6
 SUBDIRS = libfprint doc $(am__append_1)
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = ${PREFIX}/libdata/pkgconfig
9
 pkgconfig_DATA = libfprint.pc
10
 all: config.h
11
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
(-)/usr/ports/security/libfprint/files/patch-config.h.in (+11 lines)
Line 0 Link Here
1
--- config.h.in~	2011-04-18 12:02:59.000000000 -0500
2
+++ config.h.in	2011-10-01 23:12:01.979122045 -0500
3
@@ -117,3 +117,8 @@
4
 #ifndef __cplusplus
5
 #undef inline
6
 #endif
7
+
8
+/* FreeBSD >=8 */
9
+#ifndef ETIME
10
+#define ETIME ETIMEDOUT
11
+#endif
(-)/usr/ports/security/libfprint/files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure.orig	2008-04-19 12:47:31.000000000 +0200
2
+++ configure	2008-04-19 12:49:22.000000000 +0200
3
@@ -20778,7 +20778,7 @@
4
 #define API_EXPORTED __attribute__((visibility("default")))
5
 _ACEOF
6
 
7
-AM_CFLAGS="-std=gnu99 -fgnu89-inline -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
8
+AM_CFLAGS="-std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
9
 
10
 
11
 ac_config_files="$ac_config_files libfprint.pc Makefile libfprint/Makefile examples/Makefile doc/Makefile"
(-)/usr/ports/security/libfprint/files/patch-libfprint_Makefile.in (-10 / +10 lines)
Lines 1-11 Link Here
1
--- libfprint/Makefile.in.orig	2008-04-19 12:50:56.000000000 +0200
1
--- libfprint/Makefile.in~	2011-10-01 23:20:55.218924048 -0500
2
+++ libfprint/Makefile.in	2008-04-19 12:51:11.000000000 +0200
2
+++ libfprint/Makefile.in	2011-10-01 23:23:50.108796610 -0500
3
@@ -275,7 +275,7 @@
3
@@ -1195,7 +1195,7 @@ info: info-am
4
 	nbis/mindtct/sort.c \
4
 
5
 	nbis/mindtct/util.c
5
 info-am:
6
 
7
-install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA
8
+install-data-am: install-pkgincludeHEADERS
9
 
10
 install-dvi: install-dvi-am
6
 
11
 
7
-libfprint_la_CFLAGS = -fvisibility=hidden -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS)
8
+libfprint_la_CFLAGS = -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS)
9
 libfprint_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@
10
 libfprint_la_LIBADD = -lm $(LIBUSB_LIBS) $(GLIB_LIBS) $(IMAGEMAGICK_LIBS) $(CRYPTO_LIBS)
11
 libfprint_la_SOURCES = \
(-)/usr/ports/security/libfprint/files/patch-libfprint_data.c (-10 lines)
Lines 1-10 Link Here
1
--- libfprint/data.c.orig	2009-03-07 23:42:59.000000000 +0300
2
+++ libfprint/data.c	2009-03-07 23:43:09.000000000 +0300
3
@@ -19,6 +19,7 @@
4
 
5
 #include <config.h>
6
 #include <errno.h>
7
+#include <stdlib.h>
8
 #include <string.h>
9
 #include <sys/types.h>
10
 #include <sys/stat.h>
(-)/usr/ports/security/libfprint/files/patch-libfprint_imgdev.c (-11 lines)
Lines 1-11 Link Here
1
--- libfprint/imgdev.c.orig	2008-04-12 14:37:10.000000000 +0200
2
+++ libfprint/imgdev.c	2008-04-12 14:40:17.000000000 +0200
3
@@ -175,7 +175,7 @@
4
 
5
 	if (img == NULL) {
6
 		fp_err("capture succeeded but no image returned?");
7
-		return -ENODATA;
8
+		return -ENOMSG;
9
 	}
10
 
11
 	if (!unconditional && imgdrv->await_finger_off) {

Return to bug 161224