diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2002-12-22 15:46:21 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2002-12-22 15:46:21 +0000 |
| commit | 887a47eb5050ff0ccdf55715f5679d5c02c8f7a6 (patch) | |
| tree | b6180fed12016105da0e5adee164a2c06054e472 /misc/yaunc | |
| parent | Make this build on -STABLE *and* -CURRENT. (diff) | |
Fix for -CURRENT: do not build superfluous local copy of inet_ntop()
with conflicting prototype.
Notes
Notes:
svn path=/head/; revision=71788
Diffstat (limited to 'misc/yaunc')
| -rw-r--r-- | misc/yaunc/files/patch-ae | 27 | ||||
| -rw-r--r-- | misc/yaunc/files/patch-my_hdrs.h | 12 |
2 files changed, 33 insertions, 6 deletions
diff --git a/misc/yaunc/files/patch-ae b/misc/yaunc/files/patch-ae index 76074129de70..ea17e1f4202a 100644 --- a/misc/yaunc/files/patch-ae +++ b/misc/yaunc/files/patch-ae @@ -1,5 +1,17 @@ ---- Makefile.in.orig Sat Apr 14 19:35:14 2001 -+++ Makefile.in Sat Apr 14 19:35:43 2001 + +$FreeBSD$ + +--- Makefile.in.orig Sun Dec 24 02:37:08 2000 ++++ Makefile.in Sun Dec 22 16:34:26 2002 +@@ -71,7 +71,7 @@ + + bin_PROGRAMS = yaunc + +-yaunc_SOURCES = daemon_init.c form_data.c inlines.c main.c misc.c read_conf.c resolv.c send_data.c sigfuncs.c unp_error.c unp_inet_ntop.c unp_inet_pton.c unp_sock_wrappers.c unp_wraplib.c usage.c os_specific.c my_hdrs.h yaunc.h ++yaunc_SOURCES = daemon_init.c form_data.c inlines.c main.c misc.c read_conf.c resolv.c send_data.c sigfuncs.c unp_error.c unp_sock_wrappers.c unp_wraplib.c usage.c os_specific.c my_hdrs.h yaunc.h + + + EXTRA_yaunc_SOURCES = get_ut_bsd.c get_ut_sun.c get_ut_linux.c @@ -83,8 +83,8 @@ # To tell automake that these should go in the tar EXTRA_DIST = $(man_MANS) $(sysconf_DATA) TO-DO @@ -11,3 +23,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h +@@ -96,8 +96,8 @@ + CPPFLAGS = @CPPFLAGS@ + LIBS = @LIBS@ + yaunc_OBJECTS = daemon_init.o form_data.o inlines.o main.o misc.o \ +-read_conf.o resolv.o send_data.o sigfuncs.o unp_error.o unp_inet_ntop.o \ +-unp_inet_pton.o unp_sock_wrappers.o unp_wraplib.o usage.o os_specific.o ++read_conf.o resolv.o send_data.o sigfuncs.o unp_error.o \ ++unp_sock_wrappers.o unp_wraplib.o usage.o os_specific.o + yaunc_LDADD = $(LDADD) + yaunc_DEPENDENCIES = + yaunc_LDFLAGS = diff --git a/misc/yaunc/files/patch-my_hdrs.h b/misc/yaunc/files/patch-my_hdrs.h index 25ccabddd44a..521ba7341382 100644 --- a/misc/yaunc/files/patch-my_hdrs.h +++ b/misc/yaunc/files/patch-my_hdrs.h @@ -1,9 +1,13 @@ ---- my_hdrs.h.orig Thu Mar 23 11:32:02 2000 -+++ my_hdrs.h Sun Dec 15 05:10:26 2002 -@@ -35,7 +35,6 @@ + +$FreeBSD$ + +--- my_hdrs.h.orig Thu Mar 23 03:32:02 2000 ++++ my_hdrs.h Sun Dec 22 16:33:44 2002 +@@ -34,8 +34,6 @@ + ssize_t Recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); /* other networking function */ - int inet_pton(int, const char *, void *); +-int inet_pton(int, const char *, void *); -const char * inet_ntop(int, const void *, char *, size_t); void Inet_pton(int, const char *, void *); |