diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/Makefile /usr/ports/security/libfprint/Makefile --- /usr/ports/security/libfprint.orig/Makefile 2011-09-23 17:25:13.000000000 -0500 +++ /usr/ports/security/libfprint/Makefile 2011-10-01 23:33:06.945091763 -0500 @@ -6,24 +6,22 @@ # PORTNAME= libfprint -PORTVERSION= 0.0.6 -PORTREVISION= 4 +PORTVERSION= 0.4.0 CATEGORIES= security -MASTER_SITES= SF/fprint/${PORTNAME}/v${PORTVERSION} +MASTER_SITES= http://people.freedesktop.org/~hadess/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= lichray@gmail.com COMMENT= Library for fingerprint reader devices -LIB_DEPENDS+= Magick:${PORTSDIR}/graphics/ImageMagick +LIB_DEPENDS+= Magick:${PORTSDIR}/graphics/ImageMagick \ + nss3:${PORTSDIR}/security/nss GNU_CONFIGURE= yes USE_BZIP2= yes USE_LDCONFIG= yes USE_OPENSSL= yes -USE_GNOME= glib20 pkgconfig +USE_GNOME= gnomehack glib20 pkgconfig -CONFIGURE_ENV+= CRYPTO_CFLAGS=-I${OPENSSLINC} \ - CRYPTO_LIBS=-lcrypto CFLAGS+= -DHAVE_MEMMEM .include @@ -31,7 +29,7 @@ .if ${OSVERSION} < 800069 LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb .else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-usb +CONFIGURE_ENV+= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" .endif .include diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/distinfo /usr/ports/security/libfprint/distinfo --- /usr/ports/security/libfprint.orig/distinfo 2011-07-03 09:02:54.000000000 -0500 +++ /usr/ports/security/libfprint/distinfo 2011-10-01 22:11:51.279148209 -0500 @@ -1,2 +1,2 @@ -SHA256 (libfprint-0.0.6.tar.bz2) = 5d16fadaecb432ab52ca97a59301dc8ca83cac75f3b57145266b562a1ebcc5dd -SIZE (libfprint-0.0.6.tar.bz2) = 431957 +SHA256 (libfprint-0.4.0.tar.bz2) = 318d5c3910e37a71a1b2b27fe676726ec14cafafe2f86ecbe3b1412cbe2a2132 +SIZE (libfprint-0.4.0.tar.bz2) = 476262 diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/extra-patch-usb /usr/ports/security/libfprint/files/extra-patch-usb --- /usr/ports/security/libfprint.orig/files/extra-patch-usb 2009-03-09 12:15:41.000000000 -0500 +++ /usr/ports/security/libfprint/files/extra-patch-usb 1969-12-31 18:00:00.000000000 -0600 @@ -1,118 +0,0 @@ ---- configure.orig 2008-03-20 16:57:56.000000000 +0300 -+++ configure 2009-03-07 23:40:53.000000000 +0300 -@@ -20182,113 +20182,10 @@ - { echo "$as_me:$LINENO: checking for LIBUSB" >&5 - echo $ECHO_N "checking for LIBUSB... $ECHO_C" >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$LIBUSB_CFLAGS"; then -- pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libusb\"\"") >&5 -- ($PKG_CONFIG --exists --print-errors ""libusb"") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags ""libusb"" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi --if test -n "$PKG_CONFIG"; then -- if test -n "$LIBUSB_LIBS"; then -- pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libusb\"\"") >&5 -- ($PKG_CONFIG --exists --print-errors ""libusb"") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs ""libusb"" 2>/dev/null` --else -- pkg_failed=yes --fi -- fi --else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libusb""` -- else -- LIBUSB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libusb""` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$LIBUSB_PKG_ERRORS" >&5 -- -- { { echo "$as_me:$LINENO: error: Package requirements (\"libusb\") were not met: -- --$LIBUSB_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables LIBUSB_CFLAGS --and LIBUSB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&5 --echo "$as_me: error: Package requirements (\"libusb\") were not met: -- --$LIBUSB_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables LIBUSB_CFLAGS --and LIBUSB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&2;} -- { (exit 1); exit 1; }; } --elif test $pkg_failed = untried; then -- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables LIBUSB_CFLAGS --and LIBUSB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." >&5 --echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables LIBUSB_CFLAGS --and LIBUSB_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see . --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS -- LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS -+ LIBUSB_CFLAGS="" -+ LIBUSB_LIBS="-lusb" - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } -- : --fi -- - - - # check for OpenSSL's libcrypto diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/patch-Makefile.in /usr/ports/security/libfprint/files/patch-Makefile.in --- /usr/ports/security/libfprint.orig/files/patch-Makefile.in 2008-04-15 16:14:17.000000000 -0500 +++ /usr/ports/security/libfprint/files/patch-Makefile.in 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2008-04-12 20:04:30.000000000 +0200 -+++ Makefile.in 2008-04-12 20:04:59.000000000 +0200 -@@ -209,7 +209,7 @@ - EXTRA_DIST = THANKS TODO HACKING libfprint.pc.in - DISTCLEANFILES = ChangeLog libfprint.pc - SUBDIRS = libfprint doc $(am__append_1) --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = ${PREFIX}/libdata/pkgconfig - pkgconfig_DATA = libfprint.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/patch-config.h.in /usr/ports/security/libfprint/files/patch-config.h.in --- /usr/ports/security/libfprint.orig/files/patch-config.h.in 1969-12-31 18:00:00.000000000 -0600 +++ /usr/ports/security/libfprint/files/patch-config.h.in 2011-10-01 23:12:29.723581835 -0500 @@ -0,0 +1,11 @@ +--- config.h.in~ 2011-04-18 12:02:59.000000000 -0500 ++++ config.h.in 2011-10-01 23:12:01.979122045 -0500 +@@ -117,3 +117,8 @@ + #ifndef __cplusplus + #undef inline + #endif ++ ++/* FreeBSD >=8 */ ++#ifndef ETIME ++#define ETIME ETIMEDOUT ++#endif diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/patch-configure /usr/ports/security/libfprint/files/patch-configure --- /usr/ports/security/libfprint.orig/files/patch-configure 2008-04-19 06:23:12.000000000 -0500 +++ /usr/ports/security/libfprint/files/patch-configure 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- configure.orig 2008-04-19 12:47:31.000000000 +0200 -+++ configure 2008-04-19 12:49:22.000000000 +0200 -@@ -20778,7 +20778,7 @@ - #define API_EXPORTED __attribute__((visibility("default"))) - _ACEOF - --AM_CFLAGS="-std=gnu99 -fgnu89-inline -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" -+AM_CFLAGS="-std=gnu99 -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" - - - ac_config_files="$ac_config_files libfprint.pc Makefile libfprint/Makefile examples/Makefile doc/Makefile" diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/patch-libfprint_Makefile.in /usr/ports/security/libfprint/files/patch-libfprint_Makefile.in --- /usr/ports/security/libfprint.orig/files/patch-libfprint_Makefile.in 2008-04-19 06:23:12.000000000 -0500 +++ /usr/ports/security/libfprint/files/patch-libfprint_Makefile.in 2011-10-01 23:25:13.792168896 -0500 @@ -1,11 +1,11 @@ ---- libfprint/Makefile.in.orig 2008-04-19 12:50:56.000000000 +0200 -+++ libfprint/Makefile.in 2008-04-19 12:51:11.000000000 +0200 -@@ -275,7 +275,7 @@ - nbis/mindtct/sort.c \ - nbis/mindtct/util.c +--- libfprint/Makefile.in~ 2011-10-01 23:20:55.218924048 -0500 ++++ libfprint/Makefile.in 2011-10-01 23:23:50.108796610 -0500 +@@ -1195,7 +1195,7 @@ info: info-am + + info-am: + +-install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA ++install-data-am: install-pkgincludeHEADERS + + install-dvi: install-dvi-am --libfprint_la_CFLAGS = -fvisibility=hidden -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS) -+libfprint_la_CFLAGS = -I$(srcdir)/nbis/include $(LIBUSB_CFLAGS) $(GLIB_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(CRYPTO_CFLAGS) $(AM_CFLAGS) - libfprint_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ - libfprint_la_LIBADD = -lm $(LIBUSB_LIBS) $(GLIB_LIBS) $(IMAGEMAGICK_LIBS) $(CRYPTO_LIBS) - libfprint_la_SOURCES = \ diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/patch-libfprint_data.c /usr/ports/security/libfprint/files/patch-libfprint_data.c --- /usr/ports/security/libfprint.orig/files/patch-libfprint_data.c 2009-03-09 12:15:41.000000000 -0500 +++ /usr/ports/security/libfprint/files/patch-libfprint_data.c 1969-12-31 18:00:00.000000000 -0600 @@ -1,10 +0,0 @@ ---- libfprint/data.c.orig 2009-03-07 23:42:59.000000000 +0300 -+++ libfprint/data.c 2009-03-07 23:43:09.000000000 +0300 -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - #include diff -ruN --exclude=CVS /usr/ports/security/libfprint.orig/files/patch-libfprint_imgdev.c /usr/ports/security/libfprint/files/patch-libfprint_imgdev.c --- /usr/ports/security/libfprint.orig/files/patch-libfprint_imgdev.c 2008-04-15 16:14:17.000000000 -0500 +++ /usr/ports/security/libfprint/files/patch-libfprint_imgdev.c 1969-12-31 18:00:00.000000000 -0600 @@ -1,11 +0,0 @@ ---- libfprint/imgdev.c.orig 2008-04-12 14:37:10.000000000 +0200 -+++ libfprint/imgdev.c 2008-04-12 14:40:17.000000000 +0200 -@@ -175,7 +175,7 @@ - - if (img == NULL) { - fp_err("capture succeeded but no image returned?"); -- return -ENODATA; -+ return -ENOMSG; - } - - if (!unconditional && imgdrv->await_finger_off) {