summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorkim <kim>1998-10-13 03:46:07 +0000
committerkim <kim>1998-10-13 03:46:07 +0000
commit817cf0073e34976e0187b3a43f5090274ff905d3 (patch)
treeceacbc006d22d18bbd7c7043fff908c5940af9c7 /net
parenta51e9d2bce283af237a6d5a501ee5c9bd2d2bb9b (diff)
downloadpkgsrc-817cf0073e34976e0187b3a43f5090274ff905d3.tar.gz
Our <netinet/if_ether.h> includes <net/ethertypes.h>, so I shouldn't
include it separately. Avoid <ethertype.h> using a configure check.
Diffstat (limited to 'net')
-rw-r--r--net/ntop/patches/patch-ab12
-rw-r--r--net/ntop/patches/patch-ad6
2 files changed, 8 insertions, 10 deletions
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index a6e04b84103..fcbf2d7f504 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,16 +1,14 @@
-$NetBSD: patch-ab,v 1.3 1998/10/11 20:27:04 kim Exp $
+$NetBSD: patch-ab,v 1.4 1998/10/13 03:46:07 kim Exp $
--- ntop.h.orig Mon Oct 5 12:18:41 1998
-+++ ntop.h Sun Oct 11 15:56:17 1998
-@@ -87,8 +87,19 @@
++++ ntop.h Mon Oct 12 22:44:29 1998
+@@ -87,8 +87,17 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-+#ifdef __NetBSD__
-+#include <net/ethertypes.h>
-+#else /* __NetBSD__ */
++#ifdef HAVE_ETHERTYPE_H
#include <ethertype.h>
-+#endif /* __NetBSD__ */
++#endif
#include <setjmp.h>
+
+#ifndef ETHERTYPE_DN
diff --git a/net/ntop/patches/patch-ad b/net/ntop/patches/patch-ad
index c804aafc800..81d752afab9 100644
--- a/net/ntop/patches/patch-ad
+++ b/net/ntop/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 1998/10/11 20:27:04 kim Exp $
+$NetBSD: patch-ad,v 1.3 1998/10/13 03:46:08 kim Exp $
--- configure.in.orig Thu Sep 24 11:41:22 1998
-+++ configure.in Sun Oct 11 16:11:08 1998
++++ configure.in Mon Oct 12 22:42:57 1998
@@ -18,7 +18,7 @@
AC_LBL_C_INIT(V_CCOPT, V_INCLS)
-AC_CHECK_HEADERS(fcntl.h malloc.h memory.h ncurses.h curses.h sys/select.h netinet/if_ether.h netinet/in_systm.h stdarg.h)
-+AC_CHECK_HEADERS(fcntl.h malloc.h memory.h ncurses.h curses.h sys/select.h netinet/if_ether.h netinet/in_systm.h stdarg.h gnuc.h)
++AC_CHECK_HEADERS(fcntl.h malloc.h memory.h ncurses.h curses.h sys/select.h netinet/if_ether.h netinet/in_systm.h stdarg.h gnuc.h ethertype.h)
AC_HEADER_TIME
AC_REPLACE_FUNCS(vfprintf)