Date: Sun, 18 Dec 2016 09:05:44 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428839 - in head/net/trickle: . files Message-ID: <201612180905.uBI95ifU075560@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Dec 18 09:05:44 2016 New Revision: 428839 URL: https://svnweb.freebsd.org/changeset/ports/428839 Log: - Switch to USES=localbase - Switch to options helpers - Regenerate patches Modified: head/net/trickle/Makefile head/net/trickle/files/patch-trickle-overload.c Modified: head/net/trickle/Makefile ============================================================================== --- head/net/trickle/Makefile Sun Dec 18 08:07:58 2016 (r428838) +++ head/net/trickle/Makefile Sun Dec 18 09:05:44 2016 (r428839) @@ -15,24 +15,23 @@ 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} Modified: head/net/trickle/files/patch-trickle-overload.c ============================================================================== --- head/net/trickle/files/patch-trickle-overload.c Sun Dec 18 08:07:58 2016 (r428838) +++ head/net/trickle/files/patch-trickle-overload.c Sun Dec 18 09:05:44 2016 (r428839) @@ -1,5 +1,5 @@ ---- 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 @@ -8,7 +8,7 @@ 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 @@ -21,7 +21,7 @@ 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); @@ -37,7 +37,7 @@ GETADDR(sendto); GETADDR(select); -@@ -701,7 +702,6 @@ +@@ -701,7 +702,6 @@ readv(int fd, const struct iovec *iov, i return (ret); } @@ -45,7 +45,7 @@ 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); } @@ -53,7 +53,7 @@ #ifdef __sun__ ssize_t -@@ -832,7 +831,6 @@ +@@ -832,7 +831,6 @@ writev(int fd, const struct iovec *iov, return (ret); } @@ -61,7 +61,7 @@ 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); } @@ -69,7 +69,7 @@ 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 @@ -90,7 +90,7 @@ 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612180905.uBI95ifU075560>