From owner-svn-ports-all@FreeBSD.ORG Tue Jun 17 13:53:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 910E9DD4; Tue, 17 Jun 2014 13:53:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DC23221A; Tue, 17 Jun 2014 13:53:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HDrj2q093510; Tue, 17 Jun 2014 13:53:45 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HDrjEa093508; Tue, 17 Jun 2014 13:53:45 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201406171353.s5HDrjEa093508@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 17 Jun 2014 13:53:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358117 - in head/net/ntop: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jun 2014 13:53:45 -0000 Author: amdmi3 Date: Tue Jun 17 13:53:44 2014 New Revision: 358117 URL: http://svnweb.freebsd.org/changeset/ports/358117 QAT: https://qat.redports.org/buildarchive/r358117/ Log: - Drop subversion dependency (not used, breaks build by touching ~) - Cosmetic fixes PR: 190885 Submitted by: amdmi3 Modified: head/net/ntop/Makefile head/net/ntop/files/patch-autogen.sh Modified: head/net/ntop/Makefile ============================================================================== --- head/net/ntop/Makefile Tue Jun 17 13:52:05 2014 (r358116) +++ head/net/ntop/Makefile Tue Jun 17 13:53:44 2014 (r358117) @@ -3,7 +3,7 @@ PORTNAME= ntop PORTVERSION= 5.0.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Stable @@ -15,7 +15,6 @@ LICENSE= GPLv3 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} \ @@ -36,6 +35,7 @@ CONFIGURE_ARGS= --localstatedir=${DBDIR} --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} @@ -49,10 +49,9 @@ OPTIONS_DEFINE= PCAP_PORT XMLDUMP JUMBO_ PCAP_PORT_DESC= Use libpcap from ports XMLDUMP_DESC= Enable XML Dump support -JUMBO_FRAMES_DESC= Jumbo Frames. Experimental. +JUMBO_FRAMES_DESC= Jumbo Frames (experimental) MAKO_DESC= Install py-mako for Host Map, Region View -.include .include .if ${PORT_OPTIONS:MPCAP_PORT} @@ -80,14 +79,10 @@ CONFIGURE_ARGS+= --enable-jumbo-frames 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 pre-install: @cd ${WRKSRC} && ${GMAKE} dnetter -.include +.include Modified: head/net/ntop/files/patch-autogen.sh ============================================================================== --- head/net/ntop/files/patch-autogen.sh Tue Jun 17 13:52:05 2014 (r358116) +++ head/net/ntop/files/patch-autogen.sh Tue Jun 17 13:53:44 2014 (r358117) @@ -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