aboutsummaryrefslogtreecommitdiff
path: root/net/libunp
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-06-17 23:28:04 +0000
committerMathieu Arnold <mat@FreeBSD.org>2016-06-17 23:28:04 +0000
commit1a8a092d9fefcbd7f960c82c59802c61807867a6 (patch)
tree48e47bf661e0e5d6ed9c060e8aea683b30d4540f /net/libunp
parent77a17abea6e535d47564d5d0db090f47cf4a15f4 (diff)
downloadports-1a8a092d9fefcbd7f960c82c59802c61807867a6.tar.gz
ports-1a8a092d9fefcbd7f960c82c59802c61807867a6.zip
Rename all files containing a : in their filename.
While there, run make makepatch on affected ports, and rename patches accordingly. Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=417041
Diffstat (limited to 'net/libunp')
-rw-r--r--net/libunp/Makefile2
-rw-r--r--net/libunp/files/patch-Make.defines.in8
-rw-r--r--net/libunp/files/patch-Makefile.in (renamed from net/libunp/files/patch-Makerfile.in)4
-rw-r--r--net/libunp/files/patch-configure14
-rw-r--r--net/libunp/files/patch-icmpd_Makefile4
-rw-r--r--net/libunp/files/patch-intro_Makefile6
-rw-r--r--net/libunp/files/patch-lib_Makefile8
-rw-r--r--net/libunp/files/patch-lib_mcast__join.c (renamed from net/libunp/files/patch-lib_mcast_join.c)6
-rw-r--r--net/libunp/files/patch-lib_mcast__leave.c (renamed from net/libunp/files/patch-lib_mcast_leave.c)6
-rw-r--r--net/libunp/files/patch-lib_unp.h6
-rw-r--r--net/libunp/files/patch-lib_unpifi.h4
-rw-r--r--net/libunp/files/patch-lib_unprtt.h4
-rw-r--r--net/libunp/files/patch-lib_unpthread.h4
-rw-r--r--net/libunp/files/patch-lib_wrappthread.c6
-rw-r--r--net/libunp/files/patch-lib_wrapsock__r.c (renamed from net/libunp/files/patch-lib_wrapsock_r.c)6
-rw-r--r--net/libunp/files/patch-libfree:inet_ntop.c11
-rw-r--r--net/libunp/files/patch-libfree_Makefile4
-rw-r--r--net/libunp/files/patch-libfree_inet__ntop.c11
-rw-r--r--net/libunp/files/patch-libgai_Makefile6
-rw-r--r--net/libunp/files/patch-libgai_unp.h5
-rw-r--r--net/libunp/files/patch-libroute_Makefile4
-rw-r--r--net/libunp/files/patch-ping_Makefile4
-rw-r--r--net/libunp/files/patch-traceroute_Makefile4
23 files changed, 68 insertions, 69 deletions
diff --git a/net/libunp/Makefile b/net/libunp/Makefile
index c75ad9403c9c..e1ac346c569a 100644
--- a/net/libunp/Makefile
+++ b/net/libunp/Makefile
@@ -14,7 +14,7 @@ COMMENT= The networking library used in UNIX Network Programming Volume 1 2e
USES= gmake
GNU_CONFIGURE= yes
-pre-patch:
+post-extract:
@${CP} ${WRKSRC}/lib/wrapsock.c ${WRKSRC}/lib/wrapsock_r.c
post-configure:
diff --git a/net/libunp/files/patch-Make.defines.in b/net/libunp/files/patch-Make.defines.in
index 2fdb2887a59d..73af300a0590 100644
--- a/net/libunp/files/patch-Make.defines.in
+++ b/net/libunp/files/patch-Make.defines.in
@@ -1,6 +1,6 @@
---- Make.defines.in.orig Thu Jun 12 16:20:21 1997
-+++ Make.defines.in Thu Sep 30 10:13:57 1999
-@@ -17,6 +17,7 @@
+--- Make.defines.in.orig 1997-06-12 20:20:21 UTC
++++ Make.defines.in
+@@ -17,6 +17,7 @@ RANLIB = @RANLIB@
# Following is the main library, built from all the object files
# in the lib/ and libfree/ directories.
LIBUNP_NAME = @LIBUNP_NAME@
@@ -8,7 +8,7 @@
# Following is the XTI library, built from all the object files
# in the libxti/ directory.
-@@ -24,6 +25,7 @@
+@@ -24,6 +25,7 @@ LIBUNPXTI_NAME = @LIBUNPXTI_NAME@
# Following are all the object files to create in the lib/ directory.
LIB_OBJS = @LIB_OBJS@
diff --git a/net/libunp/files/patch-Makerfile.in b/net/libunp/files/patch-Makefile.in
index 71c936aef1e9..14202614832a 100644
--- a/net/libunp/files/patch-Makerfile.in
+++ b/net/libunp/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Apr 11 18:42:26 1997
-+++ Makefile.in Thu Sep 30 09:51:16 1999
+--- Makefile.in.orig 1997-04-11 22:42:26 UTC
++++ Makefile.in
@@ -1,8 +1,13 @@
include ./Make.defines
diff --git a/net/libunp/files/patch-configure b/net/libunp/files/patch-configure
index 003640b52901..065a610ccc38 100644
--- a/net/libunp/files/patch-configure
+++ b/net/libunp/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Thu Jul 10 11:19:39 1997
-+++ configure Thu Sep 30 12:29:28 1999
-@@ -1101,10 +1101,12 @@
+--- configure.orig 1997-07-10 15:19:39 UTC
++++ configure
+@@ -1101,10 +1101,12 @@ if test -f $HOME/libunp.a ; then
echo "$ac_t""yes" 1>&6
LIBUNP="$HOME/libunp.a"
LIBUNP_NAME=$HOME/libunp.a
@@ -13,7 +13,7 @@
fi
echo $ac_n "checking for $HOME/libunpxti.a""... $ac_c" 1>&6
-@@ -4288,7 +4290,6 @@
+@@ -4288,7 +4290,6 @@ LIB_OBJS="$LIB_OBJS udp_client.o"
LIB_OBJS="$LIB_OBJS udp_connect.o"
LIB_OBJS="$LIB_OBJS udp_server.o"
LIB_OBJS="$LIB_OBJS wraplib.o"
@@ -21,7 +21,7 @@
LIB_OBJS="$LIB_OBJS wrapstdio.o"
if test "$ac_cv_header_pthread_h" = yes ; then
LIB_OBJS="$LIB_OBJS wrappthread.o"
-@@ -4297,6 +4298,8 @@
+@@ -4297,6 +4298,8 @@ LIB_OBJS="$LIB_OBJS wrapunix.o"
LIB_OBJS="$LIB_OBJS write_fd.o"
LIB_OBJS="$LIB_OBJS writen.o"
LIB_OBJS="$LIB_OBJS writable_timeo.o"
@@ -30,7 +30,7 @@
LIBFREE_OBJS=
-@@ -4514,6 +4517,7 @@
+@@ -4514,6 +4517,7 @@ s%@CC@%$CC%g
s%@RANLIB@%$RANLIB%g
s%@CPP@%$CPP%g
s%@LIB_OBJS@%$LIB_OBJS%g
@@ -38,7 +38,7 @@
s%@LIBFREE_OBJS@%$LIBFREE_OBJS%g
s%@LIBGAI_OBJS@%$LIBGAI_OBJS%g
s%@LIBROUTE_OBJS@%$LIBROUTE_OBJS%g
-@@ -4522,6 +4526,7 @@
+@@ -4522,6 +4526,7 @@ s%@LIBS_XTI@%$LIBS_XTI%g
s%@LIBUNP@%$LIBUNP%g
s%@LIBUNPXTI@%$LIBUNPXTI%g
s%@LIBUNP_NAME@%$LIBUNP_NAME%g
diff --git a/net/libunp/files/patch-icmpd_Makefile b/net/libunp/files/patch-icmpd_Makefile
index 18f3bf31563c..ae5aa7dcda40 100644
--- a/net/libunp/files/patch-icmpd_Makefile
+++ b/net/libunp/files/patch-icmpd_Makefile
@@ -1,5 +1,5 @@
---- icmpd/Makefile.orig Tue Sep 28 11:40:21 1999
-+++ icmpd/Makefile Tue Sep 28 11:40:24 1999
+--- icmpd/Makefile.orig 1997-07-06 18:12:00 UTC
++++ icmpd/Makefile
@@ -1,6 +1,6 @@
include ../Make.defines
diff --git a/net/libunp/files/patch-intro_Makefile b/net/libunp/files/patch-intro_Makefile
index 744bbd971c2e..ce8d0d3b1b6b 100644
--- a/net/libunp/files/patch-intro_Makefile
+++ b/net/libunp/files/patch-intro_Makefile
@@ -1,6 +1,6 @@
---- intro/Makefile.orig Tue Sep 28 11:39:20 1999
-+++ intro/Makefile Tue Sep 28 11:39:35 1999
-@@ -2,7 +2,6 @@
+--- intro/Makefile.orig 1997-05-08 22:37:08 UTC
++++ intro/Makefile
+@@ -2,7 +2,6 @@ include ../Make.defines
PROGS = daytimetcpcli daytimetcpcli1 daytimetcpcli2 daytimetcpcli3 \
daytimetcpsrv daytimetcpsrv1 daytimetcpsrv2 daytimetcpsrv3 \
diff --git a/net/libunp/files/patch-lib_Makefile b/net/libunp/files/patch-lib_Makefile
index 0b4832540669..45be887b110c 100644
--- a/net/libunp/files/patch-lib_Makefile
+++ b/net/libunp/files/patch-lib_Makefile
@@ -1,5 +1,5 @@
---- lib/Makefile.orig Fri Apr 11 17:38:27 1997
-+++ lib/Makefile Thu Sep 30 11:34:21 1999
+--- lib/Makefile.orig 1997-04-11 21:38:27 UTC
++++ lib/Makefile
@@ -1,8 +1,16 @@
include ../Make.defines
@@ -11,10 +11,10 @@
+libunp.a: ${LIB_OBJS}
ar rv ${LIBUNP_NAME} $?
${RANLIB} ${LIBUNP_NAME}
-+
+
+libunp_r.a: ${LIB_THREADSAFE_OBJS}
+ ar rv ${LIBUNP_THREADSAFE_NAME} $?
+ ${RANLIB} ${LIBUNP_THREADSAFE_NAME}
-
++
clean:
rm -f ${PROGS} ${CLEANFILES}
diff --git a/net/libunp/files/patch-lib_mcast_join.c b/net/libunp/files/patch-lib_mcast__join.c
index 5ac07b948fdb..4d7c7e9c3c94 100644
--- a/net/libunp/files/patch-lib_mcast_join.c
+++ b/net/libunp/files/patch-lib_mcast__join.c
@@ -1,6 +1,6 @@
---- lib/mcast_join.c- Tue Feb 8 15:12:14 2000
-+++ lib/mcast_join.c Tue Feb 8 15:12:37 2000
-@@ -56,7 +56,7 @@
+--- lib/mcast_join.c.orig 1997-06-19 03:15:06 UTC
++++ lib/mcast_join.c
+@@ -56,7 +56,7 @@ doioctl:
else
mreq6.ipv6mr_interface = 0;
diff --git a/net/libunp/files/patch-lib_mcast_leave.c b/net/libunp/files/patch-lib_mcast__leave.c
index 61b218ab73d4..2bc3a8c8b092 100644
--- a/net/libunp/files/patch-lib_mcast_leave.c
+++ b/net/libunp/files/patch-lib_mcast__leave.c
@@ -1,6 +1,6 @@
---- lib/mcast_leave.c- Tue Feb 8 15:10:50 2000
-+++ lib/mcast_leave.c Tue Feb 8 15:05:53 2000
-@@ -23,7 +23,7 @@
+--- lib/mcast_leave.c.orig 1997-06-18 19:50:58 UTC
++++ lib/mcast_leave.c
+@@ -23,7 +23,7 @@ mcast_leave(int sockfd, const SA *sa, so
&((struct sockaddr_in6 *) sa)->sin6_addr,
sizeof(struct in6_addr));
mreq6.ipv6mr_interface = 0;
diff --git a/net/libunp/files/patch-lib_unp.h b/net/libunp/files/patch-lib_unp.h
index c896e52d7ced..0a93bc4dcc48 100644
--- a/net/libunp/files/patch-lib_unp.h
+++ b/net/libunp/files/patch-lib_unp.h
@@ -1,5 +1,5 @@
---- lib/unp.h.orig Sun Sep 14 15:49:59 1997
-+++ lib/unp.h Thu Sep 30 11:12:55 1999
+--- lib/unp.h.orig 1997-09-14 19:49:59 UTC
++++ lib/unp.h
@@ -4,7 +4,7 @@
#ifndef __unp_h
#define __unp_h
@@ -9,7 +9,7 @@
/* "../config.h" is generated by configure */
/* If anything changes in the following list of #includes, must change
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ typedef void Sigfunc(int); /* for signal
#define max(a,b) ((a) > (b) ? (a) : (b))
#ifndef HAVE_ADDRINFO_STRUCT
diff --git a/net/libunp/files/patch-lib_unpifi.h b/net/libunp/files/patch-lib_unpifi.h
index d3cecdac1803..199240ef6f53 100644
--- a/net/libunp/files/patch-lib_unpifi.h
+++ b/net/libunp/files/patch-lib_unpifi.h
@@ -1,5 +1,5 @@
---- lib/unpifi.h.orig Thu Sep 30 11:13:10 1999
-+++ lib/unpifi.h Thu Sep 30 11:13:43 1999
+--- lib/unpifi.h.orig 1997-07-13 20:44:52 UTC
++++ lib/unpifi.h
@@ -4,7 +4,7 @@
#ifndef __unp_ifi_h
#define __unp_ifi_h
diff --git a/net/libunp/files/patch-lib_unprtt.h b/net/libunp/files/patch-lib_unprtt.h
index 3df5be5e7189..42be3bce657c 100644
--- a/net/libunp/files/patch-lib_unprtt.h
+++ b/net/libunp/files/patch-lib_unprtt.h
@@ -1,5 +1,5 @@
---- lib/unprtt.h.orig Thu Sep 30 11:13:16 1999
-+++ lib/unprtt.h Thu Sep 30 11:13:37 1999
+--- lib/unprtt.h.orig 1997-09-02 17:39:54 UTC
++++ lib/unprtt.h
@@ -1,7 +1,7 @@
#ifndef __unp_rtt_h
#define __unp_rtt_h
diff --git a/net/libunp/files/patch-lib_unpthread.h b/net/libunp/files/patch-lib_unpthread.h
index 360bae21a1bd..67cfc40f95fd 100644
--- a/net/libunp/files/patch-lib_unpthread.h
+++ b/net/libunp/files/patch-lib_unpthread.h
@@ -1,5 +1,5 @@
---- lib/unpthread.h.orig Thu Sep 30 11:13:20 1999
-+++ lib/unpthread.h Thu Sep 30 11:13:41 1999
+--- lib/unpthread.h.orig 1997-06-25 19:16:58 UTC
++++ lib/unpthread.h
@@ -4,7 +4,7 @@
#ifndef __unp_pthread_h
#define __unp_pthread_h
diff --git a/net/libunp/files/patch-lib_wrappthread.c b/net/libunp/files/patch-lib_wrappthread.c
index 40b08fb3f03c..e313e52b2f5a 100644
--- a/net/libunp/files/patch-lib_wrappthread.c
+++ b/net/libunp/files/patch-lib_wrappthread.c
@@ -1,6 +1,6 @@
---- lib/wrappthread.c.orig Thu Sep 30 11:06:22 1999
-+++ lib/wrappthread.c Thu Sep 30 11:06:34 1999
-@@ -40,17 +40,6 @@
+--- lib/wrappthread.c.orig 1997-06-27 22:04:01 UTC
++++ lib/wrappthread.c
+@@ -40,17 +40,6 @@ Pthread_detach(pthread_t tid)
}
void
diff --git a/net/libunp/files/patch-lib_wrapsock_r.c b/net/libunp/files/patch-lib_wrapsock__r.c
index d53ced0afae2..1246b32a06ab 100644
--- a/net/libunp/files/patch-lib_wrapsock_r.c
+++ b/net/libunp/files/patch-lib_wrapsock__r.c
@@ -1,6 +1,6 @@
---- lib/wrapsock_r.c.orig Thu Sep 30 12:04:02 1999
-+++ lib/wrapsock_r.c Thu Sep 30 12:04:10 1999
-@@ -97,19 +97,6 @@
+--- lib/wrapsock_r.c.orig 2016-06-17 22:39:47 UTC
++++ lib/wrapsock_r.c
+@@ -97,19 +97,6 @@ Listen(int fd, int backlog)
}
/* end Listen */
diff --git a/net/libunp/files/patch-libfree:inet_ntop.c b/net/libunp/files/patch-libfree:inet_ntop.c
deleted file mode 100644
index d65c3b8b3cfa..000000000000
--- a/net/libunp/files/patch-libfree:inet_ntop.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libfree/inet_ntop.c.orig Sat Feb 21 21:25:08 2004
-+++ libfree/inet_ntop.c Sat Feb 21 21:25:21 2004
-@@ -57,7 +57,7 @@
- int af;
- const void *src;
- char *dst;
-- size_t size;
-+ socklen_t size;
- {
- switch (af) {
- case AF_INET:
diff --git a/net/libunp/files/patch-libfree_Makefile b/net/libunp/files/patch-libfree_Makefile
index b02f2d5020e0..31648576e861 100644
--- a/net/libunp/files/patch-libfree_Makefile
+++ b/net/libunp/files/patch-libfree_Makefile
@@ -1,5 +1,5 @@
---- libfree/Makefile.orig Fri Oct 3 12:52:41 1997
-+++ libfree/Makefile Thu Sep 30 11:34:21 1999
+--- libfree/Makefile.orig 1997-10-03 16:52:41 UTC
++++ libfree/Makefile
@@ -1,8 +1,12 @@
include ../Make.defines
diff --git a/net/libunp/files/patch-libfree_inet__ntop.c b/net/libunp/files/patch-libfree_inet__ntop.c
new file mode 100644
index 000000000000..8715366f61be
--- /dev/null
+++ b/net/libunp/files/patch-libfree_inet__ntop.c
@@ -0,0 +1,11 @@
+--- libfree/inet_ntop.c.orig 1997-04-13 22:23:41 UTC
++++ libfree/inet_ntop.c
+@@ -57,7 +57,7 @@ inet_ntop(af, src, dst, size)
+ int af;
+ const void *src;
+ char *dst;
+- size_t size;
++ socklen_t size;
+ {
+ switch (af) {
+ case AF_INET:
diff --git a/net/libunp/files/patch-libgai_Makefile b/net/libunp/files/patch-libgai_Makefile
index 45eb9ea9b918..44ee4c82bdb6 100644
--- a/net/libunp/files/patch-libgai_Makefile
+++ b/net/libunp/files/patch-libgai_Makefile
@@ -1,6 +1,6 @@
---- libgai/Makefile.orig Mon Jun 2 18:03:30 1997
-+++ libgai/Makefile Thu Sep 30 11:34:11 1999
-@@ -6,9 +6,13 @@
+--- libgai/Makefile.orig 1997-06-02 22:03:30 UTC
++++ libgai/Makefile
+@@ -6,9 +6,13 @@ include ../Make.defines
# appear in the book (too much clutter, given the amount of conditional
# testing for all the code in this directory).
diff --git a/net/libunp/files/patch-libgai_unp.h b/net/libunp/files/patch-libgai_unp.h
index 25f4146ab45b..d7bf18fd0350 100644
--- a/net/libunp/files/patch-libgai_unp.h
+++ b/net/libunp/files/patch-libgai_unp.h
@@ -1,7 +1,6 @@
Index: libgai/unp.h
-diff -u libgai/unp.h.orig libgai/unp.h
---- libgai/unp.h.orig Mon Sep 15 04:49:59 1997
-+++ libgai/unp.h Thu Oct 30 00:31:12 2003
+--- libgai/unp.h.orig 1997-09-14 19:49:59 UTC
++++ libgai/unp.h
@@ -58,6 +58,13 @@
# include <pthread.h>
#endif
diff --git a/net/libunp/files/patch-libroute_Makefile b/net/libunp/files/patch-libroute_Makefile
index 6c2dd5bedf61..cca34f47fbfa 100644
--- a/net/libunp/files/patch-libroute_Makefile
+++ b/net/libunp/files/patch-libroute_Makefile
@@ -1,5 +1,5 @@
---- libroute/Makefile.orig Thu Jun 12 16:16:47 1997
-+++ libroute/Makefile Thu Sep 30 11:34:21 1999
+--- libroute/Makefile.orig 1997-06-12 20:16:47 UTC
++++ libroute/Makefile
@@ -1,8 +1,12 @@
include ../Make.defines
diff --git a/net/libunp/files/patch-ping_Makefile b/net/libunp/files/patch-ping_Makefile
index ab4a7319b7ff..1ea339f3847c 100644
--- a/net/libunp/files/patch-ping_Makefile
+++ b/net/libunp/files/patch-ping_Makefile
@@ -1,5 +1,5 @@
---- ping/Makefile.orig Tue Sep 28 11:40:42 1999
-+++ ping/Makefile Tue Sep 28 11:40:53 1999
+--- ping/Makefile.orig 1997-04-13 19:49:47 UTC
++++ ping/Makefile
@@ -1,7 +1,7 @@
include ../Make.defines
diff --git a/net/libunp/files/patch-traceroute_Makefile b/net/libunp/files/patch-traceroute_Makefile
index 9702ebe43672..7bbb9b947700 100644
--- a/net/libunp/files/patch-traceroute_Makefile
+++ b/net/libunp/files/patch-traceroute_Makefile
@@ -1,5 +1,5 @@
---- traceroute/Makefile.orig Tue Sep 28 11:41:09 1999
-+++ traceroute/Makefile Tue Sep 28 11:41:17 1999
+--- traceroute/Makefile.orig 1997-04-13 19:51:29 UTC
++++ traceroute/Makefile
@@ -1,6 +1,6 @@
include ../Make.defines