Attachment 143628 Details for Bug 190885 – ntop-5.0.1.patch

[patch] ntop-5.0.1.patch

ntop-5.0.1.patch (text/plain), 2.49 KB, created by Dmitry Marakasov on 2014-06-10 18:33:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-06-10 18:33:37 UTC

Size: 2.49 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 357303)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ntop
> PORTVERSION=	5.0.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	net
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Stable
> 
>@@ -13,7 +13,6 @@
> LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
> 		libevent-1.4.so:${PORTSDIR}/devel/libevent
> BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
>-		subversion>=1.7.0:${PORTSDIR}/devel/subversion \
> 		dot:${PORTSDIR}/graphics/graphviz \
> 		geoiplookup:${PORTSDIR}/net/GeoIP
> RUN_DEPENDS:=	${BUILD_DEPENDS} \
>@@ -34,6 +33,7 @@
> 		--with-ossl-root=${OPENSSLBASE} \
> 		--with-gdbm-root=${LOCALBASE} \
> 		--with-zlib-root=/usr
>+INSTALL_TARGET=	install-strip
> 
> CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
> LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>@@ -51,7 +51,6 @@
> MAKO_DESC=		Install py-mako for Host Map, Region View
> 
> .include <bsd.port.pre.mk>
>-.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MPCAP_PORT}
> LIB_DEPENDS+=		libpcap.so:${PORTSDIR}/net/libpcap
>@@ -78,10 +77,6 @@
> RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako
> .endif
> 
>-.if ${OSVERSION} < 700000
>-BROKEN=		does not configure on 6.X
>-.endif
>-
> pre-configure:
> 	@cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} autogen.sh --noconfig
> 
>Index: files/patch-autogen.sh
>===================================================================
>--- files/patch-autogen.sh	(revision 357303)
>+++ files/patch-autogen.sh	(working copy)
>@@ -1,6 +1,6 @@
>---- ./autogen.sh.orig	2011-02-02 10:40:23.000000000 +0100
>-+++ ./autogen.sh	2011-02-02 10:40:40.000000000 +0100
>-@@ -202,16 +202,6 @@
>+--- autogen.sh.orig	2012-02-20 14:35:43.000000000 +0400
>++++ autogen.sh	2014-06-10 16:29:45.873177238 +0400
>+@@ -202,30 +202,6 @@
>    GNU_OR_DIE=0
>  }
>  
>@@ -14,6 +14,30 @@
> -  GNU_OR_DIE=0
> -}
> -
>+-if test "$GNU_OR_DIE" -eq 0; then
>+-  exit 1
>+-fi
>+-
>+-SVN=`find_command 'svn'`
>+-($SVN --version) < /dev/null > /dev/null 2>&1 ||
>+-{
>+-  echo
>+-  echo "You must have svn/subversion installed to compile $progname."
>+-  echo "Download the appropriate package for your distribution, or get the"
>+-  echo "source from http://subversion.tigris.org"
>+-  GNU_OR_DIE=0
>+-}
>+-
>  if test "$GNU_OR_DIE" -eq 0; then
>    exit 1
>  fi
>+@@ -442,7 +418,8 @@
>+ if test -d nDPI; then
>+     echo "nDPI already available"
>+ else
>+-    svn co $NDPI_URL
>++    echo "nDPI not bundled"
>++    exit 1
>+ fi
>+ 
>+ dnl> nDPI compilation
>--- ntop-5.0.1.patch ends here ---

Flags:

amdmi3: maintainer-approval? (sylvio)

Actions: View | Diff

Attachments on bug 190885: 143628