diff options
author | markd <markd> | 2007-02-05 20:03:19 +0000 |
---|---|---|
committer | markd <markd> | 2007-02-05 20:03:19 +0000 |
commit | 8f928035f3eb053313a534202895da1174514ae0 (patch) | |
tree | 2cfbd78ec2f62f463307f9cd0621f5cb385b650d /devel | |
parent | 1e09c8f5d989130638c3de7c9588bc7b70717cba (diff) | |
download | pkgsrc-8f928035f3eb053313a534202895da1174514ae0.tar.gz |
Fix build on Solaris.
- There is no configure test for limits.h, just use it.
- M_READ is a define pulled in from system headers
- s/= =/=/ in a Makefile
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libgphoto2/distinfo | 5 | ||||
-rw-r--r-- | devel/libgphoto2/patches/patch-ad | 14 | ||||
-rw-r--r-- | devel/libgphoto2/patches/patch-ae | 49 | ||||
-rw-r--r-- | devel/libgphoto2/patches/patch-af | 13 |
4 files changed, 80 insertions, 1 deletions
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo index 83761b83eb9..24589737c96 100644 --- a/devel/libgphoto2/distinfo +++ b/devel/libgphoto2/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.9 2007/01/02 18:32:47 adam Exp $ +$NetBSD: distinfo,v 1.10 2007/02/05 20:03:19 markd Exp $ SHA1 (libgphoto2-2.3.1.tar.bz2) = 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97 RMD160 (libgphoto2-2.3.1.tar.bz2) = ab678a5006a89ef1fe9f052dac1f9738961cc3a8 Size (libgphoto2-2.3.1.tar.bz2) = 3230934 bytes SHA1 (patch-ab) = 921eea83471110dd85197a7171278c7d0556536b SHA1 (patch-ac) = f5d3e72163f6de85c4e5a9b5f4b32d8d628e7b30 +SHA1 (patch-ad) = 270c6f9a655631bc8d43a8d66851e902ea5ea8a5 +SHA1 (patch-ae) = 782807e35b748d80ad4bb8306eb576742d9e6f69 +SHA1 (patch-af) = b0dccb67bf51ad7570438ba8f65d0187f5fd4b17 diff --git a/devel/libgphoto2/patches/patch-ad b/devel/libgphoto2/patches/patch-ad new file mode 100644 index 00000000000..0364e21bf0c --- /dev/null +++ b/devel/libgphoto2/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1 2007/02/05 20:03:19 markd Exp $ + +--- camlibs/digita/digita.c.orig 2007-02-03 18:19:59.857410000 +1300 ++++ camlibs/digita/digita.c +@@ -26,9 +26,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <string.h> +-#ifdef HAVE_LIMITS_H + #include <limits.h> +-#endif + #ifdef OS2 + #include <db.h> + #endif diff --git a/devel/libgphoto2/patches/patch-ae b/devel/libgphoto2/patches/patch-ae new file mode 100644 index 00000000000..e32963cd0c6 --- /dev/null +++ b/devel/libgphoto2/patches/patch-ae @@ -0,0 +1,49 @@ +$NetBSD: patch-ae,v 1.1 2007/02/05 20:03:19 markd Exp $ + +--- camlibs/mars/mars.c.orig 2007-02-03 18:30:12.430858000 +1300 ++++ camlibs/mars/mars.c +@@ -38,7 +38,7 @@ + #define GET_DATA 0x0f + + static int +-M_READ (GPPort *port, char *data, int size) ++Ma_READ (GPPort *port, char *data, int size) + { + gp_port_write(port, "\x21", 1); + gp_port_read(port, data, 16); +@@ -49,7 +49,7 @@ static int + M_COMMAND (GPPort *port, char *command, int size, char *response) + { + gp_port_write(port, command, size); +- M_READ(port, response, 16); ++ Ma_READ(port, response, 16); + return GP_OK; + } + +@@ -68,7 +68,7 @@ mars_init (Camera *camera, GPPort *port, + * camera reports 0x02 it is "jammed" and we must clear it. + */ + +- M_READ(port, c, 16); ++ Ma_READ(port, c, 16); + if ( (c[0] == 0x02 ) ) { + gp_port_write(port, "\x19", 1); + gp_port_read(port, c, 16); +@@ -317,7 +317,7 @@ mars_routine (Info *info, GPPort *port, + memset(c,0,sizeof(c)); + + /*Routine used in initialization, photo download, and reset. */ +- M_READ(port, c, 16); ++ Ma_READ(port, c, 16); + M_COMMAND(port, start, 2, c); + M_COMMAND(port, do_something, 2, c); + M_COMMAND(port, address1, 2, c); +@@ -326,7 +326,7 @@ mars_routine (Info *info, GPPort *port, + gp_port_write(port, address2, 2); + /* Moving the memory cursor to the given address? */ + while (( c[0] != 0xa) ) { +- M_READ(port, c, 16); ++ Ma_READ(port, c, 16); + } + + M_COMMAND(port, address3, 2, c); diff --git a/devel/libgphoto2/patches/patch-af b/devel/libgphoto2/patches/patch-af new file mode 100644 index 00000000000..43dd45b5c60 --- /dev/null +++ b/devel/libgphoto2/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2007/02/05 20:03:19 markd Exp $ + +--- camlibs/enigma13/Makefile.in.orig 2007-02-03 19:22:41.363815000 +1300 ++++ camlibs/enigma13/Makefile.in +@@ -288,7 +288,7 @@ utilsdir = @utilsdir@ + camlib_LTLIBRARIES = enigma13.la + EXTRA_DIST = STATUS protocol.txt README.enigma13 + enigma13_la_SOURCES = enigma13.c +-enigma13_la_LDFLAGS = = -module -no-undefined -avoid-version -export-dynamic \ ++enigma13_la_LDFLAGS = -module -no-undefined -avoid-version -export-dynamic \ + -export-symbols $(top_srcdir)/camlibs/camlib.sym + + enigma13_la_DEPENDENCIES = $(top_srcdir)/camlibs/camlib.sym |