diff options
| -rw-r--r-- | net/ettercap/Makefile | 14 | ||||
| -rw-r--r-- | net/ettercap/files/patch-ab | 39 | ||||
| -rw-r--r-- | net/ettercap/pkg-plist | 66 |
3 files changed, 74 insertions, 45 deletions
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index 118b6e3e5bd4..7a9f491ab3ea 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -7,7 +7,7 @@ PORTNAME= ettercap PORTVERSION= 0.6.b -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -53,10 +53,18 @@ INSTALL_TARGET= install plug-ins_install INSTALL_TARGET+= install-doc .endif -post-patch: - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure +post-extract: @${MV} -f ${WRKSRC}/share/lc-converter.c ${WRKSRC} +post-patch: + @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -E -e 's|(^DATADIR.+=).+|\1 ${DATADIR}|; \ + s|(^DOCDIR.+=).+|\1 ${DOCSDIR}|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|@prefix@\/share\/@PROG@|${DATADIR}|; \ + s|@prefix@\/doc\/@PROG@-@VERSION@|${DOCSDIR}|' \ + ${WRKSRC}/ettercap.8.in + post-build: ${CC} ${CFLAGS} -o ${WRKSRC}/lc-converter ${WRKSRC}/lc-converter.c diff --git a/net/ettercap/files/patch-ab b/net/ettercap/files/patch-ab index d7876586b364..1d1b7a831774 100644 --- a/net/ettercap/files/patch-ab +++ b/net/ettercap/files/patch-ab @@ -47,15 +47,36 @@ fi WGET_PATH=$ac_cv_path_WGET_PATH -@@ -6735,7 +6735,6 @@ - echo "$as_me:$LINENO: checking whether $CC accepts -pthread" >&5 - echo $ECHO_N "checking whether $CC accepts -pthread... $ECHO_C" >&6 - CFLAGS_store="$CFLAGS" -- CFLAGS="$CFLAGS -pthread" - cat >conftest.$ac_ext <<_ACEOF +@@ -6676,8 +6676,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test "$ac_cv_search_pthread_create" = no; then +- for ac_lib in pthread; do +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++# for ac_lib in pthread; do ++ LIBS="%%PTHREAD_LIBS%% $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -9656,14 +9655,14 @@ +@@ -6713,7 +6713,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_search_pthread_create="-l$ac_lib" ++ ac_cv_search_pthread_create="%%PTHREAD_LIBS%%" + break + else + echo "$as_me: failed program was:" >&5 +@@ -6721,7 +6721,7 @@ + + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- done ++# done + fi + LIBS=$ac_func_search_save_LIBS + fi +@@ -9720,14 +9720,14 @@ ;; no) echo "$as_me:$LINENO: result: no." >&5 echo "${ECHO_T}no." >&6 @@ -72,7 +93,7 @@ ac_cv_ec_debug=no fi; -@@ -10085,6 +10084,8 @@ +@@ -10149,6 +10149,8 @@ if test $ac_cv_ec_ssh = "yes"; then CYGWINLIB="$CYGWINLIB cygcrypto.dll cygssl.dll" echo "Dissector_ssh" >> ./src/ec_add.def @@ -81,7 +102,7 @@ fi -@@ -10238,9 +10239,15 @@ +@@ -10302,9 +10304,15 @@ if test "$ac_cv_ec_plugin" = "yes"; then PLUGINS=`ls ./plugins | grep -v Make | grep -v CVS | awk ' { printf "%s ", $1 } '` diff --git a/net/ettercap/pkg-plist b/net/ettercap/pkg-plist index 5cf3cd1a356e..52567c8358cb 100644 --- a/net/ettercap/pkg-plist +++ b/net/ettercap/pkg-plist @@ -1,23 +1,3 @@ -%%PORTDOCS%%share/doc/ettercap/AUTHORS -%%PORTDOCS%%share/doc/ettercap/CHANGELOG -%%PORTDOCS%%share/doc/ettercap/CONFUSION.HOWTO -%%PORTDOCS%%share/doc/ettercap/COPYING -%%PORTDOCS%%share/doc/ettercap/HISTORY -%%PORTDOCS%%share/doc/ettercap/HYDRA.HOWTO -%%PORTDOCS%%share/doc/ettercap/INSTALL -%%PORTDOCS%%share/doc/ettercap/KNOWN-BUGS -%%PORTDOCS%%share/doc/ettercap/PORTINGS -%%PORTDOCS%%share/doc/ettercap/README -%%PORTDOCS%%share/doc/ettercap/README.PLUGINS -%%PORTDOCS%%share/doc/ettercap/README.WIN32 -%%PORTDOCS%%share/doc/ettercap/ROPER.HOWTO -%%PORTDOCS%%share/doc/ettercap/THANKS -%%PORTDOCS%%share/doc/ettercap/TODO -%%PORTDOCS%%share/doc/ettercap/TODO.WIN32 -%%PORTDOCS%%share/doc/ettercap/ZARATAN.HOWTO -%%PORTDOCS%%share/doc/ettercap/debug.txt -%%PORTDOCS%%share/doc/ettercap/errors.txt -%%PORTDOCS%%share/doc/ettercap/threads.txt bin/lc-converter lib/ettercap/ec_H00_lurker.so lib/ettercap/ec_H01_zaratan.so @@ -51,17 +31,37 @@ lib/ettercap/ec_phantom.so lib/ettercap/ec_shadow.so lib/ettercap/ec_spectre.so lib/ettercap/ec_triton.so -sbin/ettercap -share/ettercap/etter.conf -share/ettercap/etter.dns -share/ettercap/etter.filter -share/ettercap/etter.filter.ssh -share/ettercap/etter.mime -share/ettercap/etter.passive.os.fp -share/ettercap/etter.ssl.crt -share/ettercap/mac-fingerprints -share/ettercap/nmap-os-fingerprints -share/ettercap/services @dirrm lib/ettercap -@dirrm share/ettercap -%%PORTDOCS%%@dirrm share/doc/ettercap +sbin/ettercap +%%DATADIR%%/etter.conf +%%DATADIR%%/etter.dns +%%DATADIR%%/etter.filter +%%DATADIR%%/etter.filter.ssh +%%DATADIR%%/etter.mime +%%DATADIR%%/etter.passive.os.fp +%%DATADIR%%/etter.ssl.crt +%%DATADIR%%/mac-fingerprints +%%DATADIR%%/nmap-os-fingerprints +%%DATADIR%%/services +@dirrm %%DATADIR%% +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG +%%PORTDOCS%%%%DOCSDIR%%/CONFUSION.HOWTO +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/HISTORY +%%PORTDOCS%%%%DOCSDIR%%/HYDRA.HOWTO +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/KNOWN-BUGS +%%PORTDOCS%%%%DOCSDIR%%/PORTINGS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS +%%PORTDOCS%%%%DOCSDIR%%/README.WIN32 +%%PORTDOCS%%%%DOCSDIR%%/ROPER.HOWTO +%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/TODO.WIN32 +%%PORTDOCS%%%%DOCSDIR%%/ZARATAN.HOWTO +%%PORTDOCS%%%%DOCSDIR%%/debug.txt +%%PORTDOCS%%%%DOCSDIR%%/errors.txt +%%PORTDOCS%%%%DOCSDIR%%/threads.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% |