From 7eade38b85eadeb5a6bc205abd388a98cd27a522 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Mon, 29 Apr 2002 00:08:06 +0000 Subject: Port failed to build due to upgrade by PR/37327 which failed to remove the patches from the files directory. This commit fixes the problem. PR: 37545 Submitted by: MAINTAINER: Edwin Groothuis Detected by: BENTO --- net-mgmt/ipv6calc/files/patch-Makefile.in | 34 ----------------------------- net-mgmt/ipv6calc/files/patch-ipv6calc.h.in | 10 --------- net/ipv6calc/files/patch-Makefile.in | 34 ----------------------------- net/ipv6calc/files/patch-ipv6calc.h.in | 10 --------- 4 files changed, 88 deletions(-) delete mode 100644 net-mgmt/ipv6calc/files/patch-Makefile.in delete mode 100644 net-mgmt/ipv6calc/files/patch-ipv6calc.h.in delete mode 100644 net/ipv6calc/files/patch-Makefile.in delete mode 100644 net/ipv6calc/files/patch-ipv6calc.h.in diff --git a/net-mgmt/ipv6calc/files/patch-Makefile.in b/net-mgmt/ipv6calc/files/patch-Makefile.in deleted file mode 100644 index 3b673a69521b..000000000000 --- a/net-mgmt/ipv6calc/files/patch-Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.in.orig Mon Feb 25 16:40:18 2002 -+++ Makefile.in Tue Feb 26 18:06:30 2002 -@@ -9,16 +9,13 @@ - # - - # Compiler and Linker Options --COPTS = -O2 -Wall -g -ansi # ANSI compatible -+COPTS = -Wall -ansi # ANSI compatible - --CFLAGS = $(COPTS) -Igetopt/ -+CFLAGS += $(COPTS) -I${LOCALBASE}/include - --CC = gcc - - OBJS = ipv6calc.o addr_to_compressed.o addr_to_uncompressed.o addr_to_fulluncompressed.o addr_to_ifinet6.o addr_to_ip6int.o addr_to_bitstring.o ifinet6_to_compressed.o libipv6calc.o addr_to_base85.o librfc1924.o base85_to_addr.o librfc1884.o libmac.o libeui64.o mac_to_eui64.o eui64_to_privacy.o librfc3041.o showinfo.o libipv6addr.o librfc2874.o libhelp.o librfc1886.o - --GETOBJS = getopt/getopt.o getopt/getopt1.o -- - all: ipv6calc - - .c.o: -@@ -26,9 +23,9 @@ - - $(OBJS): ipv6calc.h libipv6addr.h librfc1884.h librfc2874.h addr_to_fulluncompressed.h base85_to_addr.h addr_to_base85.h addr_to_ifinet6.h libeui64.h libmac.h librfc3041.h addr_to_bitstring.h addr_to_ip6int.h eui64_to_privacy.h libhelp.h mac_to_eui64.h addr_to_compressed.h addr_to_uncompressed.h ifinet6_to_compressed.h libipv6addr.h librfc1924.h showinfo.h librfc1886.h - --ipv6calc: $(OBJS) getopt-make -- $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lcrypto -- $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) -lcrypto -static -+ipv6calc: $(OBJS) -+ $(CC) -o ipv6calc $(OBJS) -lcrypto -lgnugetopt -L${LOCALBASE}/lib -+ $(CC) -o ipv6calc-static $(OBJS) -lgnugetopt -lcrypto -static -L${LOCALBASE}/lib - - distclean: - make clean diff --git a/net-mgmt/ipv6calc/files/patch-ipv6calc.h.in b/net-mgmt/ipv6calc/files/patch-ipv6calc.h.in deleted file mode 100644 index 519bc029bf5f..000000000000 --- a/net-mgmt/ipv6calc/files/patch-ipv6calc.h.in +++ /dev/null @@ -1,10 +0,0 @@ ---- ipv6calc.h.in.orig Wed Feb 27 09:51:19 2002 -+++ ipv6calc.h.in Wed Feb 27 09:50:48 2002 -@@ -19,6 +19,7 @@ - #define PROGRAM_COPYRIGHT "(P) & (C) 2001-2002 by Peter Bieringer \n published under GNU GPL" - - /* global includes */ -+#include - #include - - /*** global definitions ***/ diff --git a/net/ipv6calc/files/patch-Makefile.in b/net/ipv6calc/files/patch-Makefile.in deleted file mode 100644 index 3b673a69521b..000000000000 --- a/net/ipv6calc/files/patch-Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.in.orig Mon Feb 25 16:40:18 2002 -+++ Makefile.in Tue Feb 26 18:06:30 2002 -@@ -9,16 +9,13 @@ - # - - # Compiler and Linker Options --COPTS = -O2 -Wall -g -ansi # ANSI compatible -+COPTS = -Wall -ansi # ANSI compatible - --CFLAGS = $(COPTS) -Igetopt/ -+CFLAGS += $(COPTS) -I${LOCALBASE}/include - --CC = gcc - - OBJS = ipv6calc.o addr_to_compressed.o addr_to_uncompressed.o addr_to_fulluncompressed.o addr_to_ifinet6.o addr_to_ip6int.o addr_to_bitstring.o ifinet6_to_compressed.o libipv6calc.o addr_to_base85.o librfc1924.o base85_to_addr.o librfc1884.o libmac.o libeui64.o mac_to_eui64.o eui64_to_privacy.o librfc3041.o showinfo.o libipv6addr.o librfc2874.o libhelp.o librfc1886.o - --GETOBJS = getopt/getopt.o getopt/getopt1.o -- - all: ipv6calc - - .c.o: -@@ -26,9 +23,9 @@ - - $(OBJS): ipv6calc.h libipv6addr.h librfc1884.h librfc2874.h addr_to_fulluncompressed.h base85_to_addr.h addr_to_base85.h addr_to_ifinet6.h libeui64.h libmac.h librfc3041.h addr_to_bitstring.h addr_to_ip6int.h eui64_to_privacy.h libhelp.h mac_to_eui64.h addr_to_compressed.h addr_to_uncompressed.h ifinet6_to_compressed.h libipv6addr.h librfc1924.h showinfo.h librfc1886.h - --ipv6calc: $(OBJS) getopt-make -- $(CC) -o ipv6calc $(OBJS) $(GETOBJS) -lcrypto -- $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) -lcrypto -static -+ipv6calc: $(OBJS) -+ $(CC) -o ipv6calc $(OBJS) -lcrypto -lgnugetopt -L${LOCALBASE}/lib -+ $(CC) -o ipv6calc-static $(OBJS) -lgnugetopt -lcrypto -static -L${LOCALBASE}/lib - - distclean: - make clean diff --git a/net/ipv6calc/files/patch-ipv6calc.h.in b/net/ipv6calc/files/patch-ipv6calc.h.in deleted file mode 100644 index 519bc029bf5f..000000000000 --- a/net/ipv6calc/files/patch-ipv6calc.h.in +++ /dev/null @@ -1,10 +0,0 @@ ---- ipv6calc.h.in.orig Wed Feb 27 09:51:19 2002 -+++ ipv6calc.h.in Wed Feb 27 09:50:48 2002 -@@ -19,6 +19,7 @@ - #define PROGRAM_COPYRIGHT "(P) & (C) 2001-2002 by Peter Bieringer \n published under GNU GPL" - - /* global includes */ -+#include - #include - - /*** global definitions ***/ -- cgit v1.2.3