Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22366/10.3/unstable/main/finkinfo/net
Modified Files:
trickle.info trickle.patch
Log Message:
Switch to modern libevent library
Fix -I ordering
Remove legacy (OS X <= 10.2) patches
Index: trickle.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/trickle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trickle.patch 17 Apr 2004 21:07:16 -0000 1.1
+++ trickle.patch 5 Apr 2007 03:00:28 -0000 1.2
@@ -1,15 +1,19 @@
-diff -urN trickle-1.06.ori/trickle-overload.c trickle-1.06/trickle-overload.c
---- trickle-1.06.ori/trickle-overload.c Tue Jun 3 00:13:28 2003
-+++ trickle-1.06/trickle-overload.c Wed Mar 3 20:26:39 2004
-@@ -7,6 +7,7 @@
- * $Id$
- */
+diff -Nurd -x'*~' trickle-1.06.orig/Makefile.in trickle-1.06/Makefile.in
+--- trickle-1.06.orig/Makefile.in 2003-06-02 07:49:28.000000000 -0400
++++ trickle-1.06/Makefile.in 2007-04-04 22:49:11.000000000 -0400
+@@ -105,7 +105,7 @@
+ tricklectl_SOURCES = tricklectl.c trickledu.c atomicio.c xdr.c
+ tricklectl_LDADD = @ERRO@ @LIBOBJS@
-+#define _BSD_SOCKLEN_T_
- /* Ick. linux sucks. */
- #define _GNU_SOURCE
+-AM_CFLAGS = -Wall -Icompat @EVENTINC@
++AM_CPPFLAGS = -Wall -Icompat @EVENTINC@
-@@ -35,7 +36,9 @@
+ overloaddir = $(libdir)
+ overload_DATA = libtrickle.so
+diff -Nurd -x'*~' trickle-1.06.orig/trickle-overload.c
trickle-1.06/trickle-overload.c
+--- trickle-1.06.orig/trickle-overload.c 2003-06-02 19:13:28.000000000
-0400
++++ trickle-1.06/trickle-overload.c 2007-04-04 22:48:58.000000000 -0400
+@@ -35,7 +35,9 @@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
@@ -20,7 +24,7 @@
#include <limits.h>
#include <math.h>
#if defined(HAVE_TIME_H) && defined(TIME_WITH_SYS_TIME)
-@@ -473,10 +476,37 @@
+@@ -473,10 +475,37 @@
#define POLL_WRMASK (POLLOUT | POLLWRNORM | POLLWRBAND)
#define POLL_RDMASK (POLLIN | /* POLLNORM | */ POLLPRI | POLLRDNORM |
POLLRDBAND)
@@ -59,17 +63,6 @@
int
poll(struct pollfd *fds, unsigned int nfds, int __timeout)
#else
-diff -urN trickle-1.06.ori/trickled.c trickle-1.06/trickled.c
---- trickle-1.06.ori/trickled.c Fri May 9 03:16:42 2003
-+++ trickle-1.06/trickled.c Wed Mar 3 20:26:39 2004
-@@ -19,6 +19,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
-
-+#define _BSD_SOCKLEN_T_
- #include <sys/tree.h>
- #include <sys/queue.h>
- #include <sys/socket.h>
diff -urN trickle-1.06.ori/xdr.c trickle-1.06/xdr.c
--- trickle-1.06.ori/xdr.c Mon Jun 2 01:07:01 2003
+++ trickle-1.06/xdr.c Wed Mar 3 20:26:39 2004
Index: trickle.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/trickle.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- trickle.info 29 Mar 2007 01:57:52 -0000 1.5
+++ trickle.info 5 Apr 2007 03:00:28 -0000 1.6
@@ -1,13 +1,13 @@
Package: trickle
Version: 1.06
-Revision: 11
+Revision: 12
Description: Lightweight userspace bandwidth manager
License: BSD
Maintainer: Khairulmizam Samsudin <[EMAIL PROTECTED]>
# Dependencies
-Depends: daemonic (>= 20010902-1)
-BuildDepends: libevent (>= 0.7c)
+Depends: daemonic (>= 20010902-1), libevent1-shlibs
+BuildDepends: libevent1
# Unpack Phase
Source: http://monkey.org/~marius/trickle/%n-%v.tar.gz
@@ -21,12 +21,6 @@
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --mandir=%p/share/man --sysconfdir=%p/etc
-GCC: 3.3
-CompileScript: <<
- #!/bin/sh -ex
- ./configure %c
- make
-<<
# Install Phase
InstallScript: <<
@@ -81,7 +75,7 @@
<<
# Additional Data
-Homepage: http://www.monkey.org/~provos/trickle/
+Homepage: http://www.monkey.org/~marius/trickle/
DescDetail: <<
Trickle is a voluntary, cooperative bandwidth shaper. trickle
works entirely in userland and easy to use.
@@ -108,4 +102,6 @@
DescPort: <<
Patch some file for poll() support & Darwin related header file. Libtool
scripts are also updated to build shared libraries
+
+ dmacks: make sure local -I come before global/installed ones.
<<
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
