diff options
| author | demon <demon@FreeBSD.org> | 2002-03-24 15:38:36 +0800 |
|---|---|---|
| committer | demon <demon@FreeBSD.org> | 2002-03-24 15:38:36 +0800 |
| commit | ddc771cbe08ca7bb8145a3d11a780d08c8ae117d (patch) | |
| tree | 985966985a3f9209876de9631945fc811d73520a /net | |
| parent | f37f90910e96960fa499d91390a0e48aadd6c5d9 (diff) | |
| download | freebsd-ports-gnome-ddc771cbe08ca7bb8145a3d11a780d08c8ae117d.tar.gz freebsd-ports-gnome-ddc771cbe08ca7bb8145a3d11a780d08c8ae117d.tar.zst freebsd-ports-gnome-ddc771cbe08ca7bb8145a3d11a780d08c8ae117d.zip | |
Respect CFLAGS.
Convert patch to unified format.
Diffstat (limited to 'net')
| -rw-r--r-- | net/tcptraceroute-devel/files/patch-Makefile | 88 | ||||
| -rw-r--r-- | net/tcptraceroute/files/patch-Makefile | 88 |
2 files changed, 72 insertions, 104 deletions
diff --git a/net/tcptraceroute-devel/files/patch-Makefile b/net/tcptraceroute-devel/files/patch-Makefile index 0a1755ab97c9..173962cb0853 100644 --- a/net/tcptraceroute-devel/files/patch-Makefile +++ b/net/tcptraceroute-devel/files/patch-Makefile @@ -1,52 +1,36 @@ -*** Makefile.orig Tue Jul 31 23:52:40 2001 ---- Makefile Thu Mar 21 16:02:29 2002 -*************** -*** 1,20 **** - # tcptraceroute -- A traceroute implementation using TCP packets - # Copyright (c) 2001, Michael C. Toren <mct@toren.net> - -! CC = gcc - CFLAGS = -O2 -Wall -! DESTDIR=/usr/local/bin - - tcptraceroute: tcptraceroute.c -! $(CC) $(CFLAGS) `libnet-config --defines` \ - -o tcptraceroute tcptraceroute.c \ -! `libnet-config --libs` -lpcap - - static: - $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" - - install: tcptraceroute -! install -D tcptraceroute $(DESTDIR)/tcptraceroute - - distrib: clean changelog man - ---- 1,27 ---- - # tcptraceroute -- A traceroute implementation using TCP packets - # Copyright (c) 2001, Michael C. Toren <mct@toren.net> - -! CC = cc - CFLAGS = -O2 -Wall -! LNETINC= -I/usr/local/include -! LNETLIB= -L/usr/local/lib -! -! BINDIR= ${PREFIX}/bin -! MANDIR= ${PREFIX}/man -! -! all: tcptraceroute - - tcptraceroute: tcptraceroute.c -! $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \ - -o tcptraceroute tcptraceroute.c \ -! $(LNETLIB) `libnet-config --libs` -lpcap - - static: - $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" - - install: tcptraceroute -! install -c -s tcptraceroute $(BINDIR)/tcptraceroute -! install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8 - - distrib: clean changelog man - +--- Makefile.orig Wed Aug 1 07:52:40 2001 ++++ Makefile Sun Mar 24 10:36:40 2002 +@@ -1,20 +1,27 @@ + # tcptraceroute -- A traceroute implementation using TCP packets + # Copyright (c) 2001, Michael C. Toren <mct@toren.net> + +-CC = gcc +-CFLAGS = -O2 -Wall +-DESTDIR=/usr/local/bin ++CC ?= cc ++CFLAGS ?= -O2 -Wall ++LNETINC= -I/usr/local/include ++LNETLIB= -L/usr/local/lib ++ ++BINDIR= ${PREFIX}/bin ++MANDIR= ${PREFIX}/man ++ ++all: tcptraceroute + + tcptraceroute: tcptraceroute.c +- $(CC) $(CFLAGS) `libnet-config --defines` \ ++ $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \ + -o tcptraceroute tcptraceroute.c \ +- `libnet-config --libs` -lpcap ++ $(LNETLIB) `libnet-config --libs` -lpcap + + static: + $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" + + install: tcptraceroute +- install -D tcptraceroute $(DESTDIR)/tcptraceroute ++ install -c -s tcptraceroute $(BINDIR)/tcptraceroute ++ install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8 + + distrib: clean changelog man + diff --git a/net/tcptraceroute/files/patch-Makefile b/net/tcptraceroute/files/patch-Makefile index 0a1755ab97c9..173962cb0853 100644 --- a/net/tcptraceroute/files/patch-Makefile +++ b/net/tcptraceroute/files/patch-Makefile @@ -1,52 +1,36 @@ -*** Makefile.orig Tue Jul 31 23:52:40 2001 ---- Makefile Thu Mar 21 16:02:29 2002 -*************** -*** 1,20 **** - # tcptraceroute -- A traceroute implementation using TCP packets - # Copyright (c) 2001, Michael C. Toren <mct@toren.net> - -! CC = gcc - CFLAGS = -O2 -Wall -! DESTDIR=/usr/local/bin - - tcptraceroute: tcptraceroute.c -! $(CC) $(CFLAGS) `libnet-config --defines` \ - -o tcptraceroute tcptraceroute.c \ -! `libnet-config --libs` -lpcap - - static: - $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" - - install: tcptraceroute -! install -D tcptraceroute $(DESTDIR)/tcptraceroute - - distrib: clean changelog man - ---- 1,27 ---- - # tcptraceroute -- A traceroute implementation using TCP packets - # Copyright (c) 2001, Michael C. Toren <mct@toren.net> - -! CC = cc - CFLAGS = -O2 -Wall -! LNETINC= -I/usr/local/include -! LNETLIB= -L/usr/local/lib -! -! BINDIR= ${PREFIX}/bin -! MANDIR= ${PREFIX}/man -! -! all: tcptraceroute - - tcptraceroute: tcptraceroute.c -! $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \ - -o tcptraceroute tcptraceroute.c \ -! $(LNETLIB) `libnet-config --libs` -lpcap - - static: - $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" - - install: tcptraceroute -! install -c -s tcptraceroute $(BINDIR)/tcptraceroute -! install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8 - - distrib: clean changelog man - +--- Makefile.orig Wed Aug 1 07:52:40 2001 ++++ Makefile Sun Mar 24 10:36:40 2002 +@@ -1,20 +1,27 @@ + # tcptraceroute -- A traceroute implementation using TCP packets + # Copyright (c) 2001, Michael C. Toren <mct@toren.net> + +-CC = gcc +-CFLAGS = -O2 -Wall +-DESTDIR=/usr/local/bin ++CC ?= cc ++CFLAGS ?= -O2 -Wall ++LNETINC= -I/usr/local/include ++LNETLIB= -L/usr/local/lib ++ ++BINDIR= ${PREFIX}/bin ++MANDIR= ${PREFIX}/man ++ ++all: tcptraceroute + + tcptraceroute: tcptraceroute.c +- $(CC) $(CFLAGS) `libnet-config --defines` \ ++ $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \ + -o tcptraceroute tcptraceroute.c \ +- `libnet-config --libs` -lpcap ++ $(LNETLIB) `libnet-config --libs` -lpcap + + static: + $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" + + install: tcptraceroute +- install -D tcptraceroute $(DESTDIR)/tcptraceroute ++ install -c -s tcptraceroute $(BINDIR)/tcptraceroute ++ install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8 + + distrib: clean changelog man + |