Date: Sat, 28 Dec 2013 03:34:07 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337828 - in head/comms/echolinux: . files Message-ID: <201312280334.rBS3Y7gb072302@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sat Dec 28 03:34:07 2013 New Revision: 337828 URL: http://svnweb.freebsd.org/changeset/ports/337828 Log: - convert to stage - make compile with clang - add LICENSE Added: head/comms/echolinux/files/patch-echogui_servercode.c (contents, props changed) head/comms/echolinux/files/patch-echolinux_rtpacket.c (contents, props changed) Modified: head/comms/echolinux/Makefile (contents, props changed) Modified: head/comms/echolinux/Makefile ============================================================================== --- head/comms/echolinux/Makefile Sat Dec 28 02:34:56 2013 (r337827) +++ head/comms/echolinux/Makefile Sat Dec 28 03:34:07 2013 (r337828) @@ -11,19 +11,18 @@ EXTRACT_SUFX= .tgz MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio Echolink client for UNIX +LICENSE= GPLv2 + LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms \ libgsm.so:${PORTSDIR}/audio/gsm -USE_GCC= any - -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -e 's|gcc|$${CC}|' -e 's|/usr/include/X11|$${LOCALBASE}/include|' \ -e 's|-o echogui -L/usr/X11R6/lib -lX11 -lXpm -lforms -lm -lpthread|$${CFLAGS} -o echogui -L$${LOCALBASE}/lib -lX11 -lXpm -lforms -lm ${PTHREAD_LIBS}|' \ -e 's|CARGS|CFLAGS|' -e 's|= -DNodeFont=FL_TINY_SIZE|+= ${PTHREAD_CFLAGS} -DNodeFont=FL_TINY_SIZE|' \ - -e 's|/usr/local/bin/|$${PREFIX}/bin/|' \ + -e 's|/usr/local/bin/|${STAGEDIR}${PREFIX}/bin/|' \ ${WRKSRC}/echogui/Makefile @${REINPLACE_CMD} -e 's|<linux/soundcard.h>|<sys/soundcard.h>|' \ ${WRKSRC}/echogui/testgui_cb.c ${WRKSRC}/echogui/testgui_main.c \ @@ -32,24 +31,16 @@ post-patch: ${WRKSRC}/echolinux/Makefile @${REINPLACE_CMD} -e 's|LFLAGS = -lm|LFLAGS = -L${LOCALBASE}/lib -lm -lgsm|' \ -e 's|libgsm.a||' -e 's|-Igsm/inc|-I${LOCALBASE}/include|' \ - -e 's|/usr/local/bin/|$${PREFIX}/bin/|' \ + -e 's|/usr/local/bin/|${STAGEDIR}${PREFIX}/bin/|' \ ${WRKSRC}/echolinux/Makefile post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README - @${INSTALL_DATA} ${WRKSRC}/Using_EchoLinux.txt ${DOCSDIR}/Using_EchoLinux.txt - @${ECHO} "" - @${ECHO} "echolinux docs installed in ${DOCSDIR}" - @${ECHO} "" -.endif - @${MKDIR} ${PREFIX}/share/echolinux - @${INSTALL_DATA} ${WRKSRC}/echolinux.desktop ${PREFIX}/share/echolinux - @${MKDIR} ${PREFIX}/share/echolinux/pixmaps - @${INSTALL_DATA} ${WRKSRC}/pixmaps/echolinux_48x48.png ${PREFIX}/share/echolinux/pixmaps - @${ECHO} "" - @${ECHO} "echolinux desktop examples installed in ${PREFIX}/share/echolinux" - @${ECHO} "" + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README + @${INSTALL_DATA} ${WRKSRC}/Using_EchoLinux.txt ${STAGEDIR}${DOCSDIR}/Using_EchoLinux.txt + @${MKDIR} ${STAGEDIR}${PREFIX}/share/echolinux + @${INSTALL_DATA} ${WRKSRC}/echolinux.desktop ${STAGEDIR}${PREFIX}/share/echolinux + @${MKDIR} ${STAGEDIR}${PREFIX}/share/echolinux/pixmaps + @${INSTALL_DATA} ${WRKSRC}/pixmaps/echolinux_48x48.png ${STAGEDIR}${PREFIX}/share/echolinux/pixmaps .include <bsd.port.mk> Added: head/comms/echolinux/files/patch-echogui_servercode.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/echolinux/files/patch-echogui_servercode.c Sat Dec 28 03:34:07 2013 (r337828) @@ -0,0 +1,11 @@ +--- echogui/servercode.c.orig 2013-12-27 22:13:30.194795239 -0500 ++++ echogui/servercode.c 2013-12-27 22:13:50.872793794 -0500 +@@ -641,7 +641,7 @@ + FD_CLR(serverSocket, &exceptFds); + FD_CLR(serverSocket, &writeFds); + close(serverSocket); +- serverPortState == CLOSED; ++ serverPortState = CLOSED; + if(serverShutdown) + quit = 1; + else{ Added: head/comms/echolinux/files/patch-echolinux_rtpacket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/echolinux/files/patch-echolinux_rtpacket.c Sat Dec 28 03:34:07 2013 (r337828) @@ -0,0 +1,50 @@ +--- echolinux/rtpacket.c.orig 2002-12-21 22:10:48.000000000 -0500 ++++ echolinux/rtpacket.c 2013-12-27 22:10:06.275393036 -0500 +@@ -1,4 +1,8 @@ + #include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <strings.h> ++#include <arpa/inet.h> + #include "rtp.h" + #include "rtpacket.h" + +@@ -11,6 +15,16 @@ + + /*************** RTP_MAKE_SDES *************/ + ++static unsigned char *ap; ++static void addSDES(unsigned char item, char *text) ++{ ++ int l; ++ *ap++ = item; ++ *ap++ = l = strlen(text); ++ bcopy(text, ap, l); ++ ap += l; ++} ++ + int rtp_make_sdes(pkt, ssrc_i, strict) + char **pkt; + unsigned long ssrc_i; +@@ -19,21 +33,12 @@ + unsigned char zp[1500]; + unsigned char *p = zp; + rtcp_t *rp; +- unsigned char *ap; + char *sp, *ep; + char line[180]; + int l, hl, i; + struct passwd *pw; + char s[256], ev[1024]; + +- void addSDES(unsigned char item, char *text){ +- *ap++ = item; +- *ap++ = l = strlen(text); +- bcopy(text, ap, l); +- ap += l; +- } +- +- + hl = 0; + if (strict) { + *p++ = RTP_VERSION << 6;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312280334.rBS3Y7gb072302>