diff options
| author | lawrance <lawrance@FreeBSD.org> | 2005-12-08 19:19:54 +0800 |
|---|---|---|
| committer | lawrance <lawrance@FreeBSD.org> | 2005-12-08 19:19:54 +0800 |
| commit | 566de5957f9ee5dde4d0ad451a4c5d7642f1acf1 (patch) | |
| tree | 146c3e84f0c7401fd7fee9f69d6e8687185ce00a /comms/gammu-devel/files | |
| parent | eb6bf778c4505e063f3b67c1610d9a5a438633ed (diff) | |
| download | freebsd-ports-gnome-566de5957f9ee5dde4d0ad451a4c5d7642f1acf1.tar.gz freebsd-ports-gnome-566de5957f9ee5dde4d0ad451a4c5d7642f1acf1.tar.zst freebsd-ports-gnome-566de5957f9ee5dde4d0ad451a4c5d7642f1acf1.zip | |
Update to 1.03.0
PR: ports/89648
Submitted by: Boris B. Samorodov <bsam@ipt.ru>
Approved by: kirill@solaris.ru (maintainer, timeout 14+ days)
Diffstat (limited to 'comms/gammu-devel/files')
| -rw-r--r-- | comms/gammu-devel/files/patch-bluetooth | 12 | ||||
| -rw-r--r-- | comms/gammu-devel/files/patch-cfg-Makefile.glo | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth index 1e698a060071..c841c156b5de 100644 --- a/comms/gammu-devel/files/patch-bluetooth +++ b/comms/gammu-devel/files/patch-bluetooth @@ -1,6 +1,5 @@ -diff -ru ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c ---- ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c Thu Mar 10 10:35:58 2005 -+++ common/device/bluetoth/bluez.c Sat Jul 9 12:46:07 2005 +--- common/device/bluetoth/bluez.c.orig Wed Sep 14 21:47:08 2005 ++++ common/device/bluetoth/bluez.c Wed Nov 23 22:11:16 2005 @@ -23,6 +23,8 @@ #ifdef GSM_ENABLE_BLUETOOTHDEVICE #ifdef GSM_ENABLE_BLUEZ @@ -10,7 +9,7 @@ diff -ru ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c common/device/bluet #include <stdlib.h> #include <stdio.h> #include <fcntl.h> -@@ -31,10 +33,7 @@ +@@ -31,11 +33,7 @@ #include <sys/socket.h> #include <sys/time.h> #include <unistd.h> @@ -18,11 +17,12 @@ diff -ru ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c common/device/bluet -#include <bluetooth/rfcomm.h> -#include <bluetooth/sdp.h> -#include <bluetooth/sdp_lib.h> +-#include <bluetooth/hci_lib.h> +#include <bluetooth.h> #include "../../gsmcomon.h" #include "../devfunc.h" -@@ -43,21 +42,21 @@ +@@ -44,21 +42,21 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device) { GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth; @@ -49,7 +49,7 @@ diff -ru ../gammu-1.01.0.orig/common/device/bluetoth/bluez.c common/device/bluet if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) { dbgprintf("Can't bind socket\n"); -@@ -66,9 +65,9 @@ +@@ -67,9 +65,9 @@ } str2ba(device, &bdaddr); diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.glo b/comms/gammu-devel/files/patch-cfg-Makefile.glo index 16ef31ad91d2..c2a88cd1ae03 100644 --- a/comms/gammu-devel/files/patch-cfg-Makefile.glo +++ b/comms/gammu-devel/files/patch-cfg-Makefile.glo @@ -9,15 +9,6 @@ $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU) @echo Linking gammu -@@ -136,7 +136,7 @@ - - $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR): $(COMMON) - @echo Linking libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) -- @$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON) -+ @$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON) - @$(LN) -s libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR) - @$(LN) -s libGammu.so.$(SONAME_MAJOR) $(TOPDIR)/common/libGammu.so - @@ -225,12 +225,14 @@ @$(INSTALL) -m 0644 $(TOPDIR)/changelog $(DESTDIR)$(INSTALL_DOC_DIR) @$(INSTALL) -m 0644 $(TOPDIR)/readme.txt $(DESTDIR)$(INSTALL_DOC_DIR) |