Attachment 38214 Details for Bug 60546 – file.shar

file.shar

file.shar (text/plain), 10.31 KB, created by Kirill Bezzubets on 2003-12-24 15:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill Bezzubets

Created: 2003-12-24 15:50:09 UTC

Size: 10.31 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	gammu
>#	gammu/files
>#	gammu/files/patch-cfg-Makefile.glo
>#	gammu/files/patch-cfg-autoconf-configure.in
>#	gammu/files/patch-cfg-config.h
>#	gammu/files/patch-common-phone-at-sonyeric.c
>#	gammu/files/patch-common-device-bluetoth-bluetoth.c
>#	gammu/Makefile
>#	gammu/distinfo
>#	gammu/pkg-descr
>#	gammu/pkg-plist
>#
>echo c - gammu
>mkdir -p gammu > /dev/null 2>&1
>echo c - gammu/files
>mkdir -p gammu/files > /dev/null 2>&1
>echo x - gammu/files/patch-cfg-Makefile.glo
>sed 's/^X//' >gammu/files/patch-cfg-Makefile.glo << 'END-of-gammu/files/patch-cfg-Makefile.glo'
>Xdiff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/Makefile.glo ./cfg/Makefile.glo
>X--- /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/Makefile.glo	Tue Nov 25 18:58:33 2003
>X+++ ./cfg/Makefile.glo	Tue Dec  9 17:30:45 2003
>X@@ -45,9 +45,9 @@
>X 	    $(TOPDIR)/common/protocol/obex/obex.o \
>X 	    $(TOPDIR)/common/protocol/symbian/mrouter.o \
>X 	    $(TOPDIR)/common/phone/pfunc.o \
>X+	    $(TOPDIR)/common/phone/at/sonyeric.o \
>X 	    $(TOPDIR)/common/phone/at/atgen.o \
>X 	    $(TOPDIR)/common/phone/at/siemens.o \
>X-	    $(TOPDIR)/common/phone/at/sonyeric.o \
>X 	    $(TOPDIR)/common/phone/alcatel/alcatel.o \
>X 	    $(TOPDIR)/common/phone/nokia/dct3/n6110.o \
>X 	    $(TOPDIR)/common/phone/nokia/dct3/n7110.o \
>END-of-gammu/files/patch-cfg-Makefile.glo
>echo x - gammu/files/patch-cfg-autoconf-configure.in
>sed 's/^X//' >gammu/files/patch-cfg-autoconf-configure.in << 'END-of-gammu/files/patch-cfg-autoconf-configure.in'
>Xdiff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/autoconf/configure.in ./cfg/autoconf/configure.in
>X--- /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/autoconf/configure.in	Tue Nov 25 19:22:06 2003
>X+++ ./cfg/autoconf/configure.in	Tue Dec  9 16:53:34 2003
>X@@ -85,11 +85,8 @@
>X         pthread="no"])
>X LDLIBS="$LDLIBS $PTHREAD_LIBS $PTHREAD_CFLAGS"
>X CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
>X-AC_CACHE_CHECK([for the Bluez Bluetooth stack], ac_cv_have_sockaddr_rc,
>X-     [AC_TRY_COMPILE([#include <sys/socket.h>
>X-          #include <bluetooth/bluetooth.h>
>X-          #include <bluetooth/rfcomm.h>],
>X-          [struct sockaddr_rc rc;],
>X+AC_CACHE_CHECK([for FreeBSD Bluetooth stack], ac_cv_have_sockaddr_rc,
>X+[AC_CHECK_LIB(bluetooth, main,
>X            ac_cv_have_sockaddr_rc=yes,
>X                ac_cv_have_sockaddr_rc=no)])
>X 
>X@@ -431,8 +428,8 @@
>X   Nokia PHONET FBUS                             - $gsm_enable_irdaphonet
>X   OBEX                                          - $gsm_enable_irdaobex
>X 
>X-  Phone protocols with Bluez Bluetooth stack
>X-  ------------------------------------------
>X+  Phone protocols with FreeBSD Bluetooth stack
>X+  --------------------------------------------
>X   AT commands                                   - $gsm_enable_blueat
>X   Nokia FBUS2                                   - $gsm_enable_bluefbus2
>X   Nokia PHONET FBUS                             - $gsm_enable_bluephonet
>END-of-gammu/files/patch-cfg-autoconf-configure.in
>echo x - gammu/files/patch-cfg-config.h
>sed 's/^X//' >gammu/files/patch-cfg-config.h << 'END-of-gammu/files/patch-cfg-config.h'
>Xdiff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/config.h ./cfg/config.h
>X--- /usr/Arch/Nokia/Gammu/gammu-0.90.0/cfg/config.h	Tue Nov 25 19:24:12 2003
>X+++ ./cfg/config.h	Tue Dec  9 16:59:39 2003
>X@@ -1,4 +1,4 @@
>X-/* config.h.  Generated automatically by configure.  */
>X+/* config.h.  Generated by configure.  */
>X 
>X #ifndef _config_h_
>X #define _config_h_
>X@@ -45,20 +45,20 @@
>X #define GSM_ENABLE_ALCABUS 1
>X 
>X /* Infrared. PHONET FBUS */
>X-#define GSM_ENABLE_IRDAPHONET 1
>X+/* #undef GSM_ENABLE_IRDAPHONET */
>X /* Infrared. AT commands */
>X-#define GSM_ENABLE_IRDAAT 1
>X+/* #undef GSM_ENABLE_IRDAAT */
>X /* Infrared. OBEX */
>X-#define GSM_ENABLE_IRDAOBEX 1
>X+/* #undef GSM_ENABLE_IRDAOBEX */
>X 
>X /* Bluetooth stack (like Bluez). FBUS2 (init done using AT commands) */
>X-/* #undef GSM_ENABLE_BLUEFBUS2 */
>X+#define GSM_ENABLE_BLUEFBUS2 1
>X /* Bluetooth stack (like Bluez). PHONET FBUS */
>X-/* #undef GSM_ENABLE_BLUEPHONET */
>X+#define GSM_ENABLE_BLUEPHONET 1
>X /* Blueooth stack (like Bluez). AT commands */
>X-/* #undef GSM_ENABLE_BLUEAT */
>X+#define GSM_ENABLE_BLUEAT 1
>X /* Blueooth stack (like Bluez). OBEX */
>X-/* #undef GSM_ENABLE_BLUEOBEX */
>X+#define GSM_ENABLE_BLUEOBEX 1
>X 
>X /* --------------------------- Phone modules (specific) ----------------- */
>X 
>X@@ -93,7 +93,7 @@
>X #define GSM_ENABLE_ALCATEL 1
>X 
>X /* OBEX generic models */
>X-#define GSM_ENABLE_OBEXGEN 1
>X+/* #undef GSM_ENABLE_OBEXGEN */
>X 
>X /* Symbian with m-router generic models */
>X #define GSM_ENABLE_MROUTERGEN 1
>END-of-gammu/files/patch-cfg-config.h
>echo x - gammu/files/patch-common-phone-at-sonyeric.c
>sed 's/^X//' >gammu/files/patch-common-phone-at-sonyeric.c << 'END-of-gammu/files/patch-common-phone-at-sonyeric.c'
>Xdiff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/phone/at/sonyeric.c ./common/phone/at/sonyeric.c
>X--- /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/phone/at/sonyeric.c	Sun Nov  2 11:45:40 2003
>X+++ ./common/phone/at/sonyeric.c	Tue Dec  9 17:36:22 2003
>X@@ -1,7 +1,6 @@
>X                                            
>X #include "../../gsmstate.h"
>X 
>X-#ifdef GSM_ENABLE_ATGEN
>X 
>X #include <string.h>
>X #include <time.h>
>X@@ -13,7 +12,6 @@
>X extern GSM_Reply_Function 		ATGENReplyFunctions[];
>X extern GSM_Error ATGEN_DispatchMessage	(GSM_StateMachine *s);
>X 
>X-#ifdef GSM_ENABLE_OBEXGEN
>X 
>X extern GSM_Reply_Function 		OBEXGENReplyFunctions[];
>X extern GSM_Error OBEXGEN_GetFilePart	(GSM_StateMachine *s, GSM_File *File);
>X@@ -403,8 +401,6 @@
>X #endif
>X }
>X 
>X-#endif
>X-#endif
>X 
>X /* How should editor hadle tabs in this file? Add editor commands here.
>X  * vim: noexpandtab sw=8 ts=8 sts=8:
>END-of-gammu/files/patch-common-phone-at-sonyeric.c
>echo x - gammu/files/patch-common-device-bluetoth-bluetoth.c
>sed 's/^X//' >gammu/files/patch-common-device-bluetoth-bluetoth.c << 'END-of-gammu/files/patch-common-device-bluetoth-bluetoth.c'
>Xdiff -ur /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/device/bluetoth/bluetoth.c ./common/device/bluetoth/bluetoth.c
>X--- /usr/Arch/Nokia/Gammu/gammu-0.90.0/common/device/bluetoth/bluetoth.c	Sun Nov  2 11:43:28 2003
>X+++ ./common/device/bluetoth/bluetoth.c	Tue Dec  9 17:19:59 2003
>X@@ -11,11 +11,10 @@
>X #include <string.h>
>X 
>X #ifndef WIN32
>X-#  include <sys/socket.h>
>X-#  include <sys/time.h>
>X-#  include <unistd.h>
>X-#  include <bluetooth/bluetooth.h>
>X-#  include <bluetooth/rfcomm.h>
>X+#include <sys/socket.h>
>X+#include <sys/time.h>
>X+#include <unistd.h>
>X+#include <bluetooth.h>
>X #else
>X #  include <windows.h>
>X #  include <io.h>
>X@@ -25,6 +24,11 @@
>X #include "../devfunc.h"
>X #include "bluetoth.h"
>X 
>X+#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
>X+#define BDADDR_ANY NG_HCI_BDADDR_ANY
>X+
>X+#undef WIN32
>X+
>X #ifdef WIN32
>X static GSM_Error bluetooth_connect(GSM_StateMachine *s, int port)
>X {
>X@@ -80,7 +84,7 @@
>X static GSM_Error bluetooth_connect(GSM_StateMachine *s, int port)
>X {
>X 	GSM_Device_BlueToothData 	*d = &s->Device.Data.BlueTooth;
>X-	struct sockaddr_rc 		laddr, raddr;
>X+	struct sockaddr_rfcomm 		laddr, raddr;
>X 	bdaddr_t			bdaddr;
>X 	int 				fd;
>X 
>X@@ -89,9 +93,9 @@
>X 		return GE_DEVICENODRIVER;
>X 	}
>X 
>X-	bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
>X-	laddr.rc_family 	= AF_BLUETOOTH;
>X-	laddr.rc_channel 	= 0;
>X+	bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
>X+	laddr.rfcomm_family 	= AF_BLUETOOTH;
>X+	laddr.rfcomm_channel 	= 0;
>X 
>X 	if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
>X 		dbgprintf("Can't bind socket\n");
>X@@ -100,9 +104,9 @@
>X 	}
>X 
>X 	str2ba(s->CurrentConfig->Device, &bdaddr);
>X-	bacpy(&raddr.rc_bdaddr, &bdaddr);
>X-	raddr.rc_family 	= AF_BLUETOOTH;
>X-	raddr.rc_channel 	= port;
>X+	bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
>X+	raddr.rfcomm_family 	= AF_BLUETOOTH;
>X+	raddr.rfcomm_channel 	= port;
>X 
>X 	if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
>X 		dbgprintf("Can't connect\n");
>END-of-gammu/files/patch-common-device-bluetoth-bluetoth.c
>echo x - gammu/Makefile
>sed 's/^X//' >gammu/Makefile << 'END-of-gammu/Makefile'
>X# New ports collection makefile for:   gammu
>X# Date created:        24 december 2003
>X# Whom:                Kirill Bezzubets <kirill@solaris.ru>
>X#
>X# $FreeBSD: 
>X#
>X
>XPORTNAME=	gammu
>XPORTVERSION=	0.91.0
>XCATEGORIES=	comms
>XMASTER_SITES=	http://www.mwiacek.com/zips/gsm/gammu/older/ \
>X		http://www.kirill.spb.ru/gammu/
>X
>XMAINTAINER=	kirill@solaris.ru
>XCOMMENT=	GNU All Mobile Management Utilities
>X
>XBUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
>X
>XMAN1=		gammu.1
>XUSE_GMAKE=	yes
>XGNU_CONFIGURE=	yes
>X
>XCONFIGURE_ARGS=	--disable-obexgen --disable-fbuspl2303
>X
>X.include <bsd.port.mk>
>END-of-gammu/Makefile
>echo x - gammu/distinfo
>sed 's/^X//' >gammu/distinfo << 'END-of-gammu/distinfo'
>XMD5 (gammu-0.91.0.tar.gz) = c766467c2a68a24ca47dbd9c36d8816c
>END-of-gammu/distinfo
>echo x - gammu/pkg-descr
>sed 's/^X//' >gammu/pkg-descr << 'END-of-gammu/pkg-descr'
>XThis is a port of GAMMU, advanced utility
>Xto manipulate cellular phones.
>X
>XWWW: http://www.mwiacek.com
>X
>X- Kirill Bezzubets
>X<kirill@solaris.ru>
>END-of-gammu/pkg-descr
>echo x - gammu/pkg-plist
>sed 's/^X//' >gammu/pkg-plist << 'END-of-gammu/pkg-plist'
>Xbin/gammu
>X%%DOCSDIR%%/docs/english/gammu.txt
>X%%DOCSDIR%%/docs/english/replace.txt
>X%%DOCSDIR%%/docs/italian/gammu.txt
>X%%DOCSDIR%%/docs/italian/readme.txt
>X%%DOCSDIR%%/examples/config/gammurc
>X%%DOCSDIR%%/examples/config/smsdrc
>X%%DOCSDIR%%/examples/fax/faxreceive
>X%%DOCSDIR%%/examples/fax/faxsend
>X%%DOCSDIR%%/examples/gammu.png
>X%%DOCSDIR%%/examples/logos/gnokii.nol
>X%%DOCSDIR%%/examples/logos/gnokii.xpm
>X%%DOCSDIR%%/examples/logos/gnokii2.nol
>X%%DOCSDIR%%/examples/logos/magic
>X%%DOCSDIR%%/examples/ppp/data
>X%%DOCSDIR%%/examples/ppp/gprs
>X%%DOCSDIR%%/examples/ppp/startppp
>X%%DOCSDIR%%/examples/ppp/statsppp
>X%%DOCSDIR%%/examples/ring/axelf.txt
>X%%DOCSDIR%%/changelog
>X%%DOCSDIR%%/copying
>X%%DOCSDIR%%/readme.txt
>Xshare/gammu/gammu_cs.txt
>Xshare/gammu/gammu_de.txt
>Xshare/gammu/gammu_pl.txt
>Xshare/gammu/gammu_us.txt
>X@dirrm share/gammu
>X@dirrm %%DOCSDIR%%/docs/english
>X@dirrm %%DOCSDIR%%/docs/italian
>X@dirrm %%DOCSDIR%%/docs
>X@dirrm %%DOCSDIR%%/examples/config
>X@dirrm %%DOCSDIR%%/examples/logos
>X@dirrm %%DOCSDIR%%/examples/ppp
>X@dirrm %%DOCSDIR%%/examples/ring
>X@dirrm %%DOCSDIR%%/examples/fax
>X@dirrm %%DOCSDIR%%/examples
>X@dirrm %%DOCSDIR%%
>END-of-gammu/pkg-plist
>exit

Actions: View

Attachments on bug 60546: 38214