graphics/sane-backends 1.0.21 fails

[Torfinn Ingolfsen]

graphics/sane-backends 1.0.21 fails for me.
root at kg-v2# uname -a
FreeBSD kg-v2.kg4.no 8.0-STABLE FreeBSD 8.0-STABLE #2: Sun Apr 11 19:39:02
CEST 2010     root at kg-v2.kg4.no:/usr/obj/usr/src/sys/GENERIC  amd64

root at kg-v2# pwd
/usr/ports/graphics/sane-backends
root at kg-v2# make
===>  Vulnerability check disabled, database not found
===>  License check disabled, port has not defined LICENSE
===>  Found saved configuration for sane-backends-1.0.20_4
===>  Extracting for sane-backends-1.0.21
=> MD5 Checksum OK for sane-backends-1.0.21.tar.gz.
=> SHA256 Checksum OK for sane-backends-1.0.21.tar.gz.
===>  Patching for sane-backends-1.0.21
===>  Applying FreeBSD patches for sane-backends-1.0.21
1 out of 1 hunks failed--saving rejects to backend/snapscan-mutex.c.rej
=> Patch patch-backend_snapscan-mutex.c failed to apply cleanly.
=> Patch(es) patch-Makefile.in patch-backend__Makefile.in
patch-backend__epson2-commands.c patch-backend__epson2-ops.c
patch-backend__epson2.c applied cleanly.
*** Error code 1

Stop in /usr/ports/graphics/sane-backends.
*** Error code 1

Stop in /usr/ports/graphics/sane-backends.
root at kg-v2# more ./work/sane-backends-1.0.21/backend/snapscan-mutex.c.rej
***************
*** 130,136 ****
            return 0;
        }

-       if (sscanf(dev, "libusb:%d:%d", &busnum, &devnum) != 2)
        {
            DBG (DL_MAJOR_ERROR, "%s: could not parse device string: %s\n",
me, strerror(errno));
            return 0;
--- 130,136 ----
            return 0;
        }

+       if (sscanf(dev, "libusb:/dev/usb:/dev/ugen%d.%d", &busnum, &devnum)
!= 2)
        {
            DBG (DL_MAJOR_ERROR, "%s: could not parse device string: %s\n",
me, strerror(errno));
            return 0;

Perhaps the patch was taken from PR ports/143200?
It looks like the snapscan-mutex.c is rewritten from version 1.0.20 to
version 1.0.21, so this patch doesn't work.

AFAICT, this patch isn't even needed anymore. I simply removed it, built the
sane-backends port, and my scanner is still detected:
tingo at kg-v2$ scanimage -L
device `snapscan:libusb:/dev/usb:/dev/ugen2.2' is a AGFA SNAPSCAN 1212U_2
flatbed scanner
tingo at kg-v2$ portversion -v | grep sane-backends
sane-backends-1.0.21        =  up-to-date with port


References:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/143200
-- 
Regards,
Torfinn Ingolfsen