Date: Fri, 5 Sep 2014 22:05:36 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367396 - in head/net/ntop: . files Message-ID: <201409052205.s85M5aVi067306@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Fri Sep 5 22:05:35 2014 New Revision: 367396 URL: http://svnweb.freebsd.org/changeset/ports/367396 QAT: https://qat.redports.org/buildarchive/r367396/ Log: Fix build on 8.x, by leveraging USE_BINUTILS=yes there (before 900033). The older binutils are picky and error out when trying to strip .a files, the newer binutils just skip over things and print warnings. [1] Fix build with WITH_SSP[_PORTS]=yes, by not running together LDFLAGS expansions; this drops one hunk from files/patch-configure.in. Modernize USE_PYTHON and @unexec rmdir. PR: 192047 [1] Submitted by: feld@ [1], Janos Dohanics [1, to ports@] Modified: head/net/ntop/Makefile head/net/ntop/files/patch-configure.in head/net/ntop/pkg-plist Modified: head/net/ntop/Makefile ============================================================================== --- head/net/ntop/Makefile Fri Sep 5 21:44:59 2014 (r367395) +++ head/net/ntop/Makefile Fri Sep 5 22:05:35 2014 (r367396) @@ -22,10 +22,9 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ DBDIR?= /var/db -USES= gmake libtool +USES= gmake libtool python USE_AUTOTOOLS= automake autoconf libtoolize USE_GNOME= libxml2 -USE_PYTHON= yes USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -79,6 +78,17 @@ CONFIGURE_ARGS+= --enable-jumbo-frames RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako .endif +.include <bsd.port.pre.mk> + +# Quick and dirty hackaround - older binutils barf when asked to strip +# an .a file, newer complain about missing sections and succeed. +# The real fix would be for ntop to not try stripping .a files, +# but upstream seems to have gone ahead with ntopng so this may not +# ever be fixed. +.if ${OSVERSION} < 900033 +USE_BINUTILS= yes +.endif + pre-configure: @cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} autogen.sh --noconfig @@ -88,4 +98,4 @@ pre-install: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ntop/plugins/*.so -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net/ntop/files/patch-configure.in ============================================================================== --- head/net/ntop/files/patch-configure.in Fri Sep 5 21:44:59 2014 (r367395) +++ head/net/ntop/files/patch-configure.in Fri Sep 5 22:05:35 2014 (r367396) @@ -1,14 +1,5 @@ --- configure.in.orig 2012-08-13 04:35:26.000000000 -0300 +++ configure.in 2013-01-09 13:11:12.000000000 -0200 -@@ -472,7 +472,7 @@ - dnl> Add /usr/local/ /opt/local - CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include" - CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include" --LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib" -+LDFLAGS="${LDFLAGS}-L/usr/local/lib -L/opt/local/lib" - - PWD=`pwd` - @@ -560,7 +560,7 @@ test -d ${TMP_ROOT} && test -r ${TMP_ROOT}/libpcap.a; then Modified: head/net/ntop/pkg-plist ============================================================================== --- head/net/ntop/pkg-plist Fri Sep 5 21:44:59 2014 (r367395) +++ head/net/ntop/pkg-plist Fri Sep 5 22:05:35 2014 (r367396) @@ -509,4 +509,4 @@ man/man8/ntop.8.gz @dirrm %%DATADIR%% @exec mkdir -p %%DBDIR%%/ntop @exec chown -R nobody:nobody %%DBDIR%%/ntop -@unexec rmdir %%DBDIR%%/ntop 2>/dev/null || true +@dirrmtry %%DBDIR%%/ntop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409052205.s85M5aVi067306>