diff options
| author | hans <hans@pkgsrc.org> | 2012-02-16 17:35:30 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-02-16 17:35:30 +0000 |
| commit | caf46b4e91801916692951ab015b7c4bee5058ba (patch) | |
| tree | 4c2da346df0aa2bf17cd6f8a89f43964ba09831e /comms/obexftp | |
| parent | 76a9a6328f89f3982d45c5b111a5082c08b5ca90 (diff) | |
| download | pkgsrc-caf46b4e91801916692951ab015b7c4bee5058ba.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'comms/obexftp')
| -rw-r--r-- | comms/obexftp/Makefile | 4 | ||||
| -rw-r--r-- | comms/obexftp/distinfo | 4 | ||||
| -rw-r--r-- | comms/obexftp/patches/patch-ai | 36 |
3 files changed, 37 insertions, 7 deletions
diff --git a/comms/obexftp/Makefile b/comms/obexftp/Makefile index 7912a0af649..6935a8b674f 100644 --- a/comms/obexftp/Makefile +++ b/comms/obexftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/07/20 05:56:02 hasso Exp $ +# $NetBSD: Makefile,v 1.14 2012/02/16 17:40:29 hans Exp $ # DISTNAME= obexftp-0.20 @@ -21,6 +21,8 @@ CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-swig +LIBS.SunOS+= -lsocket -lnsl -liconv + .include "../../mk/bsd.prefs.mk" .if ((${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) || ${OPSYS} == "DragonFly") diff --git a/comms/obexftp/distinfo b/comms/obexftp/distinfo index 7dca8d9e400..04805596d00 100644 --- a/comms/obexftp/distinfo +++ b/comms/obexftp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2009/07/20 05:56:02 hasso Exp $ +$NetBSD: distinfo,v 1.8 2012/02/16 17:40:29 hans Exp $ SHA1 (obexftp-0.20.tar.bz2) = 0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82 RMD160 (obexftp-0.20.tar.bz2) = ded5cf4d95eac77d5f6ee0a39f3789eb962534ed @@ -11,7 +11,7 @@ SHA1 (patch-ae) = d08fd3b4aa5e2f61eda5ea6d3f6656f8b036af30 SHA1 (patch-af) = f1e96b8a15a4fec69b81d19635a674ee307d31c1 SHA1 (patch-ag) = 7a3f10354e8a86022cac360b8a36198d9e7449ab SHA1 (patch-ah) = c0fe5bd78e7614a7eb6adb7154676fd9bde7a31c -SHA1 (patch-ai) = 8baf3463303156e890316622ddeb011842acaa85 +SHA1 (patch-ai) = dca54c345dba0977f1bf90778e15cdd4676749ca SHA1 (patch-aj) = 26f6509d26aaa893fe6018bd048135fb077e0b9c SHA1 (patch-ak) = bdef026206a0dca2c4781b06bbdfdd90f1c934f6 SHA1 (patch-al) = 1f2dd6ed302711f17e33584cc34f6f674a6973c7 diff --git a/comms/obexftp/patches/patch-ai b/comms/obexftp/patches/patch-ai index 79ac585c893..bd4659c6ee9 100644 --- a/comms/obexftp/patches/patch-ai +++ b/comms/obexftp/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ +$NetBSD: patch-ai,v 1.4 2012/02/16 17:40:29 hans Exp $ --- apps/obexftpd.c.orig 2006-04-13 07:57:55.000000000 +0200 +++ apps/obexftpd.c @@ -28,7 +28,35 @@ $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ /* just until there is a server layer in obexftp */ #include <openobex/obex.h> -@@ -934,16 +946,21 @@ static void start_server(int transport) +@@ -56,6 +68,8 @@ + + #include "obexftp_sdp.h" + ++#define DEFFILEMOD (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) /* 0644 */ ++ + /* define this to "", "\r\n" or "\n" */ + #define EOLCHARS "\n" + +@@ -72,7 +86,9 @@ + + //BEGIN of constant + ++#ifdef HAVE_BLUETOOTH + bdaddr_t *bt_src = NULL; ++#endif + char *device = NULL; + int channel = 10; /* OBEX_PUSH_HANDLE */ + +@@ -698,7 +714,7 @@ static int safe_save_file(char *name, co + #ifdef _WIN32 + fd = open(filename, O_RDWR | O_CREAT, 0); + #else +- fd = open(filename, O_RDWR | O_CREAT, DEFFILEMODE); ++ fd = open(filename, O_RDWR | O_CREAT, DEFFILEMOD); + #endif + + if ( fd < 0) { +@@ -934,16 +950,21 @@ static void start_server(int transport) exit(0); } @@ -60,7 +88,7 @@ $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ reset: handle = OBEX_Init(transport, obex_event, 0); -@@ -963,12 +980,14 @@ reset: +@@ -963,12 +984,14 @@ reset: exit(-1); } break; @@ -75,7 +103,7 @@ $NetBSD: patch-ai,v 1.3 2009/07/20 05:56:03 hasso Exp $ case OBEX_TRANS_IRDA: if (0 > IrOBEX_ServerRegister(handle, "")) { perror("failed to register IrDA server"); -@@ -1002,11 +1021,13 @@ reset: +@@ -1002,11 +1025,13 @@ reset: goto reset; } |