diff options
| author | wjv <wjv@FreeBSD.org> | 2002-01-24 17:15:32 +0800 |
|---|---|---|
| committer | wjv <wjv@FreeBSD.org> | 2002-01-24 17:15:32 +0800 |
| commit | 318c70b0dbef2e6b60a8fdc1aea7de3272d1cb15 (patch) | |
| tree | 419267c49cad62c2290891b33a8ba236ca7455e0 /net/ntop | |
| parent | 7eb549d79c16b7483cb4b16e0a38bd893d0d1f1a (diff) | |
| download | freebsd-ports-gnome-318c70b0dbef2e6b60a8fdc1aea7de3272d1cb15.tar.gz freebsd-ports-gnome-318c70b0dbef2e6b60a8fdc1aea7de3272d1cb15.tar.zst freebsd-ports-gnome-318c70b0dbef2e6b60a8fdc1aea7de3272d1cb15.zip | |
- Add a patch which should allow this port to build on a machine with a
modified LOCALBASE.
- This port should now also build on OSVERSIONs before OpenSSL was imported
(untested).
- Bumped PORTREVISION.
PR: 34052
Submitted by: Thomas Hurst <freaky@aagh.net>
Diffstat (limited to 'net/ntop')
| -rw-r--r-- | net/ntop/Makefile | 12 | ||||
| -rw-r--r-- | net/ntop/files/patch-configure.in | 38 |
2 files changed, 45 insertions, 5 deletions
diff --git a/net/ntop/Makefile b/net/ntop/Makefile index a031b4b2e0e4..c4e6aa3eea82 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -7,6 +7,7 @@ PORTNAME= ntop PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.ntop.org/pub/local/ntop/source/ \ ftp://ftp.us.ntop.org/pub/ntop/source/ \ @@ -34,7 +35,14 @@ USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${DBDIR} \ - --with-gdchart-root=${LOCALBASE} + --with-gdbm-root=${LOCALBASE} \ + --with-gdchart-root=${LOCALBASE} \ + +.include <bsd.port.pre.mk> +.if ${OSVERSION} < 400014 +LIB_DEPENDS+= ssl.2:${PORTSDIR}/security/openssl +CONFIGURE_ARGS+= --with-ossl-root=${LOCALBASE} +.endif MAN1= intop.1 MAN8= ntop.8 ntop-rules.8 @@ -51,4 +59,4 @@ post-install: ${WRKDIR}/ntop.sh @ ${INSTALL_SCRIPT} ${WRKDIR}/ntop.sh ${PREFIX}/etc/rc.d -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/ntop/files/patch-configure.in b/net/ntop/files/patch-configure.in index 1634f091385e..e800253bf19e 100644 --- a/net/ntop/files/patch-configure.in +++ b/net/ntop/files/patch-configure.in @@ -1,6 +1,22 @@ ---- configure.in.orig Thu Nov 8 16:29:04 2001 -+++ configure.in Tue Dec 11 13:20:46 2001 -@@ -893,16 +893,11 @@ +--- configure.in.orig Thu Dec 27 19:40:55 2001 ++++ configure.in Thu Jan 24 11:02:57 2002 +@@ -799,12 +799,10 @@ + + if test ".${GDBM_ROOT}" != .; then + AC_MSG_CHECKING([for the GNU Database Manager Library gdbm (required package)]) +- if test -d $GDBM_ROOT && +- test -r $GDBM_ROOT/libgdbm.a && +- test -r $GDBM_ROOT/gdbm.h; then ++ if test 1; then + GDBM_ROOT=`cd ${GDBM_ROOT} && pwd` +- CORELIBS="${CORELIBS} -L$GDBM_ROOT -lgdbm" +- INCS="${INCS} -I$GDBM_ROOT" ++ CORELIBS="${CORELIBS} -L$GDBM_ROOT/lib -lgdbm" ++ INCS="${INCS} -I$GDBM_ROOT/include" + AC_DEFINE(HAVE_GDBM_H) + AC_MSG_RESULT([found in $GDBM_ROOT]) + else +@@ -873,16 +871,11 @@ dnl> dnl> user defined directory passed as option at configuration time dnl> @@ -21,3 +37,19 @@ AC_DEFINE(HAVE_GDCHART) AC_MSG_RESULT([found in $GDCHART_ROOT]) else +@@ -936,12 +929,10 @@ + if test ".$ac_disable_openssl" = ".no"; then + AC_MSG_CHECKING([for OpenSSL Library by Open SLL Project (optional package)]) + if test ".${OSSL_ROOT}" != .; then +- if test -d $OSSL_ROOT && +- test -r $OSSL_ROOT/libssl.a && +- test -r $OSSL_ROOT/openssl/ssl.h; then ++ if test 1; then + OSSL_ROOT=`cd ${OSSL_ROOT} && pwd` +- MORELIBS="${MORELIBS} -L$OSSL_ROOT -lssl" +- INCS="${INCS} -I$OSSL_ROOT" ++ MORELIBS="${MORELIBS} -L$OSSL_ROOT/crypto -lssl" ++ INCS="${INCS} -I$OSSL_ROOT/include" + AC_DEFINE(HAVE_OPENSSL) + AC_MSG_RESULT([found in $OSSL_ROOT]) + elif test -d $OSSL_ROOT && |