upgrade to 1.15

PR:		38237
Submitted by:	maintainer

5 files changed, 8 insertions, 62 deletions

diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index ad5808f9abb1..d91fe452fd94 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	twoftpd
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.15
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/twoftpd/
 
 MAINTAINER=	gslin@ccca.nctu.edu.tw
 
+MAN1=		twoftpd-auth.1 twoftpd-xfer.1
+
 BIN=		twoftpd-anon twoftpd-anon-conf twoftpd-auth twoftpd-conf twoftpd-xfer
 
 do-install:
+.for FILE in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${FILE} ${PREFIX}/man/man1
+.endfor
 .for FILE in ${BIN}
-	@${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/sbin
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ftp/twoftpd/distinfo b/ftp/twoftpd/distinfo
index 847410b08b63..0cb0ded3d582 100644
--- a/ftp/twoftpd/distinfo
+++ b/ftp/twoftpd/distinfo
@@ -1 +1 @@
-MD5 (twoftpd-1.14.tar.gz) = e22d8e071139386e2b1320924597ab09
+MD5 (twoftpd-1.15.tar.gz) = 1a247c51f3b99ca1414ad39d02d3728f
diff --git a/ftp/twoftpd/files/patch-socket::cork.c b/ftp/twoftpd/files/patch-socket::cork.c
deleted file mode 100644
index f79d2b7b031e..000000000000
--- a/ftp/twoftpd/files/patch-socket::cork.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- socket/cork.c.orig	Wed Mar 13 02:00:20 2002
-+++ socket/cork.c	Wed Mar 13 02:01:45 2002
-@@ -15,9 +15,9 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include "socket.h"
- 
-@@ -25,10 +25,10 @@
- {
- #if defined(TCP_CORK)
-   int flag = 1;
--  return setsockopt(sock, SOL_TCP, TCP_CORK, &flag, sizeof flag) == 0;
-+  return setsockopt(sock, SOL_SOCKET, TCP_CORK, &flag, sizeof flag) == 0;
- #elif defined(TCP_NOPUSH)
-   int flag = 1;
--  return setsockopt(sock, SOL_TCP, TCP_NOPUSH, &flag, sizeof flag) == 0;
-+  return setsockopt(sock, SOL_SOCKET, TCP_NOPUSH, &flag, sizeof flag) == 0;
- #else
-   return 1;
- #endif
diff --git a/ftp/twoftpd/files/patch-socket::uncork.c b/ftp/twoftpd/files/patch-socket::uncork.c
deleted file mode 100644
index c905540d0ff6..000000000000
--- a/ftp/twoftpd/files/patch-socket::uncork.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- socket/uncork.c.orig	Wed Mar 13 02:02:05 2002
-+++ socket/uncork.c	Wed Mar 13 02:02:35 2002
-@@ -15,9 +15,9 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
--#include <sys/types.h>
- #include <sys/socket.h>
- #include "socket.h"
- 
-@@ -25,13 +25,13 @@
- {
- #if defined(TCP_CORK)
-   int flag = 0;
--  return setsockopt(sock, SOL_TCP, TCP_CORK, &flag, sizeof flag) == 0;
-+  return setsockopt(sock, SOL_SOCKET, TCP_CORK, &flag, sizeof flag) == 0;
- #elif defined(TCP_NOPUSH)
-   /* BSD's TCP_NOPUSH option only takes effect after a write/send.
-    * Hopefully this extra write will cause the TCP stack to send out
-    * any buffered writes. */
-   int flag = 0;
--  if (setsockopt(sock, SOL_TCP, TCP_NOPUSH, &flag, sizeof flag) != 0) return 0;
-+  if (setsockopt(sock, SOL_SOCKET, TCP_NOPUSH, &flag, sizeof flag) != 0) return 0;
-   return write(sock, &flag, 0) == 0;
- #else
-   return 1;
diff --git a/ftp/twoftpd/pkg-descr b/ftp/twoftpd/pkg-descr
index a07f82891bd4..2d9214539c5d 100644
--- a/ftp/twoftpd/pkg-descr
+++ b/ftp/twoftpd/pkg-descr
@@ -7,6 +7,3 @@ end, which contains no file or data transfer code, and one of two back ends,
 which contain all the data transfer code.
 
 WWW: http://untroubled.org/twoftpd/
-
-- Gea-Suan Lin
-  gslin@ccca.nctu.edu.tw