aboutsummaryrefslogtreecommitdiff
path: root/graphics/sane-backends
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/sane-backends')
-rw-r--r--graphics/sane-backends/Makefile21
-rw-r--r--graphics/sane-backends/Makefile.man56
-rw-r--r--graphics/sane-backends/distinfo2
-rw-r--r--graphics/sane-backends/files/patch-configure10
-rw-r--r--graphics/sane-backends/files/patch-doc_Makefile.in27
-rw-r--r--graphics/sane-backends/pkg-plist47
6 files changed, 124 insertions, 39 deletions
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 651cce823d8d..298a45fe3e8d 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= sane-backends
-PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTVERSION= 1.0.8
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
@@ -21,24 +20,11 @@ LIB_DEPENDS= usb-0.1.5:${PORTSDIR}/devel/libusb \
USE_GMAKE= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_UNION_SEMUN" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}
INSTALLS_SHLIB= yes
-MAN1= sane-find-scanner.1 saned.1 scanimage.1
-MAN5= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 sane-as6e.5 \
- sane-avision.5 sane-bh.5 sane-canon.5 sane-coolscan.5 sane-dc210.5 \
- sane-dc240.5 sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
- sane-fujitsu.5 sane-gphoto2.5 sane-hp.5 sane-microtek.5 \
- sane-microtek2.5 sane-mustek.5 sane-mustek_pp.5 sane-mustek_usb.5 \
- sane-nec.5 sane-net.5 sane-pie.5 sane-pint.5 sane-plustek.5 \
- sane-pnm.5 sane-qcam.5 sane-ricoh.5 sane-s9036.5 sane-scsi.5 \
- sane-sharp.5 sane-sm3600.5 sane-snapscan.5 sane-st400.5 \
- sane-tamarack.5 sane-umax.5 sane-umax1220u.5 sane-umax_pp.5 \
- sane-usb.5 sane-v4l.5
-MAN7= sane.7
-
.if defined(WITH_GPHOTO2)
LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/gphoto2
CONFIGURE_ARGS+= --with-gphoto2=yes
@@ -57,6 +43,7 @@ pre-everything::
post-patch:
@${PERL} -pi -e 's| -I/usr/local/include||g ; \
- s|2.0beta5dev1|2.0|g' ${WRKSRC}/configure
+ s|gphoto2 2.0.1|gphoto2 2.0|g' ${WRKSRC}/configure
+.include "Makefile.man"
.include <bsd.port.mk>
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
new file mode 100644
index 000000000000..6d6a2b72d222
--- /dev/null
+++ b/graphics/sane-backends/Makefile.man
@@ -0,0 +1,56 @@
+MAN1+= sane-find-scanner.1
+MAN1+= saned.1
+MAN1+= scanimage.1
+MAN5+= sane-abaton.5
+MAN5+= sane-agfafocus.5
+MAN5+= sane-apple.5
+MAN5+= sane-artec.5
+MAN5+= sane-as6e.5
+MAN5+= sane-avision.5
+MAN5+= sane-bh.5
+MAN5+= sane-canon.5
+MAN5+= sane-canon_pp.5
+MAN5+= sane-canon630u.5
+MAN5+= sane-coolscan.5
+MAN5+= sane-coolscan2.5
+MAN5+= sane-dc210.5
+MAN5+= sane-dc240.5
+MAN5+= sane-dc25.5
+MAN5+= sane-dll.5
+MAN5+= sane-dmc.5
+MAN5+= sane-epson.5
+MAN5+= sane-fujitsu.5
+MAN5+= sane-gphoto2.5
+MAN5+= sane-hp.5
+MAN5+= sane-leo.5
+MAN5+= sane-matsushita.5
+MAN5+= sane-microtek.5
+MAN5+= sane-microtek2.5
+MAN5+= sane-mustek.5
+MAN5+= sane-mustek_pp.5
+MAN5+= sane-mustek_usb.5
+MAN5+= sane-nec.5
+MAN5+= sane-net.5
+MAN5+= sane-pie.5
+MAN5+= sane-pint.5
+MAN5+= sane-plustek.5
+MAN5+= sane-pnm.5
+MAN5+= sane-qcam.5
+MAN5+= sane-ricoh.5
+MAN5+= sane-s9036.5
+MAN5+= sane-sceptre.5
+MAN5+= sane-scsi.5
+MAN5+= sane-sharp.5
+MAN5+= sane-sm3600.5
+MAN5+= sane-snapscan.5
+MAN5+= sane-sp15c.5
+MAN5+= sane-st400.5
+MAN5+= sane-tamarack.5
+MAN5+= sane-teco1.5
+MAN5+= sane-test.5
+MAN5+= sane-umax.5
+MAN5+= sane-umax1220u.5
+MAN5+= sane-umax_pp.5
+MAN5+= sane-usb.5
+MAN5+= sane-v4l.5
+MAN7+= sane.7
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index bf2a502dbe58..942500a65690 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-backends-1.0.7.tar.gz) = 6010d68d8a8c29d1dcbf0c6d5005770b
+MD5 (sane-backends-1.0.8.tar.gz) = 10785bf9a87e0f45ad445e34a8529a3d
diff --git a/graphics/sane-backends/files/patch-configure b/graphics/sane-backends/files/patch-configure
new file mode 100644
index 000000000000..038a04974249
--- /dev/null
+++ b/graphics/sane-backends/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig Sat May 25 17:00:48 2002
++++ configure Wed May 29 21:41:38 2002
+@@ -8490,6 +8490,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
index 70e4d1d45e91..87c63bd9f16a 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 Jan 19 16:58:06 2002
-+++ doc/Makefile.in Tue Jan 29 02:05:10 2002
+--- doc/Makefile.in.orig Sat May 25 00:36:52 2002
++++ doc/Makefile.in Sat May 25 00:40:15 2002
@@ -24,7 +24,7 @@
includedir = @includedir@
oldincludedir = /usr/include
@@ -9,8 +9,8 @@
MKDIR = $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
-@@ -48,11 +48,11 @@
- sane-mustek_usb.5
+@@ -51,7 +51,7 @@
+ sane-teco1.5 sane-test.5 sane-sp15c.5 sane-coolscan2.5
SECT7 = sane.7
MANPAGES = $(SECT1) $(SECT5) $(SECT7)
-READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
@@ -18,31 +18,26 @@
PROJECTS README README.aix README.hp-ux README.linux README.os2 \
README.solaris README.unixware2 README.unixware7 TODO
DOCS = backend-writing.txt sane.ps sane.dvi
--BACKDIRS= canon mustek mustek_usb umax
-+BACKDIRS= canon mustek umax
- LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS latex
- DLH = TEXINPUTS=$(srcdir):$$TEXINPUTS dlh
- MAN2HTML= nroff -man |\
-@@ -82,7 +82,7 @@
+@@ -89,7 +89,7 @@
.PHONY: all clean depend dist distclean html html-man install \
- install-mostang sane-backends.html sane-html uninstall
+ install-mostang sane-html uninstall
-all: sane.ps $(MANPAGES)
+all: $(MANPAGES)
%.1 %.5 %.7: %.man
@sed -e 's|@DATADIR@|$(datadir)|g' \
-@@ -107,6 +107,7 @@
+@@ -115,6 +115,7 @@
echo installing $${page} in $(mandir)/man7/$${page}...; \
- $(INSTALL_DATA) $${page} $(mandir)/man7/$${page} || exit 1; \
+ $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man7/$${page} || exit 1; \
done
+ifndef NOPORTDOCS
- $(MKDIR) $(docdir)
+ $(MKDIR) $(DESTDIR)$(docdir)
@for readme in $(READMES); do \
echo installing $${readme} in $(docdir)/$${readme}...; \
-@@ -126,6 +127,7 @@
+@@ -135,6 +136,7 @@
echo installing $${doc} in $(docdir)/$${doc}...; \
- $(INSTALL_DATA) $${doc} $(docdir)/$${doc}; \
+ $(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
done
+endif
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 0135d228b204..107143762e93 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -8,16 +8,20 @@ etc/sane.d/artec.conf
etc/sane.d/avision.conf
etc/sane.d/bh.conf
etc/sane.d/canon.conf
+etc/sane.d/canon630u.conf
etc/sane.d/coolscan.conf
+etc/sane.d/coolscan2.conf
etc/sane.d/dc210.conf
etc/sane.d/dc240.conf
etc/sane.d/dc25.conf
etc/sane.d/dll.conf
etc/sane.d/dmc.conf
etc/sane.d/epson.conf
-%%GPHOTO2%%etc/sane.d/gphoto2.conf
+etc/sane.d/fujitsu.conf
+%%GPHOTO2%%etc/sane.d/gphtoto2.conf
etc/sane.d/hp.conf
-etc/sane.d/m3096g.conf
+etc/sane.d/leo.conf
+etc/sane.d/matsushita.conf
etc/sane.d/microtek.conf
etc/sane.d/microtek2.conf
etc/sane.d/mustek.conf
@@ -30,11 +34,14 @@ etc/sane.d/plustek.conf
etc/sane.d/ricoh.conf
etc/sane.d/s9036.conf
etc/sane.d/saned.conf
+etc/sane.d/sceptre.conf
etc/sane.d/sharp.conf
etc/sane.d/snapscan.conf
etc/sane.d/sp15c.conf
etc/sane.d/st400.conf
etc/sane.d/tamarack.conf
+etc/sane.d/teco1.conf
+etc/sane.d/test.conf
etc/sane.d/umax.conf
etc/sane.d/umax1220u.conf
etc/sane.d/umax_pp.conf
@@ -67,9 +74,15 @@ lib/sane/libsane-bh.so.1
lib/sane/libsane-canon.a
lib/sane/libsane-canon.so
lib/sane/libsane-canon.so.1
+lib/sane/libsane-canon630u.a
+lib/sane/libsane-canon630u.so
+lib/sane/libsane-canon630u.so.1
lib/sane/libsane-coolscan.a
lib/sane/libsane-coolscan.so
lib/sane/libsane-coolscan.so.1
+lib/sane/libsane-coolscan2.a
+lib/sane/libsane-coolscan2.so
+lib/sane/libsane-coolscan2.so.1
lib/sane/libsane-dc210.a
lib/sane/libsane-dc210.so
lib/sane/libsane-dc210.so.1
@@ -88,15 +101,21 @@ lib/sane/libsane-dmc.so.1
lib/sane/libsane-epson.a
lib/sane/libsane-epson.so
lib/sane/libsane-epson.so.1
+lib/sane/libsane-fujitsu.a
+lib/sane/libsane-fujitsu.so
+lib/sane/libsane-fujitsu.so.1
%%GPHOTO2%%lib/sane/libsane-gphoto2.a
%%GPHOTO2%%lib/sane/libsane-gphoto2.so
%%GPHOTO2%%lib/sane/libsane-gphoto2.so.1
lib/sane/libsane-hp.a
lib/sane/libsane-hp.so
lib/sane/libsane-hp.so.1
-lib/sane/libsane-m3096g.a
-lib/sane/libsane-m3096g.so
-lib/sane/libsane-m3096g.so.1
+lib/sane/libsane-leo.a
+lib/sane/libsane-leo.so
+lib/sane/libsane-leo.so.1
+lib/sane/libsane-matsushita.a
+lib/sane/libsane-matsushita.so
+lib/sane/libsane-matsushita.so.1
lib/sane/libsane-microtek.a
lib/sane/libsane-microtek.so
lib/sane/libsane-microtek.so.1
@@ -130,6 +149,9 @@ lib/sane/libsane-ricoh.so.1
lib/sane/libsane-s9036.a
lib/sane/libsane-s9036.so
lib/sane/libsane-s9036.so.1
+lib/sane/libsane-sceptre.a
+lib/sane/libsane-sceptre.so
+lib/sane/libsane-sceptre.so.1
lib/sane/libsane-sharp.a
lib/sane/libsane-sharp.so
lib/sane/libsane-sharp.so.1
@@ -148,6 +170,12 @@ lib/sane/libsane-st400.so.1
lib/sane/libsane-tamarack.a
lib/sane/libsane-tamarack.so
lib/sane/libsane-tamarack.so.1
+lib/sane/libsane-teco1.a
+lib/sane/libsane-teco1.so
+lib/sane/libsane-teco1.so.1
+lib/sane/libsane-test.a
+lib/sane/libsane-test.so
+lib/sane/libsane-test.so.1
lib/sane/libsane-umax.a
lib/sane/libsane-umax.so
lib/sane/libsane-umax.so.1
@@ -177,7 +205,12 @@ sbin/saned
%%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/matsushita/matsushita.txt
%%PORTDOCS%%share/doc/sane/mustek/mustek.CHANGES
+%%PORTDOCS%%share/doc/sane/mustek_usb/mustek_usb.CHANGES
+%%PORTDOCS%%share/doc/sane/mustek_usb/mustek_usb.TODO
+%%PORTDOCS%%share/doc/sane/sceptre/s1200.txt
+%%PORTDOCS%%share/doc/sane/teco/teco1.txt
%%PORTDOCS%%share/doc/sane/umax/sane-logo.jpg
%%PORTDOCS%%share/doc/sane/umax/sane-logo2.jpg
%%PORTDOCS%%share/doc/sane/umax/sane-umax-advanced-options-doc.html
@@ -212,7 +245,11 @@ sbin/saned
%%PORTDOCS%%share/doc/sane/umax/umax.FAQ
%%PORTDOCS%%share/doc/sane/umax/umax.TODO
%%PORTDOCS%%@dirrm share/doc/sane/umax
+%%PORTDOCS%%@dirrm share/doc/sane/teco
+%%PORTDOCS%%@dirrm share/doc/sane/sceptre
+%%PORTDOCS%%@dirrm share/doc/sane/mustek_usb
%%PORTDOCS%%@dirrm share/doc/sane/mustek
+%%PORTDOCS%%@dirrm share/doc/sane/matsushita
%%PORTDOCS%%@dirrm share/doc/sane/canon
%%PORTDOCS%%@dirrm share/doc/sane
@dirrm lib/sane