Thu Dec 15 12:15:01 2022 UTC ()
tcptraceroute: Find libpcap correctly.


(jperkin)
diff -r1.20 -r1.21 pkgsrc/net/tcptraceroute/Makefile
diff -r1.9 -r1.10 pkgsrc/net/tcptraceroute/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/net/tcptraceroute/patches/patch-aa
cvs diff -r1.20 -r1.21 pkgsrc/net/tcptraceroute/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tcptraceroute/Makefile 2020/01/07 10:37:04 1.20
+++ pkgsrc/net/tcptraceroute/Makefile 2022/12/15 12:15:01 1.21
@@ -1,39 +1,30 @@ @@ -1,39 +1,30 @@
1# $NetBSD: Makefile,v 1.20 2020/01/07 10:37:04 kim Exp $ 1# $NetBSD: Makefile,v 1.21 2022/12/15 12:15:01 jperkin Exp $
2# 2#
3 3
4DISTNAME= tcptraceroute-1.4 4DISTNAME= tcptraceroute-1.4
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GITHUB:=mct/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=mct/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/mct/tcptraceroute 10HOMEPAGE= https://github.com/mct/tcptraceroute
11COMMENT= Traceroute implementation using TCP packets 11COMMENT= Traceroute implementation using TCP packets
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BUILD_TARGET= tcptraceroute 14BUILD_TARGET= tcptraceroute
15BUILDLINK_API_DEPENDS.libnet10+= libnet10>=1.0.2anb1 15BUILDLINK_API_DEPENDS.libnet10+= libnet10>=1.0.2anb1
16 16
17DOCDIR= ${PREFIX}/share/doc/tcptraceroute 17DOCDIR= ${PREFIX}/share/doc/tcptraceroute
18 18
19SPECIAL_PERMS+= sbin/tcptraceroute ${SETUID_ROOT_PERMS} 19SPECIAL_PERMS+= sbin/tcptraceroute ${SETUID_ROOT_PERMS}
20 20
21.include "../../mk/bsd.prefs.mk" 
22 
23SUBST_CLASSES+= conf 
24SUBST_STAGE.conf= pre-build 
25SUBST_FILES.conf= Makefile 
26SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" 
27SUBST_MESSAGE.conf= Fixing configuration script. 
28 
29INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin ${DOCDIR} 21INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin ${DOCDIR}
30 22
31do-install: 23do-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${DESTDIR}${PREFIX}/sbin 24 ${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${DESTDIR}${PREFIX}/sbin
33 ${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 25 ${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
34 ${INSTALL_DATA} ${WRKSRC}/examples.txt ${DESTDIR}${DOCDIR} 26 ${INSTALL_DATA} ${WRKSRC}/examples.txt ${DESTDIR}${DOCDIR}
35 27
36.include "../../devel/libnet10/buildlink3.mk" 28.include "../../devel/libnet10/buildlink3.mk"
37.include "../../net/libpcap/buildlink3.mk" 29.include "../../net/libpcap/buildlink3.mk"
38 
39.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/net/tcptraceroute/distinfo (expand / switch to unified diff)

--- pkgsrc/net/tcptraceroute/distinfo 2021/10/26 11:07:01 1.9
+++ pkgsrc/net/tcptraceroute/distinfo 2022/12/15 12:15:01 1.10
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.9 2021/10/26 11:07:01 nia Exp $ 1$NetBSD: distinfo,v 1.10 2022/12/15 12:15:01 jperkin Exp $
2 2
3BLAKE2s (tcptraceroute-1.4.tar.gz) = 3f60b21786293a78a4f701e358eca44165921a1fce0cb00c5bff1674fd979faa 3BLAKE2s (tcptraceroute-1.4.tar.gz) = 3f60b21786293a78a4f701e358eca44165921a1fce0cb00c5bff1674fd979faa
4SHA512 (tcptraceroute-1.4.tar.gz) = 6aea6a8bba08a0f0024769155bb7e0d8a3a4741e4e4375f66fde3bec644bff782027b3bd8a657120f259dfff9da0ad8ab83598a15823467efeb31a64cbd43287 4SHA512 (tcptraceroute-1.4.tar.gz) = 6aea6a8bba08a0f0024769155bb7e0d8a3a4741e4e4375f66fde3bec644bff782027b3bd8a657120f259dfff9da0ad8ab83598a15823467efeb31a64cbd43287
5Size (tcptraceroute-1.4.tar.gz) = 31918 bytes 5Size (tcptraceroute-1.4.tar.gz) = 31918 bytes
6SHA1 (patch-aa) = 26899ae5898dcdbaa8b12a178ff6c2b362a675c9 6SHA1 (patch-aa) = 0734b9964415871b50414ba037831b2d703db33a
7SHA1 (patch-ab) = 306c6cbae3e08b7db45883eb655646b80278bb92 7SHA1 (patch-ab) = 306c6cbae3e08b7db45883eb655646b80278bb92
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/tcptraceroute/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/tcptraceroute/patches/patch-aa 2003/07/21 22:26:53 1.1.1.1
+++ pkgsrc/net/tcptraceroute/patches/patch-aa 2022/12/15 12:15:01 1.2
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-aa,v 1.1.1.1 2003/07/21 22:26:53 kim Exp $ 1$NetBSD: patch-aa,v 1.2 2022/12/15 12:15:01 jperkin Exp $
2 2
3--- Makefile.orig Sun May 19 21:11:38 2002 3Find correct libraries.
4+++ Makefile Mon Jul 21 16:54:09 2003 4
5@@ -4,7 +4,7 @@ 5--- Makefile.orig 2002-05-20 01:11:38.000000000 +0000
 6+++ Makefile
 7@@ -4,13 +4,13 @@
6 # Copyright (c) 2001, 2002 Michael C. Toren <mct@toren.net> 8 # Copyright (c) 2001, 2002 Michael C. Toren <mct@toren.net>
7  9
8 CC = gcc 10 CC = gcc
9-CFLAGS = -O2 -Wall 11-CFLAGS = -O2 -Wall
10+#CFLAGS = -O2 -Wall 12+#CFLAGS = -O2 -Wall
11 DESTDIR=/usr/local/bin 13 DESTDIR=/usr/local/bin
12  14
13 tcptraceroute: tcptraceroute.c 15 tcptraceroute: tcptraceroute.c
 16 $(CC) $(CFLAGS) `libnet-config --defines` \
 17 -o tcptraceroute tcptraceroute.c \
 18- `libnet-config --libs` -lpcap
 19+ `libnet10-config --libs` `pcap-config --libs`
 20
 21 static:
 22 $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static"