aboutsummaryrefslogtreecommitdiff
path: root/comms/gammu-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'comms/gammu-devel/files')
-rw-r--r--comms/gammu-devel/files/patch-bluetooth64
-rw-r--r--comms/gammu-devel/files/patch-cfg-Makefile.glo57
-rw-r--r--comms/gammu-devel/files/patch-common.device.devfunc.c11
-rw-r--r--comms/gammu-devel/files/patch-common.service.gsmmisc.c10
-rw-r--r--comms/gammu-devel/files/patch-configure.in79
5 files changed, 0 insertions, 221 deletions
diff --git a/comms/gammu-devel/files/patch-bluetooth b/comms/gammu-devel/files/patch-bluetooth
deleted file mode 100644
index c841c156b5de..000000000000
--- a/comms/gammu-devel/files/patch-bluetooth
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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
-
-+#define BDADDR_ANY NG_HCI_BDADDR_ANY
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <fcntl.h>
-@@ -31,11 +33,7 @@
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <unistd.h>
--#include <bluetooth/bluetooth.h>
--#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"
-@@ -44,21 +42,21 @@
- GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
- {
- GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
-- struct sockaddr_rc laddr, raddr;
-+ struct sockaddr_rfcomm laddr, raddr;
- bdaddr_t bdaddr;
- int fd;
-
- smprintf(s, "Connecting to RF channel %i\n",port);
-
-- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
-+ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
- if (fd < 0) {
- dbgprintf("Can't create socket\n");
- return ERR_DEVICENODRIVER;
- }
-
-- bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
-- laddr.rc_family = AF_BLUETOOTH;
-- laddr.rc_channel = 0;
-+ bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
-+ laddr.rfcomm_family = AF_BLUETOOTH;
-+ laddr.rfcomm_channel = 0;
-
- if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
- dbgprintf("Can't bind socket\n");
-@@ -67,9 +65,9 @@
- }
-
- str2ba(device, &bdaddr);
-- bacpy(&raddr.rc_bdaddr, &bdaddr);
-- raddr.rc_family = AF_BLUETOOTH;
-- raddr.rc_channel = port;
-+ bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
-+ raddr.rfcomm_family = AF_BLUETOOTH;
-+ raddr.rfcomm_channel = port;
-
- if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
- dbgprintf("Can't connect\n");
diff --git a/comms/gammu-devel/files/patch-cfg-Makefile.glo b/comms/gammu-devel/files/patch-cfg-Makefile.glo
deleted file mode 100644
index cd6c225165ac..000000000000
--- a/comms/gammu-devel/files/patch-cfg-Makefile.glo
+++ /dev/null
@@ -1,57 +0,0 @@
---- cfg/Makefile.glo.orig Fri Feb 23 23:50:00 2007
-+++ cfg/Makefile.glo Tue Apr 10 23:43:11 2007
-@@ -126,7 +126,7 @@
- # Add special flags for gammu binary
- @$(CC) -c $(CFLAGS) $(CPPFLAGS) $*.c -o $*.o $(if $(subst gammu/gammu.c,,$<),,$(GAMMU_CFLAGS))
-
--all: gammu
-+all: gammu shared
-
- $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
- @echo Linking gammu
-@@ -234,12 +234,14 @@
- @$(INSTALL) -m 0644 $(TOPDIR)/ChangeLog $(DESTDIR)$(INSTALL_DOC_DIR)
- @$(INSTALL) -m 0644 $(TOPDIR)/README $(DESTDIR)$(INSTALL_DOC_DIR)
- @$(INSTALL) -m 0644 $(TOPDIR)/COPYING $(DESTDIR)$(INSTALL_DOC_DIR)
-+
-+installman:
- @echo Installing man to $(DESTDIR)$(INSTALL_MAN_DIR)
- @$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_MAN_DIR)
- @$(INSTALL) -m 0644 $(TOPDIR)/docs/docs/english/gammu.1 $(DESTDIR)$(INSTALL_MAN_DIR)
- @$(RM) $(DESTDIR)$(INSTALL_DOC_DIR)/docs/english/gammu.1
-
--install: uninstall all installdocs installlocales installonly
-+install: uninstall all installdocs installman installlocales installlibonly
-
- installonly: all
- @echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -247,7 +249,7 @@
- @$(INSTALL) -m 0755 $(TOPDIR)/gammu/gammu $(DESTDIR)$(INSTALL_BIN_DIR)
-
- installshared: installlib
--installlib: uninstall makelib installdocs installlocales installlibonly
-+installlib: uninstall makelib installman installdocs installlocales installlibonly
-
- installlibonly: shared
- @echo Installing binaries to $(DESTDIR)$(INSTALL_BIN_DIR)
-@@ -256,8 +258,7 @@
-
- @echo Installing shared library to $(DESTDIR)$(INSTALL_LIB_DIR)
- @$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)
-- @$(INSTALL) -m 0755 $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)
-- @$(LN) -s $(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_MJR_NAME)
-+ @$(INSTALL) -m 0755 $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(DESTDIR)$(INSTALL_LIB_DIR)/libGammu.so.$(SONAME_MAJOR)
- @$(LN) -s $(LIBGAMMU_MJR_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)/$(LIBGAMMU_SHRTNAME)
-
- @echo Installing static library to $(DESTDIR)$(INSTALL_LIB_DIR)
-@@ -276,8 +277,8 @@
- @$(INSTALL) -m 0644 cfg/config.h $(DESTDIR)$(INSTALL_H_DIR)/config.h
-
- @echo Installing pkgconfig file
-- @$(INSTALL) -m 0755 -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-- @$(INSTALL) -m 0644 cfg/pkgconfig/gammu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+ @$(INSTALL) -m 0755 -d $(prefix)/libdata/pkgconfig
-+ @$(INSTALL) -m 0644 cfg/pkgconfig/gammu.pc $(prefix)/libdata/pkgconfig
-
- apidoc:
- @if test -z "$(DOXYGEN)" ; then \
diff --git a/comms/gammu-devel/files/patch-common.device.devfunc.c b/comms/gammu-devel/files/patch-common.device.devfunc.c
deleted file mode 100644
index 6dea7c02c241..000000000000
--- a/comms/gammu-devel/files/patch-common.device.devfunc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/device/devfunc.c.orig Fri Feb 23 23:50:01 2007
-+++ common/device/devfunc.c Tue Apr 10 23:46:39 2007
-@@ -18,6 +18,8 @@
-
- #include <string.h>
- #include <fcntl.h>
-+#include <sys/stat.h>
-+#include <sys/socket.h>
- #ifdef WIN32
- # include <io.h>
- #else
diff --git a/comms/gammu-devel/files/patch-common.service.gsmmisc.c b/comms/gammu-devel/files/patch-common.service.gsmmisc.c
deleted file mode 100644
index 4fd010de5d40..000000000000
--- a/comms/gammu-devel/files/patch-common.service.gsmmisc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/service/gsmmisc.c.orig Fri Dec 30 18:18:47 2005
-+++ common/service/gsmmisc.c Fri Dec 30 18:19:07 2005
-@@ -3,6 +3,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#include <sys/socket.h>
- #ifdef WIN32
- # include <io.h>
- # include <fcntl.h>
diff --git a/comms/gammu-devel/files/patch-configure.in b/comms/gammu-devel/files/patch-configure.in
deleted file mode 100644
index 1be761b36415..000000000000
--- a/comms/gammu-devel/files/patch-configure.in
+++ /dev/null
@@ -1,79 +0,0 @@
---- cfg/autoconf/configure.in.orig Tue Mar 8 19:16:22 2005
-+++ cfg/autoconf/configure.in Fri Nov 11 21:09:43 2005
-@@ -184,18 +184,18 @@
- fi
- fi
- if test "$gsm_blue_stack" = unknown ; then
-- AC_CHECK_HEADERS(bluetooth/bluetooth.h,
-- [gsm_blue_stack=Bluez
-+ AC_CHECK_HEADERS(bluetooth.h,
-+ [gsm_blue_stack=FreeBSD
- LDLIBS="$LDLIBS -lbluetooth"
- AC_CHECK_LIB(sdp, sdp_list_append, LDLIBS="$LDLIBS -lsdp")
- AC_DEFINE(GSM_ENABLE_BLUEZ)
- ])
- fi
-
-- dnl Path for Bluez bluetooth library
-+ dnl Path for FreeBSD bluetooth library
- gsm_bt_dir=""
- AC_ARG_WITH(bluedir,
-- [ --with-bluedir=DIR Specifies the base libbluetooth from Bluez],
-+ [ --with-bluedir=DIR Specifies the base libbluetooth from FreeBSD],
- [ if test x$withval = xyes; then
- AC_MSG_WARN(Usage is: --with-bluedir=DIR)
- else
-@@ -292,7 +292,7 @@
- [ --disable-bluefbus Disable Nokia FBUS2 over Bluetooth stack
- (Nokia 6210)],
- [gsm_enable_bluefbus2="no"],
-- [if test $gsm_blue_stack = Bluez; then
-+ [if test $gsm_blue_stack = FreeBSD; then
- AC_DEFINE(GSM_ENABLE_BLUEFBUS2)
- gsm_enable_bluefbus2="yes"
- else
-@@ -302,7 +302,7 @@
- [ --disable-bluephonet Disable Nokia PHONET FBUS over Bluetooth
- stack (all new Nokias)],
- [gsm_enable_bluephonet="no"],
-- [if test $gsm_blue_stack = Bluez; then
-+ [if test $gsm_blue_stack = FreeBSD; then
- AC_DEFINE(GSM_ENABLE_BLUEPHONET)
- gsm_enable_bluephonet="yes"
- else
-@@ -311,7 +311,7 @@
- AC_ARG_ENABLE(blueat,
- [ --disable-blueat Disable AT commands over Bluetooth stack],
- [gsm_enable_blueat="no"],
-- [if test $gsm_blue_stack = Bluez; then
-+ [if test $gsm_blue_stack = FreeBSD; then
- AC_DEFINE(GSM_ENABLE_BLUEAT)
- gsm_enable_blueat="yes"
- else
-@@ -320,7 +320,7 @@
- AC_ARG_ENABLE(blueobex,
- [ --disable-blueobex Disable OBEX over Bluetooth stack],
- [gsm_enable_blueobex="no"],
-- [if test $gsm_blue_stack = Bluez; then
-+ [if test $gsm_blue_stack = FreeBSD; then
- AC_DEFINE(GSM_ENABLE_BLUEOBEX)
- gsm_enable_blueobex="yes"
- else
-@@ -355,7 +355,7 @@
- AC_ARG_ENABLE(bluerfsearch,
- [ --disable-bluerfsearch Disable searching for RF channels with Bluetooth stack],
- [gsm_enable_bluerfsearch="no"],
-- [if test $gsm_blue_stack = Bluez; then
-+ [if test $gsm_blue_stack = FreeBSD; then
- AC_DEFINE(BLUETOOTH_RF_SEARCHING)
- gsm_enable_bluerfsearch="yes"
- fi])
-@@ -443,7 +443,7 @@
- Binaries - $bindir
- RPM making directory - $RPM_DIR
- Temporary directory - $TEMP_DIR
-- Bluez library path - $gsm_bt_dir
-+ FreeBSD Bluetooth library path - $gsm_bt_dir
-
- General options
- ---------------
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 02:47:54 +0000