diff options
| -rw-r--r-- | comms/echolinux/Makefile | 7 | ||||
| -rw-r--r-- | comms/echolinux/distinfo | 6 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echogui_servercode.c | 64 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echogui_testgui.c | 10 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echogui_testgui_cb.c | 34 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echogui_testgui_main.c | 14 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echolinux_control.c | 94 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echolinux_echolinux.h | 30 | ||||
| -rw-r--r-- | comms/echolinux/files/patch-echolinux_vox.c | 11 |
9 files changed, 5 insertions, 265 deletions
diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile index 9a04bb18c50b..7df85a099f03 100644 --- a/comms/echolinux/Makefile +++ b/comms/echolinux/Makefile @@ -6,8 +6,7 @@ # PORTNAME= echolinux -PORTVERSION= 0.16a -PORTREVISION= 2 +PORTVERSION= 0.17a CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cqinet @@ -19,8 +18,6 @@ COMMENT= Amateur Radio Echolink client for UNIX LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ gsm.1:${PORTSDIR}/audio/gsm -USE_REINPLACE= yes - post-patch: @${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${X11BASE}/include|' \ -e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${X11BASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \ @@ -29,7 +26,7 @@ post-patch: ${WRKSRC}/echogui/Makefile @${REINPLACE_CMD} -e 's|<linux/soundcard.h>|<sys/soundcard.h>|' \ ${WRKSRC}/echogui/testgui_cb.c ${WRKSRC}/echogui/testgui_main.c \ - ${WRKSRC}/echolinux/control.c ${WRKSRC}/echolinux/vox.c + ${WRKSRC}/echolinux/vox.c @${REINPLACE_CMD} -e 's|CC = gcc -O3|#CC = gcc -O3|' -e 's|^CFLAGS =|CFLAGS +=|' \ ${WRKSRC}/echolinux/Makefile @${REINPLACE_CMD} -e 's|LFLAGS = -lm|LFLAGS = -L${LOCALBASE}/lib -lm -lgsm|' \ diff --git a/comms/echolinux/distinfo b/comms/echolinux/distinfo index 3cb2c5103f8f..57dbf0854ede 100644 --- a/comms/echolinux/distinfo +++ b/comms/echolinux/distinfo @@ -1,3 +1,3 @@ -MD5 (echolinux-0.16a.tgz) = 374b4f26858e7f46935147d48d6322b9 -SHA256 (echolinux-0.16a.tgz) = 1f9c6a5b71f70b45afb43ff764479e68eedff9d7e95228e78aa6c9038d728a6d -SIZE (echolinux-0.16a.tgz) = 61913 +MD5 (echolinux-0.17a.tgz) = b39f0b9dc56b9b281db52690f8fc5bc7 +SHA256 (echolinux-0.17a.tgz) = 419ccf4bd7d5698dbbf0bee60fd3392991491f668458ab0b01400aee6bb00af3 +SIZE (echolinux-0.17a.tgz) = 63250 diff --git a/comms/echolinux/files/patch-echogui_servercode.c b/comms/echolinux/files/patch-echogui_servercode.c deleted file mode 100644 index 5a0ca98d7f5d..000000000000 --- a/comms/echolinux/files/patch-echogui_servercode.c +++ /dev/null @@ -1,64 +0,0 @@ ---- echogui/servercode.c.orig Tue Feb 3 04:48:41 2004 -+++ echogui/servercode.c Mon Jul 5 00:11:42 2004 -@@ -216,22 +216,13 @@ - - serverFd = fdopen(serverSocket, "r"); - -- memset(sendBuf, 0x6c, 1); -- result = write(serverSocket, sendBuf, 1); -- - /* Get the local time */ - (void) time(&theTime); - tm_ptr = localtime(&theTime); - strftime(logTime, 6, "%H:%M", tm_ptr); - -- strcpy(sendBuf, callsign); -- strcat(sendBuf,"\254\254"); -- strcat(sendBuf, password); -- strcat(sendBuf, "\015ONLINE3.38("); -- strcat(sendBuf, logTime); -- strcat(sendBuf, ")\015"); -- strcat(sendBuf,location); -- strcat(sendBuf,"\015"); -+ sprintf(sendBuf,"\x6c%s\xac\xac%s\rONLINE3.38(%s)\r%s\r", -+ callsign, password, logTime, location); - - result = write(serverSocket, sendBuf, strlen(sendBuf)); - -@@ -677,33 +668,9 @@ - } - - if(FD_ISSET(serverSocket, &testWriteFds)){ -- doTimeout = 0; -- (void) time(&theTime); -- tm_ptr = localtime(&theTime); -- strftime(logTime, 20, "%H:%M:%S", tm_ptr); -- i = connect(serverSocket, (struct sockaddr *) &adr_srvr,len_inet); -- // printf("Connect returned a %d, errno = %s\n", i, strerror(errno)); -- if(i){ -- // printf("%s serverSocket has an error, %d: %s.\n", -- // logTime, errno, strerror(errno)); -- FD_CLR(serverSocket, &exceptFds); -- FD_CLR(serverSocket, &writeFds); -- close(serverSocket); -- serverPortState == CLOSED; -- if(serverShutdown) -- quit = 1; -- else{ -- pServerCurrent = pServerCurrent->next; -- openSocket(); -- } -- } -- else{ -- //printf("%s Cool, no error, server on socket %d.\n", -- // logTime, serverSocket); -- serverPortState = CONNECTED; -- FD_CLR(serverSocket, &writeFds); -- serverTask(); -- } -+ serverPortState = CONNECTED; -+ FD_CLR(serverSocket, &writeFds); -+ serverTask(); - } - - if(serverState != IDLE){ diff --git a/comms/echolinux/files/patch-echogui_testgui.c b/comms/echolinux/files/patch-echogui_testgui.c deleted file mode 100644 index f00f1913ebf6..000000000000 --- a/comms/echolinux/files/patch-echogui_testgui.c +++ /dev/null @@ -1,10 +0,0 @@ ---- echogui/testgui.c.orig Thu Feb 12 14:59:29 2004 -+++ echogui/testgui.c Fri Jul 2 00:57:53 2004 -@@ -1,6 +1,6 @@ - /* Form definition file generated with fdesign. */ - --#include "forms.h" -+#include <X11/forms.h> - #include <stdlib.h> - #include "testgui.h" - diff --git a/comms/echolinux/files/patch-echogui_testgui_cb.c b/comms/echolinux/files/patch-echogui_testgui_cb.c deleted file mode 100644 index 706e1e6ab09f..000000000000 --- a/comms/echolinux/files/patch-echogui_testgui_cb.c +++ /dev/null @@ -1,34 +0,0 @@ ---- echogui/testgui_cb.c.orig Tue Feb 3 03:28:03 2004 -+++ echogui/testgui_cb.c Mon Jul 5 00:14:13 2004 -@@ -14,9 +14,10 @@ - #include <linux/soundcard.h> - #include <sys/ioctl.h> - #include <fcntl.h> --#include <forms.h> -+#include <X11/forms.h> - #include <math.h> - #include <signal.h> -+#include <pthread.h> - - #include "testgui.h" - #include "serverglobals.h" -@@ -345,6 +346,7 @@ - { - int error; - char line[3]; -+ struct timeval timenow; - struct timespec timeout; - - // kill(controlPid, SIGKILL); -@@ -354,8 +356,9 @@ - line[1] = '\n'; - write(controlOutPipe[1], line, 2); - -- gettimeofday(&timeout); -- timeout.tv_sec += 5; -+ gettimeofday(&timenow, NULL); -+ timeout.tv_sec = timenow.tv_sec + 5; -+ timeout.tv_nsec = 0; - pthread_mutex_lock(&serverLoggedOffLock); - sendServerCommand(LOGOFF); - pthread_cond_timedwait(&serverLoggedOff, diff --git a/comms/echolinux/files/patch-echogui_testgui_main.c b/comms/echolinux/files/patch-echogui_testgui_main.c deleted file mode 100644 index 0d38fe396706..000000000000 --- a/comms/echolinux/files/patch-echogui_testgui_main.c +++ /dev/null @@ -1,14 +0,0 @@ ---- echogui/testgui_main.c.orig Sun Feb 15 11:33:04 2004 -+++ echogui/testgui_main.c Fri Jul 2 00:59:18 2004 -@@ -16,9 +16,10 @@ - #include <linux/soundcard.h> - #include <sys/ioctl.h> - #include <fcntl.h> --#include <forms.h> -+#include <X11/forms.h> - #include <string.h> - #include <math.h> -+#include <pthread.h> - - #include "testgui.h" - #include "serverglobals.h" diff --git a/comms/echolinux/files/patch-echolinux_control.c b/comms/echolinux/files/patch-echolinux_control.c deleted file mode 100644 index 98201ab20344..000000000000 --- a/comms/echolinux/files/patch-echolinux_control.c +++ /dev/null @@ -1,94 +0,0 @@ ---- echolinux/control.c.orig Mon Feb 2 22:29:46 2004 -+++ echolinux/control.c Mon Mar 7 15:52:46 2005 -@@ -13,7 +13,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <sys/ioctl.h> --#include <linux/soundcard.h> -+#include <sys/soundcard.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> -@@ -24,7 +24,8 @@ - #include <arpa/inet.h> - #include <netdb.h> - #include <errno.h> --#include <wait.h> -+#include <sys/types.h> -+#include <sys/wait.h> - #include <signal.h> - #include <string.h> - #include <sys/time.h> -@@ -354,7 +355,7 @@ - timeout.tv_sec = 10; - timeout.tv_usec = 0; - } -- -+ - if((i == 0) && (audioPid > 0)){ // timeout & connected - connectTimeout++; - if(connectTimeout == CONNECT_TRY){ -@@ -388,28 +389,32 @@ - disconnect(FALSE); - } - if(isRTCPSdespacket(inBuffer, length)){ -- if((audioPid > 0) && -- (inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr)){ -- sdesItems.nitems = 1; -- sdesItems.item[0].r_item = RTCP_SDES_NAME; -- sdesItems.item[0].r_text = NULL; -- remoteName[0] = 0; -- parseSDES(inBuffer, &sdesItems); -- if(sdesItems.item[0].r_text != NULL){ -- copySDESitem(sdesItems.item[0].r_text, &remoteName[2]); -- } -- remoteName[0] = CONNECT; -- remoteName[1] = ' '; -- puts(remoteName); -- if(atemptingConnect){ -- atemptingConnect = 0; -- fputs("P connect.wav\n", audioOutFd); -- fputs("I\n", audioOutFd); -- } -- connectTimeout = 0; // reset the counter -- } -- else { -- if(audioPid<=0){ -+ if (audioPid > 0) { -+ sendto(outControlSocket, -+ *sdesPacket, -+ sdesLength, -+ 0, -+ (struct sockaddr *)&destAddr, -+ sizeof destAddr); -+ if(inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr){ -+ sdesItems.nitems = 1; -+ sdesItems.item[0].r_item = RTCP_SDES_NAME; -+ sdesItems.item[0].r_text = NULL; -+ remoteName[0] = 0; -+ parseSDES(inBuffer, &sdesItems); -+ if(sdesItems.item[0].r_text != NULL){ -+ copySDESitem(sdesItems.item[0].r_text, &remoteName[2]); -+ } -+ remoteName[0] = CONNECT; -+ remoteName[1] = ' '; -+ puts(remoteName); -+ if(atemptingConnect){ -+ atemptingConnect = 0; -+ fputs("P connect.wav\n", audioOutFd); -+ fputs("I\n", audioOutFd); -+ } -+ connectTimeout = 0; // reset the counter -+ } else { /* audioPid <= 0 */ - sdesItems.nitems = 1; - sdesItems.item[0].r_item = RTCP_SDES_NAME; - sdesItems.item[0].r_text = NULL; -@@ -424,8 +429,6 @@ - makeConnection(inet_ntoa(inAddr.sin_addr)); - fputs("P connect.wav\n", audioOutFd); - fputs("I\n", audioOutFd); -- } -- else { - } - } - } diff --git a/comms/echolinux/files/patch-echolinux_echolinux.h b/comms/echolinux/files/patch-echolinux_echolinux.h deleted file mode 100644 index 5e90f9f61795..000000000000 --- a/comms/echolinux/files/patch-echolinux_echolinux.h +++ /dev/null @@ -1,30 +0,0 @@ ---- echolinux/echolinux.h.orig Sun Dec 22 04:11:34 2002 -+++ echolinux/echolinux.h Mon Jul 5 00:16:32 2004 -@@ -11,22 +11,17 @@ - #define PORT_BASE 5198 - - --struct termio term_params, old_term_params; -+struct termios term_params, old_term_params; - - void raw_tty(int flag){ - - if(flag){ -- ioctl(fileno(stdin), TCGETA, &old_term_params); -+ tcgetattr(fileno(stdin), &old_term_params); - term_params = old_term_params; -- term_params.c_iflag &= ~(ICRNL|IXON|IXOFF); /* no cr translation */ -- term_params.c_iflag &= ~(ISTRIP); /* no stripping of high order bit */ -- term_params.c_oflag &= ~(OPOST); /* no output processing */ -- term_params.c_lflag &= ~(ISIG|ICANON|ECHO); /* raw mode */ -- term_params.c_cc[VMIN] = 0; /* satisfy read after 1 char */ -- term_params.c_cc[VTIME] = 0; /* satisfy read after 1 char */ -- ioctl(fileno(stdin), TCSETAF, &term_params); -+ cfmakeraw(&term_params); -+ tcsetattr(fileno(stdin), TCSAFLUSH, &term_params); - } else{ -- ioctl(fileno(stdin), TCSETAF, &old_term_params); -+ tcsetattr(fileno(stdin), TCSAFLUSH, &old_term_params); - } - } - diff --git a/comms/echolinux/files/patch-echolinux_vox.c b/comms/echolinux/files/patch-echolinux_vox.c deleted file mode 100644 index 1d0e83647de6..000000000000 --- a/comms/echolinux/files/patch-echolinux_vox.c +++ /dev/null @@ -1,11 +0,0 @@ ---- echolinux/vox.c.orig Tue Feb 3 01:12:09 2004 -+++ echolinux/vox.c Fri Jul 2 00:58:47 2004 -@@ -546,7 +546,7 @@ - timeout.tv_sec = 1; - timeout.tv_usec = 0; - for(i=0;i<4;i++){ -- temp = &(voicePacket->data); -+ temp = (unsigned char *)&(voicePacket->data); - gsm_decode(gsmh, temp+(i*33), sbuff); - ioctl(audiofd, SNDCTL_DSP_GETOSPACE, &info); - while(info.bytes < 320){ |