[22751] trunk/dports/graphics/sane-backends

[source_changes at macosforge.org]

Revision: 22751
          http://trac.macosforge.org/projects/macports/changeset/22751
Author:   takanori at macports.org
Date:     2007-03-13 07:08:35 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
* Version bump to sane-backends 1.0.18.
* Add new variant +with_gphoto2.
* Enable local-backends by default.
* Remove hyphen from variant names, like:
  - local-backends -> disable_localbackends
  - pnm-backend -> enable_pnmbackend
Ticket:		   #11507

Modified Paths:
--------------
    trunk/dports/graphics/sane-backends/Portfile
    trunk/dports/graphics/sane-backends/files/patch-configure

Added Paths:
-----------
    trunk/dports/graphics/sane-backends/files/patch-backend_dell1600n_net.c

Modified: trunk/dports/graphics/sane-backends/Portfile
===================================================================
--- trunk/dports/graphics/sane-backends/Portfile	2007-03-13 14:07:02 UTC (rev 22750)
+++ trunk/dports/graphics/sane-backends/Portfile	2007-03-13 14:08:35 UTC (rev 22751)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name            sane-backends
-version         1.0.17
+version         1.0.18
 categories      graphics
 maintainers     hama at hamazone.de
 description     Backends for scanner access
@@ -14,25 +14,45 @@
                  locally or remote using saned.
 
 master_sites    ftp://ftp.sane-project.org/pub/sane/${distname}/ \
-				http://alioth.debian.org/download.php/1347/
+                ftp://ftp.sane-project.org/pub/sane/old-versions/${distname}/ \
+                http://alioth.debian.org/frs/download.php/1347/
 
-checksums       md5 b51c10da8a81a04e1bae88c9e6556df2 \
-				sha1 a73e01575458a5fb7dc265cea50c6740555e1711 \
-				rmd160 43e440712e9da676e235dc6148c5dda347c30e22
+checksums       md5 7ca7e2908e24721471de92cf40c75e60 \
+                sha1 f4c360b87ced287e4015a0dafd766ad885c539e1 \
+                rmd160 aa863adff417d7c33cbb85c193878aa54a056100
 
-patchfiles      patch-configure
+patchfiles      patch-configure \
+                patch-backend_dell1600n_net.c
 
-depends_lib     lib:libjpeg:jpeg
+depends_lib     port:jpeg \
+                port:libusb \
+                port:tiff \
+                port:zlib
 
 configure.env   LDFLAGS="-L${prefix}/lib" \
                 CPPFLAGS="-I${prefix}/include -no-cpp-precomp -fno-common"
+configure.args  --mandir=${prefix}/share/man \
+                --enable-local-backends --enable-libusb \
+                --without-gphoto2
 
-configure.args  --mandir=${prefix}/share/man --without-gphoto2 \
-                --disable-local-backends
+#turn off compilation of all backends but net
+variant disable_localbackends conflicts enable_pnmbackend with_gphoto2 {
+    depends_lib-delete      port:libusb
+    configure.args-delete   --enable-local-backends --enable-libusb
+    configure.args-append   --disable-local-backends --disable-libusb
+}
 
-default_variants        +local-backends
+#enable the pnm backend for testing frontends
+#(possible security risk, see PROBLEMS file)
+variant enable_pnmbackend conflicts disable_localbackends {
+    configure.args-append   --enable-pnm-backend
+}
 
-variant local-backends {        depends_lib-append      lib:libusb:libusb
-                configure.args-delete   --disable-local-backends }
-
-variant pnm-backend {   configure.args-append   --enable-pnm-backend }
+#include the gphoto2 backend
+variant with_gphoto2 conflicts disable_localbackends {
+    depends_lib-append      port:libexif \
+                            port:libgphoto2 \
+                            port:pkgconfig
+    configure.args-delete   --without-gphoto2
+    configure.args-append   --with-gphoto2
+}

Added: trunk/dports/graphics/sane-backends/files/patch-backend_dell1600n_net.c
===================================================================
--- trunk/dports/graphics/sane-backends/files/patch-backend_dell1600n_net.c	                        (rev 0)
+++ trunk/dports/graphics/sane-backends/files/patch-backend_dell1600n_net.c	2007-03-13 14:08:35 UTC (rev 22751)
@@ -0,0 +1,20 @@
+--- backend/dell1600n_net.c.orig	2006-06-20 06:07:52.000000000 +0900
++++ backend/dell1600n_net.c	2007-03-13 11:55:28.000000000 +0900
+@@ -73,6 +73,8 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
++#include <sys/time.h>
++
+ #include <jpeglib.h>
+ #include <tiffio.h>
+ 
+@@ -1762,7 +1764,7 @@
+ ProcessPageData (struct ScannerState *pState)
+ {
+ 
+-  char tempFilename[TMP_MAX] = "scan.dat";
++  char tempFilename[L_tmpnam] = "scan.dat";
+   FILE *fTmp;
+   int fdTmp;
+   struct jpeg_source_mgr jpegSrcMgr;

Modified: trunk/dports/graphics/sane-backends/files/patch-configure
===================================================================
--- trunk/dports/graphics/sane-backends/files/patch-configure	2007-03-13 14:07:02 UTC (rev 22750)
+++ trunk/dports/graphics/sane-backends/files/patch-configure	2007-03-13 14:08:35 UTC (rev 22751)
@@ -1,6 +1,6 @@
---- configure~	2005-12-18 22:16:04.000000000 +0900
-+++ configure	2006-04-21 04:09:55.000000000 +0900
-@@ -3437,7 +3437,7 @@
+--- configure.orig	2006-07-03 07:22:09.000000000 +0900
++++ configure	2007-03-13 11:17:14.000000000 +0900
+@@ -4138,7 +4138,7 @@
        LDFLAGS="$LDFLAGS -Wl,-brtl"
        ;;
      darwin*) #include frameworks

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070313/9937b113/attachment.html