diff options
| author | tijl <tijl@FreeBSD.org> | 2016-03-20 18:53:08 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2016-03-20 18:53:08 +0800 |
| commit | 9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca (patch) | |
| tree | c30aa05ffe4be67ca3bb38317073b7e6603daa7c /net/tcptraceroute | |
| parent | 6af0c041428d493f447a328f9e81efe5b6d72273 (diff) | |
| download | freebsd-ports-gnome-9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca.tar.gz freebsd-ports-gnome-9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca.tar.zst freebsd-ports-gnome-9bf09f69cf8a3acf95e51a0a1e8d6eedfd31e3ca.zip | |
Install net/libnet headers and libraries back in the location where other
ports expect it. The files were put in a different location to avoid a
conflict with net/libnet10 but this port has been removed a while ago now.
PR: 208122
Exp-run by: antoine
Approved by: portmgr (antoine)
Diffstat (limited to 'net/tcptraceroute')
| -rw-r--r-- | net/tcptraceroute/Makefile | 1 | ||||
| -rw-r--r-- | net/tcptraceroute/files/patch-configure | 73 |
2 files changed, 1 insertions, 73 deletions
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile index f8e1f706c478..5c27ea44806c 100644 --- a/net/tcptraceroute/Makefile +++ b/net/tcptraceroute/Makefile @@ -19,6 +19,7 @@ OPTIONS_DEFINE= DOCS PORTSCOUT= limit:^[0-9] GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-libnet=${LOCALBASE} USES= gmake PORTDOCS= * diff --git a/net/tcptraceroute/files/patch-configure b/net/tcptraceroute/files/patch-configure deleted file mode 100644 index c37e709d1063..000000000000 --- a/net/tcptraceroute/files/patch-configure +++ /dev/null @@ -1,73 +0,0 @@ ---- configure.orig 2006-03-28 13:00:00.000000000 +0800 -+++ configure 2014-09-10 00:44:22.750008451 +0800 -@@ -3713,37 +3713,39 @@ - - fi; - --LIBNET_CONFIG="libnet-config" # relative, using $PATH -- --# Check whether --with-libnet or --without-libnet was given. --if test "${with_libnet+set}" = set; then -- withval="$with_libnet" -- -- LIBNETCC="" -- LIBNETLD="" -- -- test -x "$withval/bin/libnet-config" && LIBNET_CONFIG="$withval/bin/libnet-config" -- test -x "$withval/libnet-config" && LIBNET_CONFIG="$withval/libnet-config" -- -- test -f "$withval/libnet.h" && LIBNETCC="$LIBNETCC -I$withval" -- test -f "$withval/include/libnet.h" && LIBNETCC="$LIBNETCC -I$withval/include" -- -- test -f "$withval/libnet.a" && LIBNETLD="$LIBNETLD -L$withval" -- test -f "$withval/lib/libnet.a" && LIBNETLD="$LIBNETLD -L$withval/lib" -- -- if test -z "$LIBNETCC" -o -z "$LIBNETLD" -- then -- { { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5 --echo "$as_me: error: No valid libnet library found in $withval" >&2;} -- { (exit 1); exit 1; }; } -- else -- CPPFLAGS="$CPPFLAGS $LIBNETCC" -- LDFLAGS="$LDFLAGS $LIBNETLD" -- { echo "$as_me:$LINENO: using libnet in $withval" >&5 --echo "$as_me: using libnet in $withval" >&6;} -- fi -- --fi; -+LIBNET_CONFIG="libnet11-config" # relative, using $PATH -+CPPFLAGS="$CPPFLAGS $(${LIBNET_CONFIG} --cflags)" -+LDFLAGS="$LDFLAGS $(${LIBNET_CONFIG} --libs)" -+ -+## Check whether --with-libnet or --without-libnet was given. -+#if test "${with_libnet+set}" = set; then -+# withval="$with_libnet" -+# -+# LIBNETCC="" -+# LIBNETLD="" -+# -+# test -x "$withval/bin/libnet-config" && LIBNET_CONFIG="$withval/bin/libnet-config" -+# test -x "$withval/libnet-config" && LIBNET_CONFIG="$withval/libnet-config" -+# -+# test -f "$withval/libnet.h" && LIBNETCC="$LIBNETCC -I$withval" -+# test -f "$withval/include/libnet.h" && LIBNETCC="$LIBNETCC -I$withval/include" -+# -+# test -f "$withval/libnet.a" && LIBNETLD="$LIBNETLD -L$withval" -+# test -f "$withval/lib/libnet.a" && LIBNETLD="$LIBNETLD -L$withval/lib" -+# -+# if test -z "$LIBNETCC" -o -z "$LIBNETLD" -+# then -+# { { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5 -+#echo "$as_me: error: No valid libnet library found in $withval" >&2;} -+# { (exit 1); exit 1; }; } -+# else -+# CPPFLAGS="$CPPFLAGS $LIBNETCC" -+# LDFLAGS="$LDFLAGS $LIBNETLD" -+# { echo "$as_me:$LINENO: using libnet in $withval" >&5 -+#echo "$as_me: using libnet in $withval" >&6;} -+# fi -+# -+#fi; - - - echo "$as_me:$LINENO: checking for pcap_open_live in -lpcap" >&5 |