Index: head/net/trickle/Makefile
===================================================================
--- head/net/trickle/Makefile	(revision 428838)
+++ head/net/trickle/Makefile	(revision 428839)
@@ -1,39 +1,38 @@
 # Created by: Kirill Ponomarew <ponomarew@oberon.net>
 # $FreeBSD$
 
 PORTNAME=	trickle
 PORTVERSION=	1.07
 PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://monkey.org/~marius/trickle/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight, portable bandwidth shaper
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent2
 
-USES=		libtool
+USES=		libtool localbase
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
+		--sysconfdir=${PREFIX}/etc
 USE_LDCONFIG=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} \
-		--sysconfdir=${PREFIX}/etc
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/trickle/trickle-overload.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/trickle/trickle-overload.so
 	${INSTALL_DATA} ${FILESDIR}/trickled.conf ${STAGEDIR}${PREFIX}/etc/trickled.conf.sample
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/trickle/files/patch-trickle-overload.c
===================================================================
--- head/net/trickle/files/patch-trickle-overload.c	(revision 428838)
+++ head/net/trickle/files/patch-trickle-overload.c	(revision 428839)
@@ -1,105 +1,105 @@
---- trickle-overload.c.orig	2004-12-13 02:21:53.000000000 +0100
-+++ trickle-overload.c	2008-04-21 19:23:49.000000000 +0200
+--- trickle-overload.c.orig	2004-12-13 01:21:53 UTC
++++ trickle-overload.c
 @@ -61,6 +61,7 @@
  
  #define SD_INSELECT 0x01
  
 +
  struct sockdesc {
  	int                    sock;
  	int                    flags;
-@@ -141,8 +142,12 @@
+@@ -141,8 +142,12 @@ DECLARE(dup, int, (int));
  DECLARE(dup2, int, (int, int));
  
  #ifdef HAVE_SENDFILE
 +#ifdef __FreeBSD__
 +DECLARE(sendfile, int, (int, int, off_t, size_t, struct sf_hdtr *, off_t *, int));
 +#else
  DECLARE(sendfile, ssize_t, (int, int, off_t *, size_t));
  #endif
 +#endif
  
  static int             delay(int, ssize_t *, short);
  static struct timeval *getdelay(struct sockdesc *, ssize_t *, short);
-@@ -202,15 +207,11 @@
+@@ -202,15 +207,11 @@ trickle_init(void)
  
  	GETADDR(read);
  	GETADDR(readv);
 -#ifndef __FreeBSD__
  	GETADDR(recv);
 -#endif /* !__FreeBSD__ */
  	GETADDR(recvfrom);
  
  	GETADDR(writev);
 -#ifndef __FreeBSD__
  	GETADDR(send);
 -#endif /* !__FreeBSD__ */
  	GETADDR(sendto);
  
  	GETADDR(select);
-@@ -701,7 +702,6 @@
+@@ -701,7 +702,6 @@ readv(int fd, const struct iovec *iov, i
  	return (ret);
  }
  
 -#ifndef __FreeBSD__ 
  ssize_t
  recv(int sock, void *buf, size_t len, int flags)
  {
-@@ -730,7 +730,6 @@
+@@ -730,7 +730,6 @@ recv(int sock, void *buf, size_t len, in
  
  	return (ret);
  }
 -#endif /* !__FreeBSD__ */
  
  #ifdef __sun__
  ssize_t
-@@ -832,7 +831,6 @@
+@@ -832,7 +831,6 @@ writev(int fd, const struct iovec *iov, 
  	return (ret);
  }
  
 -#ifndef __FreeBSD__
  ssize_t
  send(int sock, const void *buf, size_t len, int flags)
  {
-@@ -862,7 +860,6 @@
+@@ -862,7 +860,6 @@ send(int sock, const void *buf, size_t l
  
  	return (ret);
  }
 -#endif /* !__FreeBSD__ */
  
  ssize_t
  sendto(int sock, const void *buf, size_t len, int flags, const struct sockaddr *to,
-@@ -1004,11 +1001,20 @@
+@@ -1004,11 +1001,20 @@ accept(int sock, struct sockaddr *addr, 
  }
  
  #ifdef HAVE_SENDFILE
 +#ifdef __FreeBSD__
 +int
 +sendfile(int out_fd, int in_fd, off_t offset, size_t count, struct sf_hdtr *hdtr, off_t *sbytes, int flags)
 +#else
  ssize_t
  sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
 +#endif
  {
  	size_t inbytes = count, outbytes = count, bytes;
 +#ifdef __FreeBSD__
 +	int ret = 0;
 +#else
  	ssize_t ret = 0;
 +#endif
  
  	INIT;
  
-@@ -1021,8 +1027,11 @@
+@@ -1021,8 +1027,11 @@ sendfile(int out_fd, int in_fd, off_t *o
  	/* This is a slightly ugly hack. */
  	bytes = MIN(inbytes, outbytes);
  	if (bytes > 0)
 +#ifdef __FreeBSD__
 +		ret = (*libc_sendfile)(out_fd, in_fd, offset, bytes, hdtr, sbytes, flags);
 +#else
  		ret = (*libc_sendfile)(out_fd, in_fd, offset, bytes);
 -
 +#endif
  	return (ret);
  }
  #endif	/* HAVE_SENDFILE */