From owner-svn-ports-all@FreeBSD.ORG Sat Apr 12 21:54:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 04B9BA11; Sat, 12 Apr 2014 21:54:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5111136D; Sat, 12 Apr 2014 21:54:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CLsrRi064039; Sat, 12 Apr 2014 21:54:53 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CLsrTP064036; Sat, 12 Apr 2014 21:54:53 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404122154.s3CLsrTP064036@svn.freebsd.org> From: Antoine Brodin Date: Sat, 12 Apr 2014 21:54:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351145 - head/net/pmf/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 21:54:54 -0000 Author: antoine Date: Sat Apr 12 21:54:53 2014 New Revision: 351145 URL: http://svnweb.freebsd.org/changeset/ports/351145 QAT: https://qat.redports.org/buildarchive/r351145/ Log: Fix make patch, some patches were applied twice Reported by: pkg-fallout Modified: head/net/pmf/files/patch-help.c head/net/pmf/files/patch-ipc.c head/net/pmf/files/patch-putget.c Modified: head/net/pmf/files/patch-help.c ============================================================================== --- head/net/pmf/files/patch-help.c Sat Apr 12 21:50:29 2014 (r351144) +++ head/net/pmf/files/patch-help.c Sat Apr 12 21:54:53 2014 (r351145) @@ -13,18 +13,3 @@ char *orig_arg; { char *arg, *lc = NULL, *try2 = NULL, *try3 = NULL, *try4 = NULL; ---- help.c.orig -+++ help.c -@@ -16,10 +16,11 @@ - #include "globals.h" - - extern char compile_time[], version[]; -+extern void cmd_help(); - - /*---------------------------------------------------------------------------*/ - --cmd_help(orig_arg) -+void cmd_help(orig_arg) - char *orig_arg; - { - char *arg, *lc = NULL, *try2 = NULL, *try3 = NULL, *try4 = NULL; Modified: head/net/pmf/files/patch-ipc.c ============================================================================== --- head/net/pmf/files/patch-ipc.c Sat Apr 12 21:50:29 2014 (r351144) +++ head/net/pmf/files/patch-ipc.c Sat Apr 12 21:54:53 2014 (r351145) @@ -19,24 +19,3 @@ unsigned int one, two, three; { unsigned char reply[3]; ---- ipc.c.orig -+++ ipc.c -@@ -35,8 +35,7 @@ - #endif /* FD_ZERO */ - - extern char *get_now_date_string(); -- --extern int errno; -+extern void telnet_protocol(); - - static struct in_addr host_address; - static struct sockaddr_in socket_address; -@@ -360,7 +359,7 @@ - /* This function takes the three bytes from a telnet command, - * and implements a very limited telnet protocol. - */ --telnet_protocol(one, two, three) -+void telnet_protocol(one, two, three) - unsigned int one, two, three; - { - unsigned char reply[3]; Modified: head/net/pmf/files/patch-putget.c ============================================================================== --- head/net/pmf/files/patch-putget.c Sat Apr 12 21:50:29 2014 (r351144) +++ head/net/pmf/files/patch-putget.c Sat Apr 12 21:54:53 2014 (r351145) @@ -26,31 +26,3 @@ char *filename, *optional_filename; { char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1]; ---- putget.c.orig -+++ putget.c -@@ -30,6 +30,7 @@ - *expand_variables(), - *find_robot_action_string(), - *return_last(); -+extern void cmd_putfile(), cmd_getfile(); - - /* This is a temporary buffer of text received from the MUD game. - * If the flag "getfiling" is true, the routines that receive the MUD -@@ -44,7 +45,7 @@ - /*---------------------------------------------------------------------------*/ - - /* Send a file to LPmud using the built-in editor */ --cmd_putfile(filename, optional_filename) -+void cmd_putfile(filename, optional_filename) - char *filename, *optional_filename; - { - char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1]; -@@ -103,7 +104,7 @@ - /*---------------------------------------------------------------------------*/ - - /* Get a file from LPmud using the built-in editor */ --cmd_getfile(filename, optional_filename) -+void cmd_getfile(filename, optional_filename) - char *filename, *optional_filename; - { - char *local_filename, *remote_filename, cmd_buffer[MAX_LINE_LENGTH + 1];