Date: Thu, 25 Nov 2004 14:13:42 +0300 (MSK) From: Kirill Bezzubets <kirill@solaris.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kirill@solaris.ru Subject: ports/74366: [UPDATE] Update comms/gammu to 0.98 Message-ID: <200411251113.iAPBDgRQ019106@mpool.solaris.ru> Resent-Message-ID: <200411251120.iAPBK89S071726@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74366
>Category: ports
>Synopsis: [UPDATE] Update comms/gammu to 0.98
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 25 11:20:08 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kirill Bezzubets <kirill@solaris.ru
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
Solaris ISP
>Environment:
FreeBSD neuromancer.solaris.ru 5.3-RELEASE FreeBSD 5.3-RELEASE #6
>Description:
shar instead of diff because most patches are no longer needed
>How-To-Repeat:
>Fix:
# 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/pkg-plist
# gammu/files
# gammu/files/patch-configure.in
# gammu/files/patch-bluetooth
# gammu/Makefile
# gammu/distinfo
# gammu/pkg-descr
#
echo c - gammu
mkdir -p gammu > /dev/null 2>&1
echo x - gammu/pkg-plist
sed 's/^X//' >gammu/pkg-plist << 'END-of-gammu/pkg-plist'
Xbin/gammu
X%%DOCSDIR%%/changelog
X%%DOCSDIR%%/copying
X%%DOCSDIR%%/readme.txt
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/gammu.png
X%%DOCSDIR%%/examples/config/gammurc
X%%DOCSDIR%%/examples/config/smsd_mysql.sql
X%%DOCSDIR%%/examples/config/smsdrc
X%%DOCSDIR%%/examples/fax/faxreceive
X%%DOCSDIR%%/examples/fax/faxsend
X%%DOCSDIR%%/examples/logo/greatings.nlm
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
Xshare/gammu/gammu_cs.txt
Xshare/gammu/gammu_de.txt
Xshare/gammu/gammu_it.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/ppp
X@dirrm %%DOCSDIR%%/examples/ring
X@dirrm %%DOCSDIR%%/examples/logo
X@dirrm %%DOCSDIR%%/examples/fax
X@dirrm %%DOCSDIR%%/examples
X@dirrm %%DOCSDIR%%
END-of-gammu/pkg-plist
echo c - gammu/files
mkdir -p gammu/files > /dev/null 2>&1
echo x - gammu/files/patch-configure.in
sed 's/^X//' >gammu/files/patch-configure.in << 'END-of-gammu/files/patch-configure.in'
X--- cfg/autoconf/configure.in.orig Thu Nov 25 13:02:35 2004
X+++ cfg/autoconf/configure.in Thu Nov 25 13:01:56 2004
X@@ -163,14 +163,14 @@
X dnl Bluetooth stacks
X gsm_blue_stack=unknown
X AC_CHECK_HEADERS(bluetooth/bluetooth.h,
X- [gsm_blue_stack=Bluez
X+ [gsm_blue_stack=FreeBSD
X AC_DEFINE(GSM_ENABLE_BLUEZ)
X- LDLIBS="$LDLIBS -lbluetooth -lsdp"])
X+ LDLIBS="$LDLIBS -lbluetooth"])
X
X-dnl Path for Bluez bluetooth library
X+dnl Path for FreeBSD bluetooth library
X gsm_bt_dir=""
X AC_ARG_WITH(bluedir,
X- [ --with-bluedir=DIR Specifies the base libbluetooth from Bluez],
X+ [ --with-bluedir=DIR Specifies the base libbluetooth from FreeBSD],
X [ if test x$withval = xyes; then
X AC_MSG_WARN(Usage is: --with-bluedir=DIR)
X else
X@@ -261,7 +261,7 @@
X [ --disable-bluefbus Disable Nokia FBUS2 over Bluetooth stack
X (Nokia 6210)],
X [gsm_enable_bluefbus2="no"],
X- [if test $gsm_blue_stack = Bluez; then
X+ [if test $gsm_blue_stack = FreeBSD; then
X AC_DEFINE(GSM_ENABLE_BLUEFBUS2)
X gsm_enable_bluefbus2="yes"
X else
X@@ -271,7 +271,7 @@
X [ --disable-bluephonet Disable Nokia PHONET FBUS over Bluetooth
X stack (all new Nokias)],
X [gsm_enable_bluephonet="no"],
X- [if test $gsm_blue_stack = Bluez; then
X+ [if test $gsm_blue_stack = FreeBSD; then
X AC_DEFINE(GSM_ENABLE_BLUEPHONET)
X gsm_enable_bluephonet="yes"
X else
X@@ -280,7 +280,7 @@
X AC_ARG_ENABLE(blueat,
X [ --disable-blueat Disable AT commands over Bluetooth stack],
X [gsm_enable_blueat="no"],
X- [if test $gsm_blue_stack = Bluez; then
X+ [if test $gsm_blue_stack = FreeBSD; then
X AC_DEFINE(GSM_ENABLE_BLUEAT)
X gsm_enable_blueat="yes"
X else
X@@ -289,7 +289,7 @@
X AC_ARG_ENABLE(blueobex,
X [ --disable-blueobex Disable OBEX over Bluetooth stack],
X [gsm_enable_blueobex="no"],
X- [if test $gsm_blue_stack = Bluez; then
X+ [if test $gsm_blue_stack = FreeBSD; then
X AC_DEFINE(GSM_ENABLE_BLUEOBEX)
X gsm_enable_blueobex="yes"
X else
X@@ -408,7 +408,7 @@
X Binaries - $bindir
X RPM making directory - $RPM_DIR
X Temporary directory - $TEMP_DIR
X- Bluez library path - $gsm_bt_dir
X+ FreeBSD Bluetooth library path - $gsm_bt_dir
X
X General options
X ---------------
END-of-gammu/files/patch-configure.in
echo x - gammu/files/patch-bluetooth
sed 's/^X//' >gammu/files/patch-bluetooth << 'END-of-gammu/files/patch-bluetooth'
Xdiff -ur orig/bluetoth.c patched/bluetoth.c
X--- common/device/bluetoth/bluetoth.c Thu Nov 25 12:36:26 2004
X+++ common/device/bluetoth/bluetoth.c Thu Nov 25 12:46:22 2004
X@@ -30,9 +30,6 @@
X {
X GSM_Error error;
X
X-#ifdef BLUETOOTH_RF_SEARCHING
X- if (!mystrncasecmp(s->CurrentConfig->Connection, "bluerf", 6)) return bluetooth_findchannel(s);
X-#endif
X
X switch (s->ConnectionType) {
X case GCT_BLUEAT:
Xdiff -ur common/device/bluetoth/bluez.c common/device/bluetoth/bluez.c
X--- common/device/bluetoth/bluez.c Thu Nov 25 12:36:26 2004
X+++ common/device/bluetoth/bluez.c Thu Nov 25 12:46:56 2004
X@@ -14,6 +14,8 @@
X #ifdef GSM_ENABLE_BLUETOOTHDEVICE
X #ifdef GSM_ENABLE_BLUEZ
X
X+#define BDADDR_ANY NG_HCI_BDADDR_ANY
X+
X #include <stdlib.h>
X #include <stdio.h>
X #include <fcntl.h>
X@@ -22,10 +24,7 @@
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 <bluetooth/sdp.h>
X-#include <bluetooth/sdp_lib.h>
X+#include <bluetooth.h>
X
X #include "../../gsmcomon.h"
X #include "../devfunc.h"
X@@ -34,21 +33,21 @@
X GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
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 smprintf(s, "Connecting to RF channel %i\n",port);
X
X- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
X+ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
X if (fd < 0) {
X dbgprintf("Can't create socket\n");
X return ERR_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@@ -57,9 +56,9 @@
X }
X
X str2ba(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-bluetooth
echo x - gammu/Makefile
sed 's/^X//' >gammu/Makefile << 'END-of-gammu/Makefile'
X# New ports collection makefile for: gammu
X# Date created: 12 december 2003
X# Whom: Kirill Bezzubets <kirill@solaris.ru>
X#
X# $FreeBSD: ports/comms/gammu/Makefile,v 1.7 2004/06/04 17:29:10 ade Exp $
X#
X
XPORTNAME= gammu
XPORTVERSION= 0.98.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
XMAN1= gammu.1
XUSE_GMAKE= yes
XGNU_CONFIGURE= yes
XWANT_AUTOCONF_VER=253
X
XCONFIGURE_ARGS= --disable-bluerfsearch
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.98.0.tar.gz) = 6abfb95af979ce283fb22a179476dc6a
XSIZE (gammu-0.98.0.tar.gz) = 813856
END-of-gammu/distinfo
echo x - gammu/pkg-descr
sed 's/^X//' >gammu/pkg-descr << 'END-of-gammu/pkg-descr'
XGammu (Gnu All Mobile Management Utilities) 0.98.0
X
XGammu allows you to manage your mobile phone directly from
Xyour PC. It has many features, such as SMS handling, Calendar,
XJava support, ringtones, pictures, and many, many other good
Xthings.
X
XWWW: http://www.mwiacek.com
X
X- Kirill Bezzubets
X<kirill@solaris.ru>
END-of-gammu/pkg-descr
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411251113.iAPBDgRQ019106>