aboutsummaryrefslogtreecommitdiff
path: root/graphics/sane-backends
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/sane-backends')
-rw-r--r--graphics/sane-backends/Makefile9
-rw-r--r--graphics/sane-backends/Makefile.man3
-rw-r--r--graphics/sane-backends/distinfo2
-rw-r--r--graphics/sane-backends/files/patch-doc_Makefile.in26
-rw-r--r--graphics/sane-backends/files/patch-sanei_sanei_usb.c96
-rw-r--r--graphics/sane-backends/pkg-plist24
6 files changed, 140 insertions, 20 deletions
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 671157e80ee7..5664299499fc 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,12 +6,13 @@
#
PORTNAME= sane-backends
-PORTVERSION= 1.0.11
+PORTVERSION= 1.0.12
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
ftp://ftp.no.mostang.com/pub/sane/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION} \
+ old-versions/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= API for access to scanners, digitals camera, frame grabbers etc
@@ -29,6 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}
INSTALLS_SHLIB= yes
+.include <bsd.port.pre.mk>
+
.if defined(WITH_GPHOTO2)
LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/gphoto2
CONFIGURE_ARGS+= --with-gphoto2=yes
@@ -50,4 +53,4 @@ post-patch:
s|gphoto2 2.0.1|gphoto2 2.0|g' ${WRKSRC}/configure
.include "Makefile.man"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
index 422fb4720c0d..7e9ab088be63 100644
--- a/graphics/sane-backends/Makefile.man
+++ b/graphics/sane-backends/Makefile.man
@@ -26,8 +26,11 @@ MAN5+= sane-fujitsu.5
MAN5+= sane-gphoto2.5
MAN5+= sane-gt68xx.5
MAN5+= sane-hp.5
+MAN5+= sane-hp5400.5
MAN5+= sane-hpsj5s.5
+MAN5+= sane-ibm.5
MAN5+= sane-leo.5
+MAN5+= sane-ma1509.5
MAN5+= sane-matsushita.5
MAN5+= sane-microtek.5
MAN5+= sane-microtek2.5
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 3672f8e9feb7..d4f5ff9e8ab6 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-backends-1.0.11.tar.gz) = 7f0f1a7dbc1cf164f7adc2f1cb4ec13b
+MD5 (sane-backends-1.0.12.tar.gz) = 28d4d7469cd688dac94c7a415a81a6bb
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
index d156628bf8f7..72d362108f51 100644
--- a/graphics/sane-backends/files/patch-doc_Makefile.in
+++ b/graphics/sane-backends/files/patch-doc_Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig Sat Feb 1 05:04:56 2003
-+++ doc/Makefile.in Wed Feb 5 00:25:50 2003
+--- doc/Makefile.in.orig Thu May 1 08:12:55 2003
++++ doc/Makefile.in Tue May 27 13:32:26 2003
@@ -25,7 +25,7 @@
includedir = @includedir@
oldincludedir = /usr/include
@@ -9,8 +9,8 @@
MKDIR = $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
-@@ -53,7 +53,7 @@
- sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5
+@@ -54,7 +54,7 @@
+ sane-ma1509.5 sane-ibm.5 sane-hp5400.5
SECT7 = sane.7
MANPAGES = $(SECT1) $(SECT5) $(SECT7)
-READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \
@@ -18,16 +18,7 @@
PROJECTS README README.aix README.beos README.darwin README.freebsd \
README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
README.solaris README.unixware2 README.unixware7 TODO
-@@ -93,7 +93,7 @@
- .PHONY: all clean depend dist distclean html html-man install \
- install-mostang sane-html uninstall
-
--all: sane.ps $(MANPAGES)
-+all: $(MANPAGES)
-
- %.1 %.5 %.7: %.man
- @sed -e 's|@DATADIR@|$(datadir)|g' \
-@@ -120,6 +120,7 @@
+@@ -133,6 +133,7 @@
echo installing $${page} in $(mandir)/man7/$${page}...; \
$(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man7/$${page} || exit 1; \
done
@@ -35,7 +26,12 @@
$(MKDIR) $(DESTDIR)$(docdir)
@for readme in $(READMES); do \
echo installing $${readme} in $(docdir)/$${readme}...; \
-@@ -140,6 +141,7 @@
+@@ -149,10 +150,11 @@
+ fi \
+ done \
+ done
+- @-for doc in $(DOCS) $(HTML_PAGES); do \
++ @-for doc in $(HTML_PAGES); do \
echo installing $${doc} in $(docdir)/$${doc}...; \
$(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
done
diff --git a/graphics/sane-backends/files/patch-sanei_sanei_usb.c b/graphics/sane-backends/files/patch-sanei_sanei_usb.c
new file mode 100644
index 000000000000..1460fa4d5658
--- /dev/null
+++ b/graphics/sane-backends/files/patch-sanei_sanei_usb.c
@@ -0,0 +1,96 @@
+--- sanei/sanei_usb.c.orig Sun Apr 20 23:55:43 2003
++++ sanei/sanei_usb.c Tue May 27 12:19:51 2003
+@@ -59,6 +59,10 @@
+ #include <usb.h>
+ #endif /* HAVE_LIBUSB */
+
++#if defined (__FreeBSD__)
++#include <dev/usb/usb.h>
++#endif /* __FreeBSD__ */
++
+ #define BACKEND_NAME sanei_usb
+ #include "../include/sane/sane.h"
+ #include "../include/sane/sanei_debug.h"
+@@ -177,6 +181,49 @@
+ }
+ }
+
++#if defined (__FreeBSD__)
++static void
++kernel_get_vendor_product (int fd, const char *name, int *vendorID, int *productID)
++{
++ int controller;
++ int ctrl_fd;
++ char buf[40];
++ int dev;
++
++ for (controller = 0; ; controller++ )
++ {
++ snprintf (buf, sizeof( buf ) - 1, "/dev/usb%d", controller);
++ ctrl_fd = open (buf, O_RDWR);
++
++ /* If we can not open the usb controller device, treat it
++ as the end of controller devices */
++ if (ctrl_fd < 0)
++ break;
++
++ /* Search for the scanner device on this bus */
++ for( dev = 1; dev < USB_MAX_DEVICES; dev++ )
++ {
++ struct usb_device_info devInfo;
++ devInfo.udi_addr = dev;
++
++ if (ioctl (ctrl_fd, USB_DEVICEINFO, &devInfo) == -1)
++ break; /* Treak this as the end of devices for this controller */
++
++ snprintf( buf, sizeof( buf ), "/dev/%s", devInfo.udi_devnames[0] );
++ if( strncmp( buf, name, sizeof( buf ) ) == 0 )
++ {
++ *vendorID = (int)devInfo.udi_vendorNo;
++ *productID = (int)devInfo.udi_productNo;
++ close( ctrl_fd );
++ return;
++ }
++ }
++ close( ctrl_fd );
++ DBG (3, "kernel_get_vendor_product: Could not retrieve "
++ "vendor/product ID from device %d\n", fd );
++ }
++}
++#else
+ static void
+ kernel_get_vendor_product (int fd, int *vendorID, int *productID)
+ {
+@@ -197,6 +244,7 @@
+ #endif /* defined (__linux__) */
+ /* put more os-dependant stuff ... */
+ }
++#endif
+
+ void
+ sanei_usb_init (void)
+@@ -277,7 +325,11 @@
+ }
+ vendor = -1;
+ product = -1;
++#if defined (__FreeBSD__)
++ kernel_get_vendor_product (fd, devname, &vendor, &product);
++#else
+ kernel_get_vendor_product (fd, &vendor, &product);
++#endif
+ close (fd);
+ devices[dn].devname = strdup (devname);
+ if (!devices[dn].devname)
+@@ -440,7 +492,11 @@
+ }
+
+ if (devices[dn].method == sanei_usb_method_scanner_driver)
++#if defined (__FreeBSD__)
++ kernel_get_vendor_product (devices[dn].fd, devices[dn].devname, &vendorID, &productID);
++#else
+ kernel_get_vendor_product (devices[dn].fd, &vendorID, &productID);
++#endif
+ else if (devices[dn].method == sanei_usb_method_libusb)
+ {
+ #ifdef HAVE_LIBUSB
+
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 35bf091f563f..7d39b5a8af9b 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -23,7 +23,10 @@ etc/sane.d/fujitsu.conf
%%GPHOTO2%%etc/sane.d/gphoto2.conf
etc/sane.d/gt68xx.conf
etc/sane.d/hp.conf
+etc/sane.d/hp5400.conf
+etc/sane.d/ibm.conf
etc/sane.d/leo.conf
+etc/sane.d/ma1509.conf
etc/sane.d/matsushita.conf
etc/sane.d/microtek.conf
etc/sane.d/microtek2.conf
@@ -121,9 +124,18 @@ lib/sane/libsane-gt68xx.so.1
lib/sane/libsane-hp.a
lib/sane/libsane-hp.so
lib/sane/libsane-hp.so.1
+lib/sane/libsane-hp5400.a
+lib/sane/libsane-hp5400.so
+lib/sane/libsane-hp5400.so.1
+lib/sane/libsane-ibm.a
+lib/sane/libsane-ibm.so
+lib/sane/libsane-ibm.so.1
lib/sane/libsane-leo.a
lib/sane/libsane-leo.so
lib/sane/libsane-leo.so.1
+lib/sane/libsane-ma1509.a
+lib/sane/libsane-ma1509.so
+lib/sane/libsane-ma1509.so.1
lib/sane/libsane-matsushita.a
lib/sane/libsane-matsushita.so
lib/sane/libsane-matsushita.so.1
@@ -223,7 +235,6 @@ sbin/saned
%%PORTDOCS%%share/doc/sane/README.unixware2
%%PORTDOCS%%share/doc/sane/README.unixware7
%%PORTDOCS%%share/doc/sane/TODO
-%%PORTDOCS%%share/doc/sane/backend-writing.txt
%%PORTDOCS%%share/doc/sane/canon/canon.changes
%%PORTDOCS%%share/doc/sane/canon/canon.install2700F.txt
%%PORTDOCS%%share/doc/sane/gt68xx/gt68xx.CHANGES
@@ -236,6 +247,10 @@ sbin/saned
%%PORTDOCS%%share/doc/sane/plustek/Plustek-USB-TODO.txt
%%PORTDOCS%%share/doc/sane/plustek/Plustek-USB.txt
%%PORTDOCS%%share/doc/sane/plustek/Plustek.changes
+%%PORTDOCS%%share/doc/sane/sane-backends.html
+%%PORTDOCS%%share/doc/sane/sane-backends-external.html
+%%PORTDOCS%%share/doc/sane/sane-mfgs.html
+%%PORTDOCS%%share/doc/sane/sane-mfgs-external.html
%%PORTDOCS%%share/doc/sane/sceptre/s1200.txt
%%PORTDOCS%%share/doc/sane/teco/teco1.txt
%%PORTDOCS%%share/doc/sane/teco/teco2.txt
@@ -246,12 +261,16 @@ sbin/saned
%%PORTDOCS%%share/doc/sane/umax/sane-umax-advanced.jpg
%%PORTDOCS%%share/doc/sane/umax/sane-umax-astra-doc.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-config-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-contact.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-doc.dvi
%%PORTDOCS%%share/doc/sane/umax/sane-umax-doc.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-doc.tex
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-download.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-firewire-info.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-histogram.jpg
%%PORTDOCS%%share/doc/sane/umax/sane-umax-mailinglist.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-mirage-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-news.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-not-listed-doc.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-old-scanners-doc.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-options-doc.html
@@ -268,6 +287,7 @@ sbin/saned
%%PORTDOCS%%share/doc/sane/umax/sane-umax-text4.jpg
%%PORTDOCS%%share/doc/sane/umax/sane-umax-uc-doc.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax-vista-doc.html
+%%PORTDOCS%%share/doc/sane/umax/sane-umax-websites.html
%%PORTDOCS%%share/doc/sane/umax/sane-umax.jpg
%%PORTDOCS%%share/doc/sane/umax/umax.BUGS
%%PORTDOCS%%share/doc/sane/umax/umax.CHANGES
@@ -287,6 +307,8 @@ sbin/saned
share/locale/de/LC_MESSAGES/sane-backends.mo
share/locale/es/LC_MESSAGES/sane-backends.mo
share/locale/fr/LC_MESSAGES/sane-backends.mo
+share/locale/nl/LC_MESSAGES/sane-backends.mo
+share/locale/no/LC_MESSAGES/sane-backends.mo
share/locale/pt/LC_MESSAGES/sane-backends.mo
share/locale/ru/LC_MESSAGES/sane-backends.mo
share/locale/sv/LC_MESSAGES/sane-backends.mo
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 07:13:10 +0000