diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-12-15 12:15:01 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-12-15 12:15:01 +0000 |
| commit | 7361a70ebebacb8dfb39b0de7c5617ff86e1d6a3 (patch) | |
| tree | b17cd90a3b9e9a07d167ace4ead83fd2199171bb | |
| parent | 4c1ce2b20d01f0bedfb1fb9d9445c2c86c7563c7 (diff) | |
| download | pkgsrc-7361a70ebebacb8dfb39b0de7c5617ff86e1d6a3.tar.gz | |
tcptraceroute: Find libpcap correctly.
| -rw-r--r-- | net/tcptraceroute/Makefile | 11 | ||||
| -rw-r--r-- | net/tcptraceroute/distinfo | 4 | ||||
| -rw-r--r-- | net/tcptraceroute/patches/patch-aa | 17 |
3 files changed, 16 insertions, 16 deletions
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile index 6616d9b3c1c..480ac798211 100644 --- a/net/tcptraceroute/Makefile +++ b/net/tcptraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2020/01/07 10:37:04 kim Exp $ +# $NetBSD: Makefile,v 1.21 2022/12/15 12:15:01 jperkin Exp $ # DISTNAME= tcptraceroute-1.4 @@ -18,14 +18,6 @@ DOCDIR= ${PREFIX}/share/doc/tcptraceroute SPECIAL_PERMS+= sbin/tcptraceroute ${SETUID_ROOT_PERMS} -.include "../../mk/bsd.prefs.mk" - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-build -SUBST_FILES.conf= Makefile -SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" -SUBST_MESSAGE.conf= Fixing configuration script. - INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin ${DOCDIR} do-install: @@ -35,5 +27,4 @@ do-install: .include "../../devel/libnet10/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/net/tcptraceroute/distinfo b/net/tcptraceroute/distinfo index 95026e18ca6..f87c88b4d7e 100644 --- a/net/tcptraceroute/distinfo +++ b/net/tcptraceroute/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 11:07:01 nia Exp $ +$NetBSD: distinfo,v 1.10 2022/12/15 12:15:01 jperkin Exp $ BLAKE2s (tcptraceroute-1.4.tar.gz) = 3f60b21786293a78a4f701e358eca44165921a1fce0cb00c5bff1674fd979faa SHA512 (tcptraceroute-1.4.tar.gz) = 6aea6a8bba08a0f0024769155bb7e0d8a3a4741e4e4375f66fde3bec644bff782027b3bd8a657120f259dfff9da0ad8ab83598a15823467efeb31a64cbd43287 Size (tcptraceroute-1.4.tar.gz) = 31918 bytes -SHA1 (patch-aa) = 26899ae5898dcdbaa8b12a178ff6c2b362a675c9 +SHA1 (patch-aa) = 0734b9964415871b50414ba037831b2d703db33a SHA1 (patch-ab) = 306c6cbae3e08b7db45883eb655646b80278bb92 diff --git a/net/tcptraceroute/patches/patch-aa b/net/tcptraceroute/patches/patch-aa index 326fd13ef5c..8db438c0033 100644 --- a/net/tcptraceroute/patches/patch-aa +++ b/net/tcptraceroute/patches/patch-aa @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $ +$NetBSD: patch-aa,v 1.2 2022/12/15 12:15:01 jperkin Exp $ ---- Makefile.orig Sun May 19 21:11:38 2002 -+++ Makefile Mon Jul 21 16:54:09 2003 -@@ -4,7 +4,7 @@ +Find correct libraries. + +--- Makefile.orig 2002-05-20 01:11:38.000000000 +0000 ++++ Makefile +@@ -4,13 +4,13 @@ # Copyright (c) 2001, 2002 Michael C. Toren <mct@toren.net> CC = gcc @@ -11,3 +13,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $ DESTDIR=/usr/local/bin tcptraceroute: tcptraceroute.c + $(CC) $(CFLAGS) `libnet-config --defines` \ + -o tcptraceroute tcptraceroute.c \ +- `libnet-config --libs` -lpcap ++ `libnet10-config --libs` `pcap-config --libs` + + static: + $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" |