diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2017-06-05 15:43:45 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2017-06-05 15:43:45 +0000 |
| commit | 48e97e76fc69bd46d2cf1a9322c9769e73d8a2f2 (patch) | |
| tree | 1fbbb282b377eb059c7aa17f848059e7a9a58ba9 /net/ntopng/files/patch-configure.seed | |
| parent | Update PORTSCOUT (diff) | |
- Update net/ndpi to new 2.0 branch
- Update net/ntopng to new 3.0 branch
- Don't hardcode /usr/local in configuration script
- Greatly simplify Makefile.in patch
Notes
Notes:
svn path=/head/; revision=442671
Diffstat (limited to 'net/ntopng/files/patch-configure.seed')
| -rw-r--r-- | net/ntopng/files/patch-configure.seed | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/net/ntopng/files/patch-configure.seed b/net/ntopng/files/patch-configure.seed index 67618978a708..6e240f77f371 100644 --- a/net/ntopng/files/patch-configure.seed +++ b/net/ntopng/files/patch-configure.seed @@ -1,14 +1,18 @@ ---- configure.seed.orig 2016-05-05 13:23:53 UTC +--- configure.seed.orig 2017-06-01 07:18:57 UTC +++ configure.seed -@@ -14,22 +14,7 @@ NTOPNG_SHORT_VERSION="@SHORT_VERSION@" +@@ -19,26 +19,8 @@ SYSTEM=`uname -s` # On CentOS 6 `git rev-list HEAD --count` does not work # # -REVISION=`git log --pretty=oneline | wc -l` -- ++#REVISION=`git log --pretty=oneline | wc -l` + -if test -d "/usr/local/include"; then -CFLAGS="${CFLAGS} -I/usr/local/include" -CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +-fi +- +-if test -d "/usr/local/lib"; then -LDFLAGS="${LDFLAGS} -L/usr/local/lib" -fi - @@ -20,11 +24,11 @@ -if test -d /opt/local/lib; then : - LDFLAGS="${LDFLAGS} -L/opt/local/lib" -fi -+#REVISION=`git log --pretty=oneline | wc -l` - +- if [ test -f /usr/bin/lsb_release ]; then CODENAME=`/usr/bin/lsb_release -c|cut -f 2` -@@ -46,28 +31,9 @@ GIT_BRANCH="@GIT_BRANCH@" + if [[ $CODENAME == "wheezy" ]]; then : +@@ -54,26 +36,7 @@ GIT_BRANCH="@GIT_BRANCH@" PRO_GIT_RELEASE="@PRO_GIT_RELEASE@" PRO_GIT_DATE="@PRO_GIT_DATE@" @@ -48,18 +52,14 @@ - fi - fi -fi -+NDPI_HOME=/usr/local ++NDPI_HOME=%%LOCALBASE%% --NDPI_LIB=$NDPI_HOME/src/lib/.libs/libndpi.a -+NDPI_LIB=$NDPI_HOME/lib/libndpi.so - AC_MSG_CHECKING(for $NDPI_LIB) - if test -f "$NDPI_LIB" ; then : - AC_MSG_RESULT(found $NDPI_LIB) -@@ -359,19 +325,7 @@ if test x$GPP = x + if test -d "/usr/include/openssl"; then : + AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) +@@ -378,18 +341,6 @@ GMAKE=`which gmake` + if test x$GMAKE = x then - GPP="g++" - else -- GPP="$GPP -O0" + GMAKE="make" -fi - -GIT=`which git` @@ -72,7 +72,6 @@ -if test x$WGET = x -then - AC_MSG_RESULT(ERROR. wget is not installed on your host: you cannot download GeoIP data) -+ GPP="$GPP ${CFLAGS}" fi umask 002 |