6 files changed, 34 insertions, 24 deletions

diff --git a/comms/ser2net/Makefile b/comms/ser2net/Makefile
index d2d8a894c8ea..abe44bcbeb94 100644
--- a/comms/ser2net/Makefile
+++ b/comms/ser2net/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ser2net
-PORTVERSION=	2.9.1
+PORTVERSION=	2.10.0
 CATEGORIES=	comms net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
diff --git a/comms/ser2net/distinfo b/comms/ser2net/distinfo
index 3276254672ab..eb4b4ae90a94 100644
--- a/comms/ser2net/distinfo
+++ b/comms/ser2net/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ser2net-2.9.1.tar.gz) = fdee1e69903cf409bdc6f32403a566cbc6006aa9e2a4d6f8f12b90dfd5ca0d0e
-SIZE (ser2net-2.9.1.tar.gz) = 357820
+SHA256 (ser2net-2.10.0.tar.gz) = 98f6193225338e25f35302fef5e1f16688693ed43e7b3c3e9e09187eb54547ac
+SIZE (ser2net-2.10.0.tar.gz) = 364322
diff --git a/comms/ser2net/files/patch-dataxfer.c b/comms/ser2net/files/patch-dataxfer.c
deleted file mode 100644
index b4d2a0f41fca..000000000000
--- a/comms/ser2net/files/patch-dataxfer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dataxfer.c.orig	Thu Dec  7 20:09:25 2006
-+++ dataxfer.c	Thu Dec  7 20:10:33 2006
-@@ -59,7 +59,7 @@
- #endif /* HAVE_TCPD_H */
- 
- #ifdef USE_UUCP_LOCKING
--static char *uucp_lck_dir = "/var/lock";
-+static char *uucp_lck_dir = "/var/spool/lock";
- #endif /* USE_UUCP_LOCKING */
- 
- 
diff --git a/comms/ser2net/files/patch-dataxfer.h b/comms/ser2net/files/patch-dataxfer.h
new file mode 100644
index 000000000000..cad6e4261f41
--- /dev/null
+++ b/comms/ser2net/files/patch-dataxfer.h
@@ -0,0 +1,11 @@
+--- dataxfer.h.orig	2014-12-28 21:17:23.000000000 +0200
++++ dataxfer.h	2014-12-28 21:17:53.000000000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef DATAXFER
+ #define DATAXFER
+ 
+-#include <linux/serial.h>
++#include <sys/serial.h>
+ 
+ #include "controller.h"
+ 
diff --git a/comms/ser2net/files/patch-devcfg.c b/comms/ser2net/files/patch-devcfg.c
new file mode 100644
index 000000000000..e648e5aee6eb
--- /dev/null
+++ b/comms/ser2net/files/patch-devcfg.c
@@ -0,0 +1,20 @@
+--- devcfg.c.orig	2014-12-28 21:15:39.000000000 +0200
++++ devcfg.c	2014-12-28 21:18:04.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <syslog.h>
+-#include <linux/serial.h>
++#include <sys/serial.h>
+ 
+ #include "ser2net.h"
+ #include "selector.h"
+@@ -133,7 +133,7 @@ get_rate_from_baud_rate(int baud_rate, i
+ }
+ 
+ #ifdef USE_UUCP_LOCKING
+-static char *uucp_lck_dir = "/var/lock";
++static char *uucp_lck_dir = "/var/spool/lock";
+ 
+ static int
+ uucp_fname_lock_size(char *devname)
diff --git a/comms/ser2net/files/patch-utils.c b/comms/ser2net/files/patch-utils.c
deleted file mode 100644
index 523215deec97..000000000000
--- a/comms/ser2net/files/patch-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils.c.old	Sun Sep  3 16:39:48 2006
-+++ utils.c	Sun Sep  3 16:39:56 2006
-@@ -21,6 +21,7 @@
- 
- #include <string.h>
- #include <netdb.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>