diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile index 136059b9ee5e..621408e59b13 100644 --- a/net-mgmt/driftnet/Makefile +++ b/net-mgmt/driftnet/Makefile @@ -1,37 +1,40 @@ # Created by: Simon 'corecode' Schubert PORTNAME= driftnet -PORTVERSION= 1.3.0 +PORTVERSION= 1.4.0 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Tool to grab images out of (your) TCP connections LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libgif.so:graphics/giflib \ - libpng.so:graphics/png BUILD_DEPENDS= makedepend:devel/makedepend +LIB_DEPENDS= libgif.so:graphics/giflib \ + libpng.so:graphics/png \ + libwebp.so:graphics/webp \ + libwebsockets.so:net/libwebsockets -GNU_CONFIGURE= yes USES= autoreconf gettext-runtime gmake gnome jpeg localbase:ldflags \ pkgconfig xorg USE_CSTD= c99 USE_GITHUB= yes +GH_ACCOUNT= deiv USE_GNOME= gtk20 USE_XORG= x11 xext xi -GH_ACCOUNT= deiv +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-debug -CONFIGURE_ARGS+= --disable-http-display +INSTALL_TARGET= install-strip -PLIST_FILES= bin/driftnet man/man1/driftnet.1.gz +PLIST_FILES= ${DATADIR}/static-html/index.html \ + bin/driftnet \ + man/man1/driftnet.1.gz PORTDOCS= * -INSTALL_TARGET= install-strip - OPTIONS_DEFINE= DOCS .include diff --git a/net-mgmt/driftnet/distinfo b/net-mgmt/driftnet/distinfo index a5cab6200565..d8f2e7b58f70 100644 --- a/net-mgmt/driftnet/distinfo +++ b/net-mgmt/driftnet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1574239931 -SHA256 (deiv-driftnet-v1.3.0_GH0.tar.gz) = b33505c0dfb2844dfebb00338b4f269ee88d2cdb9863531734d9b96703c9d0c5 -SIZE (deiv-driftnet-v1.3.0_GH0.tar.gz) = 4971618 +TIMESTAMP = 1650707383 +SHA256 (deiv-driftnet-v1.4.0_GH0.tar.gz) = f93082c4127aa246418bf42d5fba0232aba216ecb518fbff4187df9a51481fb6 +SIZE (deiv-driftnet-v1.4.0_GH0.tar.gz) = 5690846 diff --git a/net-mgmt/driftnet/files/patch-configure.ac b/net-mgmt/driftnet/files/patch-configure.ac index 41a82111be90..a883d969282d 100644 --- a/net-mgmt/driftnet/files/patch-configure.ac +++ b/net-mgmt/driftnet/files/patch-configure.ac @@ -1,20 +1,32 @@ ---- configure.ac.orig 2019-10-19 17:01:57 UTC +--- configure.ac.orig 2022-04-16 21:14:04 UTC +++ configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + # + +-AC_PREREQ([2.71]) ++AC_PREREQ([2.69]) + AC_INIT([driftnet],[1.4.0],[david.sephirot@gmail.com]) + + AC_CANONICAL_HOST @@ -22,7 +22,7 @@ build_linux=no build_mac=no case "${host_os}" in - linux*) + linux*|freebsd*) build_linux=yes ;; cygwin*|mingw*) -@@ -69,7 +69,7 @@ AC_ARG_ENABLE([debug], +@@ -69,9 +69,9 @@ AC_ARG_ENABLE([debug], [enable_debug=yes]) if test "x$enable_debug" = xyes; then - CFLAGS="-O2 -g -DDEBUG" + CFLAGS+="-O2 -g -DDEBUG" else - CFLAGS="-O2 -DNDEBUG" +- CFLAGS="-O2 -DNDEBUG" ++ CFLAGS+="-O2 -DNDEBUG" fi + #AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") + diff --git a/net-mgmt/driftnet/files/patch-src_media_image.c b/net-mgmt/driftnet/files/patch-src_media_image.c index 138ab017a59a..0bce47354b74 100644 --- a/net-mgmt/driftnet/files/patch-src_media_image.c +++ b/net-mgmt/driftnet/files/patch-src_media_image.c @@ -1,10 +1,10 @@ ---- src/media/image.c.orig 2014-09-14 19:16:31 UTC +--- src/media/image.c.orig 2022-04-16 21:14:04 UTC +++ src/media/image.c -@@ -16,6 +16,7 @@ +@@ -12,6 +12,7 @@ #include #include /* On many systems (Darwin...), stdio.h is a prerequisite. */ #include +#include #include /* ntohl */ diff --git a/net-mgmt/driftnet/files/patch-src_media_media.c b/net-mgmt/driftnet/files/patch-src_media_media.c index 7771def268dc..3c051f665887 100644 --- a/net-mgmt/driftnet/files/patch-src_media_media.c +++ b/net-mgmt/driftnet/files/patch-src_media_media.c @@ -1,10 +1,10 @@ ---- src/media/media.c.orig 2014-09-14 19:16:31 UTC +--- src/media/media.c.orig 2022-04-16 21:14:04 UTC +++ src/media/media.c @@ -17,6 +17,7 @@ - #include "compat.h" + #include "compat/compat.h" #include +#include - #include "util.h" - #include "tmpdir.h" + #include "common/util.h" + #include "common/tmpdir.h"