Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Apr 2014 21:54:53 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351145 - head/net/pmf/files
Message-ID:  <201404122154.s3CLsrTP064036@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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];



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404122154.s3CLsrTP064036>