[pkgsrc/trunk]: pkgsrc/comms/obexftp Update to 0.20 (latest stable version):

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/comms/obexftp Update to 0.20 (latest stable version):
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:45:44 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c95cae836d0
branches:  trunk
changeset: 516201:1c95cae836d0
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Jul 17 12:29:57 2006 +0000

description:
Update to 0.20 (latest stable version):

Changes:

* Motorola support, tested with models v710/e815
* object caching and directory parsing (for things like ObexFS)
* Nokia support via IrDA and Bluetooth
* Siemens S65 support
* Everything but data goes to stderr for more simple redirection.
* VMO converter (gsm and wav) split into seperate package.
* Ericsson and Siemens cable support unified (still testing).

pkgsrc changes:

* NetBSD bluetooth support, thanks to Iain Hibbert for finishing it.

diffstat:

 comms/obexftp/Makefile         |   28 ++++-
 comms/obexftp/PLIST            |   19 +--
 comms/obexftp/distinfo         |   26 ++--
 comms/obexftp/patches/patch-aa |   70 ++++++++++--
 comms/obexftp/patches/patch-ab |   27 ++--
 comms/obexftp/patches/patch-ac |   34 ++++-
 comms/obexftp/patches/patch-ad |   36 ++++-
 comms/obexftp/patches/patch-ae |   25 ++--
 comms/obexftp/patches/patch-af |   29 +++-
 comms/obexftp/patches/patch-ag |   27 +++-
 comms/obexftp/patches/patch-ah |   13 ++
 comms/obexftp/patches/patch-ai |   30 +++++
 comms/obexftp/patches/patch-aj |  218 +++++++++++++++++++++++++++++++++++++++++
 comms/obexftp/patches/patch-ak |   63 +++++++++++
 14 files changed, 540 insertions(+), 105 deletions(-)

diffs (truncated from 738 to 300 lines):

diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/Makefile
--- a/comms/obexftp/Makefile    Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/Makefile    Mon Jul 17 12:29:57 2006 +0000
@@ -1,17 +1,33 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/07/17 12:29:57 xtraeme Exp $
 #
 
-DISTNAME=      obexftp-0.10.3
-PKGREVISION=   2
+DISTNAME=      obexftp-0.20
 CATEGORIES=    comms
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openobex/}
+EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    xtraeme%NetBSD.org@localhost
 HOMEPAGE=      http://triq.net/obex/
 COMMENT=       File copying over the Object Exchange (OBEX) protocol
 
-GNU_CONFIGURE= YES
-USE_LIBTOOL=   YES
+GNU_CONFIGURE= yes
+USE_TOOLS+=    autoconf gmake pkg-config
+USE_LIBTOOL=   yes
+
+CONFIGURE_ARGS+=       --disable-perl
+CONFIGURE_ARGS+=       --disable-python
+CONFIGURE_ARGS+=       --disable-swig
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h))
+CPPFLAGS+=             -DCOMPAT_BLUEZ
+.endif
+
+post-patch:
+       cd ${WRKSRC} && autoconf
 
 .include "../../comms/openobex/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libusb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/PLIST
--- a/comms/obexftp/PLIST       Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/PLIST       Mon Jul 17 12:29:57 2006 +0000
@@ -1,21 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:21 jlam Exp $
-bin/gsm2vmo
+@comment $NetBSD: PLIST,v 1.3 2006/07/17 12:29:57 xtraeme Exp $
 bin/obexftp
-bin/vmo2gsm
-bin/vmo2wav
+bin/obexftpd
 include/bfb/bfb.h
 include/bfb/bfb_io.h
-include/cobexbfb/cobex_bfb.h
-include/cobexpe/cobex_pe.h
+include/multicobex/multi_cobex.h
 include/obexftp/client.h
 include/obexftp/obexftp.h
 include/obexftp/object.h
+include/obexftp/uuid.h
 lib/libbfb.la
-lib/libcobexbfb.la
-lib/libcobexpe.la
+lib/libmulticobex.la
 lib/libobexftp.la
-man/man1/flexmem.1
+man/man1/obexftp.1
+man/man1/obexftpd.1
 @dirrm include/obexftp
-@dirrm include/cobexpe
-@dirrm include/cobexbfb
+@dirrm include/multicobex
 @dirrm include/bfb
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/distinfo
--- a/comms/obexftp/distinfo    Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/distinfo    Mon Jul 17 12:29:57 2006 +0000
@@ -1,12 +1,16 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:05:30 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/07/17 12:29:57 xtraeme Exp $
 
-SHA1 (obexftp-0.10.3.tar.gz) = 7f8756597e4660f71147a60fd5a5dc79a55e6cc6
-RMD160 (obexftp-0.10.3.tar.gz) = 25fae7ba0da9a3925cd0a405611c0f705676b11e
-Size (obexftp-0.10.3.tar.gz) = 286083 bytes
-SHA1 (patch-aa) = a00bd78a2fe83d7758b7b4b42cf8a09e4167d854
-SHA1 (patch-ab) = 75005d57e2ef1ae2594b2513ab5235018dab0b4f
-SHA1 (patch-ac) = e41b1d6b1ede9c27f3e238b708b17acbab953e28
-SHA1 (patch-ad) = cf3ce3b10d4f35cb01f52b89c1d0636bd23ec1f6
-SHA1 (patch-ae) = 8f97189137675fb6ba34ec8253f6e34bf72e111f
-SHA1 (patch-af) = a18813e45590ecdc5b7402320f1e3c08daadd788
-SHA1 (patch-ag) = 6183be32c1485854be6732d28b1c87cf73e48211
+SHA1 (obexftp-0.20.tar.bz2) = 0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82
+RMD160 (obexftp-0.20.tar.bz2) = ded5cf4d95eac77d5f6ee0a39f3789eb962534ed
+Size (obexftp-0.20.tar.bz2) = 351641 bytes
+SHA1 (patch-aa) = 7caed98158f6c17c3f3f64f3058f66abcf219559
+SHA1 (patch-ab) = d4693413a992f53f6aca92d9e920185c1b5e4f0e
+SHA1 (patch-ac) = d06b6be98745778e2ce8e97762c102d4dbccecfc
+SHA1 (patch-ad) = 8c3b99cbc2f45fe039aae000aeebb2d5779355f9
+SHA1 (patch-ae) = 276fa421e2f20784cbcb873b0ce6870bef71d033
+SHA1 (patch-af) = 4de53a6ec0d711f948980cdfdd4adea3928b64bd
+SHA1 (patch-ag) = e61fdbba340af591318b1aa3b70272a969e01e70
+SHA1 (patch-ah) = c0fe5bd78e7614a7eb6adb7154676fd9bde7a31c
+SHA1 (patch-ai) = 9080e819a0855b591f613a0482e7297332922101
+SHA1 (patch-aj) = c563733a616ec0ad5b94a3ff8de5e3a2e91ccd5b
+SHA1 (patch-ak) = 276e1f41d784b50b29c0b2c2e08f47c040ab4ad7
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/patches/patch-aa
--- a/comms/obexftp/patches/patch-aa    Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/patches/patch-aa    Mon Jul 17 12:29:57 2006 +0000
@@ -1,16 +1,56 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/26 12:50:45 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
 
---- bfb/bfb_io.c.orig  2003-04-11 12:34:10.000000000 +0200
-+++ bfb/bfb_io.c
-@@ -272,8 +272,10 @@ void bfb_io_close(fd_t fd, int force)
-               /* Send a break to get out of OBEX-mode */
- #ifdef _WIN32
-               if(SetCommBreak(fd) != TRUE)    {
--#else
-+#elif defined(TCSBRKP)
-               if(ioctl(fd, TCSBRKP, 0) < 0)   {
-+#else
-+              if(tcsendbreak(fd, 0) == -1)    {
- #endif
-                       DEBUG(1, "Unable to send break!\n");
-               }
+--- aclocal.m4.orig    2006-05-16 15:50:36.000000000 +0100
++++ aclocal.m4
+@@ -56,6 +56,9 @@ if test "$ac_bluetooth_enabled" = yes; t
+                               #ifdef __FreeBSD__
+                               #include <sys/types.h>
+                               #include <bluetooth.h>
++                              #elif defined(__NetBSD__)
++                              #include <bluetooth.h>
++                              #include <netbt/rfcomm.h>
+                               #else /* Linux */
+                               #include <sys/socket.h>
+                               #include <bluetooth/bluetooth.h>
+@@ -65,6 +68,9 @@ if test "$ac_bluetooth_enabled" = yes; t
+                               #ifdef __FreeBSD__
+                               bdaddr_t bdaddr;
+                               struct sockaddr_rfcomm addr;
++                              #elif defined(__NetBSD__)
++                              bdaddr_t bdaddr;
++                              struct sockaddr_bt addr;
+                               #else /* Linux */
+                               bdaddr_t bdaddr;
+                               struct sockaddr_rc addr;
+@@ -76,6 +82,7 @@ if test "$ac_bluetooth_enabled" = yes; t
+               AC_DEFINE([HAVE_BLUETOOTH], [1], [Define if system supports Bluetooth and it's enabled])
+               BLUETOOTH_CFLAGS=""
+               BLUETOOTH_LIBS="-lbluetooth"
++              AC_CHECK_LIB(sdp, sdp_open, BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp")
+       fi
+       AC_SUBST(BLUETOOTH_CFLAGS)
+       AC_SUBST(BLUETOOTH_LIBS)
+@@ -92,14 +99,22 @@ AC_DEFUN([SDPLIB_CHECK],[
+       AC_MSG_CHECKING(for Bluetooth SDP support)
+ 
+       AC_TRY_COMPILE( [
++                              #ifdef __NetBSD__
++                              #include <bluetooth.h>
++                              #include <sdp.h>
++                              #else
+                               #include <bluetooth/sdp.h>
++                              #endif
+                       ],[
++                              #ifdef __NetBSD__
++                              sdp_attr_t attr;
++                              #else
+                               sdp_list_t sdplist;
++                              #endif
+                       ],
+                               am_cv_sdplib_found=yes,
+                               am_cv_sdplib_found=no
+                       )
+-
+       if test $am_cv_sdplib_found = yes; then
+               AC_DEFINE(HAVE_SDPLIB,1,[Define if system supports Bluetooth SDP])
+ 
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/patches/patch-ab
--- a/comms/obexftp/patches/patch-ab    Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/patches/patch-ab    Mon Jul 17 12:29:57 2006 +0000
@@ -1,16 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/26 12:50:45 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
 
---- cobexpe/cobex_pe.c.orig    2003-04-10 00:37:02.000000000 +0200
-+++ cobexpe/cobex_pe.c
-@@ -151,7 +151,11 @@ static void cobex_pe_cleanup(cobex_t *c,
+--- multicobex/multi_cobex.c.orig      2005-11-24 15:55:11.000000000 +0100
++++ multicobex/multi_cobex.c   2006-07-09 12:21:14.000000000 +0200
+@@ -49,6 +49,14 @@
+ #include <termios.h>
+ #endif
  
-       if(force)       {
-               /* Send a break to get out of OBEX-mode */
-+#ifdef TCSBRKP
-               if(ioctl(c->fd, TCSBRKP, 0) < 0)        {
++#ifdef HAVE_BLUETOOTH
++#ifdef __NetBSD__
++#include <bluetooth.h>
 +#else
-+              if(tcsendbreak(c->fd, 0) == -1)         {
++#include <bluetooth/bluetooth.h>
 +#endif
-                       DEBUG(1, "Unable to send break!\n");
-               }
-               sleep(1);
++#endif /* HAVE_BLUETOOTH */
++
+ #include <openobex/obex.h>
+ #include "multi_cobex.h"
+ #include "multi_cobex_private.h"
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/patches/patch-ac
--- a/comms/obexftp/patches/patch-ac    Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/patches/patch-ac    Mon Jul 17 12:29:57 2006 +0000
@@ -1,12 +1,26 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/02/26 12:50:45 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
 
---- obexftp/client.c.orig      2003-02-16 19:56:31.000000000 +0100
-+++ obexftp/client.c
-@@ -24,6 +24,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <limits.h>
+--- obexftp/object.h.orig      2005-09-13 16:53:20.000000000 +0200
++++ obexftp/object.h   2006-07-09 12:45:14.000000000 +0200
+@@ -22,7 +22,21 @@
+ #ifndef OBEXFTP_OBJECT_H
+ #define OBEXFTP_OBJECT_H
  
- /* htons */
- #ifdef _WIN32
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <inttypes.h>
++#include <sys/types.h>
++
++#ifdef HAVE_BLUETOOTH
++#ifdef __NetBSD__
++#include <bluetooth.h>
++#else
++#include <bluetooth/bluetooth.h>
++#endif
++#endif /* HAVE_BLUETOOTH */
++
+ #include <openobex/obex.h>
+ 
+ #ifdef __cplusplus
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/patches/patch-ad
--- a/comms/obexftp/patches/patch-ad    Mon Jul 17 11:20:09 2006 +0000
+++ b/comms/obexftp/patches/patch-ad    Mon Jul 17 12:29:57 2006 +0000
@@ -1,12 +1,28 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/02/26 12:50:45 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2006/07/17 12:29:57 xtraeme Exp $
 
---- obexftp/dirtraverse.c.orig 2003-01-15 23:52:47.000000000 +0100
-+++ obexftp/dirtraverse.c
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <limits.h>
+--- obexftp/client.h.orig      2006-01-11 16:22:51.000000000 +0100
++++ obexftp/client.h   2006-07-09 12:39:10.000000000 +0200
+@@ -22,9 +22,23 @@
+ #ifndef OBEXFTP_CLIENT_H
+ #define OBEXFTP_CLIENT_H
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <inttypes.h>
  #include <sys/stat.h>
- #include <sys/types.h>
- #ifdef _WIN32
++#include <sys/types.h>
+ #include <time.h>
++
++#ifdef HAVE_BLUETOOTH
++#ifdef __NetBSD__
++#include <bluetooth.h>
++#else
++#include <bluetooth/bluetooth.h>
++#endif
++#endif /* HAVE_BLUETOOTH */
++
+ #include <openobex/obex.h>
+ #ifndef OBEX_TRANS_USB
+ #define OBEX_TRANS_USB                6
diff -r 5801a2a12e4b -r 1c95cae836d0 comms/obexftp/patches/patch-ae
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note net/lftp update.
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Reworked the way that .include ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note net/lftp update.
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Reworked the way that .include ...
Indexes:
Home | Main Index | Thread Index | Old Index