Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Sep 2020 20:35:20 +0000 (UTC)
From:      =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549392 - in head/benchmarks/pathchirp: . files
Message-ID:  <202009202035.08KKZKgX092298@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: se
Date: Sun Sep 20 20:35:19 2020
New Revision: 549392
URL: https://svnweb.freebsd.org/changeset/ports/549392

Log:
  Fix build with -fno-common
  
  While here add licenses extracted from the source files.

Added:
  head/benchmarks/pathchirp/files/
  head/benchmarks/pathchirp/files/LICENSE-MARYLAND   (contents, props changed)
  head/benchmarks/pathchirp/files/LICENSE-RICE   (contents, props changed)
  head/benchmarks/pathchirp/files/patch-Src_chirps__rcv.c   (contents, props changed)
  head/benchmarks/pathchirp/files/patch-Src_pathchirp__rcv.h   (contents, props changed)
Modified:
  head/benchmarks/pathchirp/Makefile

Modified: head/benchmarks/pathchirp/Makefile
==============================================================================
--- head/benchmarks/pathchirp/Makefile	Sun Sep 20 20:01:55 2020	(r549391)
+++ head/benchmarks/pathchirp/Makefile	Sun Sep 20 20:35:19 2020	(r549392)
@@ -3,11 +3,21 @@
 
 PORTNAME=	pathchirp
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.spin.rice.edu/Software/pathChirp/
 
 MAINTAINER=	dikshie@lapi.itb.ac.id
 COMMENT=	Measurement tool for available bandwidth estimation
+
+LICENSE=		RICE MARYLAND
+LICENSE_COMB=		multi
+LICENSE_NAME_RICE=	Rice University License
+LICENSE_FILE_RICE=	${PATCHDIR}/LICENSE-RICE
+LICENSE_PERMS_RICE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_NAME_MARYLAND=	University of Maryland License
+LICENSE_FILE_MARYLAND=	${PATCHDIR}/LICENSE-MARYLAND
+LICENSE_PERMS_MARYLAND=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 GNU_CONFIGURE=	yes
 USES=		gmake

Added: head/benchmarks/pathchirp/files/LICENSE-MARYLAND
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/pathchirp/files/LICENSE-MARYLAND	Sun Sep 20 20:35:19 2020	(r549392)
@@ -0,0 +1,19 @@
+Copyright (c) 1991 University of Maryland
+All Rights Reserved.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of U.M. not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  U.M. makes no representations about the
+suitability of this software for any purpose.  It is provided "as is"
+without express or implied warranty.
+
+U.M. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL U.M.
+BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Added: head/benchmarks/pathchirp/files/LICENSE-RICE
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/pathchirp/files/LICENSE-RICE	Sun Sep 20 20:35:19 2020	(r549392)
@@ -0,0 +1,22 @@
+Copyright (c) 2003 - 2005 Rice University
+All Rights Reserved.
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation is hereby granted without
+fee, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of Rice
+University not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  Rice University makes no representations about the
+suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty. 
+
+RICE UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL RICE UNIVERSITY BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.

Added: head/benchmarks/pathchirp/files/patch-Src_chirps__rcv.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/pathchirp/files/patch-Src_chirps__rcv.c	Sun Sep 20 20:35:19 2020	(r549392)
@@ -0,0 +1,13 @@
+--- Src/chirps_rcv.c.orig	2005-05-19 20:32:10 UTC
++++ Src/chirps_rcv.c
+@@ -3,6 +3,10 @@
+ 
+ extern void sig_alrm(int signo);
+ 
++union {
++  struct cmsghdr cm;
++  char control[CMSG_SPACE(sizeof(struct timeval))];
++} control_un;
+ 
+ /* recording contents of packet. Using inline to make code run faster */
+ inline void update_info(u_int32_t nc,u_int32_t np,double snd_time,double rcv_time,u_int32_t pkt_req_num,int good_jumbo_pkt)

Added: head/benchmarks/pathchirp/files/patch-Src_pathchirp__rcv.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/pathchirp/files/patch-Src_pathchirp__rcv.h	Sun Sep 20 20:35:19 2020	(r549392)
@@ -0,0 +1,14 @@
+--- Src/pathchirp_rcv.h.orig	2005-05-20 15:42:05 UTC
++++ Src/pathchirp_rcv.h
+@@ -37,11 +37,7 @@ extern FILE *fd_debug;/* file pointers for debug files
+ 
+ #ifdef HAVE_SO_TIMESTAMP
+ extern struct  msghdr msg;
+ extern   struct  iovec iov[1];
+-   union{
+-     struct cmsghdr cm;
+-     char control[CMSG_SPACE(sizeof(struct timeval))];
+-   } control_un;
+ 
+ extern   struct cmsghdr *cmptr;
+ #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009202035.08KKZKgX092298>