Date: Thu, 28 Aug 2003 21:06:48 +0400 From: Kirill Bezzubets <kirill@solaris.ru> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: krion@FreeBSD.org Subject: Re: ports/56081: New port: comms/gammu (supersedes PR/56034) Message-ID: <20030828170648.GA38108@solaris.ru> In-Reply-To: <200308281250.h7SCoGux041742@freefall.freebsd.org> References: <200308281242.h7SCgFFR002978@wintermute.solaris.ru> <200308281250.h7SCoGux041742@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
>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/Makefile # gammu/distinfo # gammu/pkg-descr # gammu/pkg-plist # gammu/files # gammu/files/patch-aa # gammu/report # echo c - gammu mkdir -p gammu > /dev/null 2>&1 echo x - gammu/Makefile sed 's/^X//' >gammu/Makefile << 'END-of-gammu/Makefile' X# New ports collection makefile for: gammu X# Date created: 28 august 2003 X# Whom: Kirill Bezzubets <kirill@solaris.ru> X# X# $FreeBSD$ X# X XPORTNAME= gammu XPORTVERSION= 0.82 XCATEGORIES= comms XMASTER_SITES= http://www.mwiacek.com/english/zips/ XDISTNAME= gammu X XMAINTAINER= kirill@solaris.ru XCOMMENT= GNU All Mobile Management Utilities X XWRKSRC= ${WRKDIR}/gammu-082 XMAN1= gammu.1 XMANCOMPRESSED= no XUSE_GMAKE= yes XGNU_CONFIGURE= yes X X.include <bsd.port.pre.mk> X X.if ${OSVERSION} < 500000 XCONFIGURE_ARGS= --disable-obexgen XLDLIBS= ${LDLIBS} ${PTHREAD_LIBS} X.else XCONFIGURE_ARGS= --disable-obexgen \ X# --with-bluedir=/usr XLDLIBS= ${LDLIBS} -lthr X.endif X X.include <bsd.port.post.mk> END-of-gammu/Makefile echo x - gammu/distinfo sed 's/^X//' >gammu/distinfo << 'END-of-gammu/distinfo' XMD5 (gammu.tar.gz) = c79b1909b22ef3dfc024acfe0561e2c0 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%%PORTDOCS%%%%DOCSDIR%%/docs/english/gammu.txt X%%PORTDOCS%%%%DOCSDIR%%/docs/english/replace.txt X%%PORTDOCS%%%%DOCSDIR%%/docs/italian/gammu.txt X%%PORTDOCS%%%%DOCSDIR%%/docs/italian/readme.txt X%%PORTDOCS%%%%DOCSDIR%%/examples/config/gammurc X%%PORTDOCS%%%%DOCSDIR%%/examples/config/smsdrc X%%PORTDOCS%%%%DOCSDIR%%/examples/logos/gnokii.nol X%%PORTDOCS%%%%DOCSDIR%%/examples/logos/gnokii.xpm X%%PORTDOCS%%%%DOCSDIR%%/examples/logos/gnokii2.nol X%%PORTDOCS%%%%DOCSDIR%%/examples/logos/magic X%%PORTDOCS%%%%DOCSDIR%%/examples/ppp/data X%%PORTDOCS%%%%DOCSDIR%%/examples/ppp/gprs X%%PORTDOCS%%%%DOCSDIR%%/examples/ppp/startppp X%%PORTDOCS%%%%DOCSDIR%%/examples/ppp/statsppp X%%PORTDOCS%%%%DOCSDIR%%/examples/ring/axelf.txt X%%PORTDOCS%%%%DOCSDIR%%/examples/fax/faxreceive X%%PORTDOCS%%%%DOCSDIR%%/examples/fax/faxsend X%%PORTDOCS%%%%DOCSDIR%%/examples/gammu.png X%%PORTDOCS%%%%DOCSDIR%%/changelog X%%PORTDOCS%%%%DOCSDIR%%/readme.txt X%%PORTDOCS%%%%DOCSDIR%%/copying Xshare/gammu/gammu_de.txt Xshare/gammu/gammu_pl.txt Xshare/gammu/gammu_us.txt X@dirrm share/gammu X@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/english X@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs/italian X@dirrm %%PORTDOCS%%%%DOCSDIR%%/docs X@dirrm %%PORTDOCS%%%%DOCSDIR%%/examples/config X@dirrm %%PORTDOCS%%%%DOCSDIR%%/examples/logos X@dirrm %%PORTDOCS%%%%DOCSDIR%%/examples/ppp X@dirrm %%PORTDOCS%%%%DOCSDIR%%/examples/ring X@dirrm %%PORTDOCS%%%%DOCSDIR%%/examples/fax X@dirrm %%PORTDOCS%%%%DOCSDIR%%/examples X@dirrm %%PORTDOCS%%%%DOCSDIR%% END-of-gammu/pkg-plist echo c - gammu/files mkdir -p gammu/files > /dev/null 2>&1 echo x - gammu/files/patch-aa sed 's/^X//' >gammu/files/patch-aa << 'END-of-gammu/files/patch-aa' Xdiff -ur ./cfg/autoconf/configure.in /usr/Arch/nokia/gammu/gammu-082/cfg/autoconf/configure.in X--- ./cfg/autoconf/configure.in Thu Aug 7 16:57:34 2003 X+++ /usr/Arch/nokia/gammu/gammu-082/cfg/autoconf/configure.in Wed Aug 27 13:33:52 2003 X@@ -34,7 +34,7 @@ X AC_PATH_PROG(RPMBUILD, rpm, no) X X dnl Checks for libraries. X-LDLIBS="$LDLIBS -lpthread" X+LDLIBS="$LDLIBS" X X dnl Checks for library functions. X AC_PROG_GCC_TRADITIONAL X@@ -203,11 +203,8 @@ X [AC_DEFINE(GSM_ENABLE_IRDAOBEX) gsm_enable_irdaobex="yes"], X [gsm_enable_irdaobex="no"])]) X 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 AC_ARG_ENABLE(bluefbus, X@@ -361,8 +358,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 Xdiff -ur ./common/device/bluetoth/bluetoth.c /usr/Arch/nokia/gammu/gammu-082/common/device/bluetoth/bluetoth.c X--- ./common/device/bluetoth/bluetoth.c Tue Aug 5 20:30:18 2003 X+++ /usr/Arch/nokia/gammu/gammu-082/common/device/bluetoth/bluetoth.c Tue Aug 26 12:15:21 2003 X@@ -1,4 +1,4 @@ X- X+ X #include "../../gsmstate.h" X X #ifdef GSM_ENABLE_BLUETOOTHDEVICE 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,9 @@ 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 #ifdef WIN32 X static GSM_Error bluetooth_connect(GSM_StateMachine *s, int port) X { X@@ -43,6 +45,8 @@ X X memset (&sab, 0, sizeof(sab)); X sab.port = port; X+// sab.port = 0; X+// sab.serviceClassId = FaxServiceClass_UUID; X sab.addressFamily = AF_BTH; X sab.btAddr = 0; X for (i=0;i<(int)strlen(s->CurrentConfig->Device);i++) { X@@ -77,7 +81,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@@ -86,9 +90,9 @@ X return GE_DEVICEOPENERROR;; 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 dprintf("Can't bind socket\n"); X@@ -97,9 +101,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 dprintf("Can't connect\n"); END-of-gammu/files/patch-aa exit -- BR, Kirill Bezzubets CASE-RIPE CASE-RIPN CTO / Head Of N.O.C. mailto:kirill@solaris.ru Solaris ISP & Telecommunications Co. Ltd http://www.solaris.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030828170648.GA38108>