Fix return types.

6 files changed, 619 insertions, 14 deletions

diff --git a/net/socks4/distinfo b/net/socks4/distinfo
index 850ca3498f5..25f7448697e 100644
--- a/net/socks4/distinfo
+++ b/net/socks4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2009/02/08 00:16:00 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/03/02 18:29:48 joerg Exp $
 
 SHA1 (export.socks.cstc.4.2.2.tar.gz) = 7d8d041c82213f9fd60f64aadf9c1ade418e15db
 RMD160 (export.socks.cstc.4.2.2.tar.gz) = 03dc72b80f2223c7462ecf168a0fbbf3effd5223
@@ -8,17 +8,19 @@ SHA1 (patch-ab) = fd3f119add1144b24eb2cec578c011bcb397e875
 SHA1 (patch-ac) = d3988d7ae5103bd7849305bb555d7cf3b1574ddc
 SHA1 (patch-ad) = 321d88cf5863f8c3f0b5b3623a1af2c4753f5eb3
 SHA1 (patch-ae) = 6bb9ffb57bb45f3a427059ddeee1f8cfd5489ab4
-SHA1 (patch-af) = fc08b324b19be9ea35d8f7c0f59073ac6c0349b7
+SHA1 (patch-af) = 6a24c477833b6ea6cad8839249f7553967c6389e
 SHA1 (patch-ag) = 805ba908664d23c774acec0bb80c0169e5b2731e
-SHA1 (patch-ah) = 71af7c7706f60f02b7b2fe936cdb7163b0054220
+SHA1 (patch-ah) = 75c37bde31dca2c96ddc448e3e29afa897e56446
 SHA1 (patch-ai) = 31ab5443177a211f34afebb7c110a5c45a307c25
 SHA1 (patch-aj) = 277772e951c26ad1ff7f767e3a0943b8cad84982
 SHA1 (patch-ak) = a36dea113c30fa951b9eb96e49eb00667a63a868
 SHA1 (patch-al) = d955ca99b0d73b47281144776c09d4380b5d939e
-SHA1 (patch-am) = 712ccb9bdc0bebc40e5fa752e6a25944275b33e0
+SHA1 (patch-am) = 49f2548de6baf5193a68ca39462bd65b9cba77e5
 SHA1 (patch-an) = 23b930373ecc06711cdcb869e5e4b6c8bdb410b4
 SHA1 (patch-ao) = 23e9ad01762f280ab169990cba657637ed45a058
 SHA1 (patch-ap) = f8a20f8301083e4a679766febdfb5c646c4cf8c9
 SHA1 (patch-aq) = 0359ed3ee095fb2844f998a3c00a61fc1685c8e8
 SHA1 (patch-ar) = 45d49f6f1be44ce3422e51abe6bfccdb419de6d0
 SHA1 (patch-as) = 90c12847eabb72273e7ef7172cdc5c4a8c97c43f
+SHA1 (patch-rftp_domacro.c) = fba6b15be2ed70a85e0ab152f97e86721ecc2857
+SHA1 (patch-rftp_main.c) = 2e05b7607694af0f47ed883822998c0748f99be9
diff --git a/net/socks4/patches/patch-af b/net/socks4/patches/patch-af
index 424c6fb1992..b54714191ef 100644
--- a/net/socks4/patches/patch-af
+++ b/net/socks4/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $
+$NetBSD: patch-af,v 1.4 2013/03/02 18:29:48 joerg Exp $
 
 --- rftp/ftp.c.orig	1995-09-07 02:24:03.000000000 +0000
 +++ rftp/ftp.c
@@ -26,16 +26,17 @@ $NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $
  
  /* >>> YDL */
  #if	!defined(BSD) || (BSD - 43 <= 0)
-@@ -158,6 +158,8 @@ herror(s)
+@@ -158,6 +158,9 @@ herror(s)
  
  #endif /* !defined(SVR3) && !defined(BIND_RESOLVER) && !defined(LINUX) */
  
 +int command(char *fmt, ...);
++void proxtrans(char *cmd, char *local, char *remote);
 +
  
  char *
  hookup(host, port)
-@@ -358,11 +360,10 @@ cmdabort()
+@@ -358,11 +361,10 @@ cmdabort()
  }
  
  /*VARARGS*/
@@ -49,7 +50,7 @@ $NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $
  	int r;
  	sig_t oldintr;
  	void cmdabort();
-@@ -370,8 +371,7 @@ va_dcl
+@@ -370,8 +372,7 @@ va_dcl
  	abrtflag = 0;
  	if (debug) {
  		printf("---> ");
@@ -59,7 +60,7 @@ $NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $
  		if (strncmp("PASS ", fmt, 5) == 0)
  			printf("PASS XXXX");
  		else 
-@@ -386,8 +386,7 @@ va_dcl
+@@ -386,8 +387,7 @@ va_dcl
  		return (0);
  	}
  	oldintr = signal(SIGINT, cmdabort);
@@ -69,3 +70,44 @@ $NetBSD: patch-af,v 1.3 2005/12/27 13:48:56 joerg Exp $
  	vfprintf(cout, fmt, ap);
  	va_end(ap);
  	fprintf(cout, "\r\n");
+@@ -533,9 +533,7 @@ abortsend()
+ 
+ #define HASHBYTES 1024
+ 
+-sendrequest(cmd, local, remote, printnames)
+-	char *cmd, *local, *remote;
+-	int printnames;
++void sendrequest(char *cmd, char *local, char *remote, int printnames)
+ {
+ 	struct stat st;
+ 	struct timeval start, stop;
+@@ -792,8 +790,7 @@ abortrecv()
+ 	longjmp(recvabort, 1);
+ }
+ 
+-recvrequest(cmd, local, remote, lmode, printnames)
+-	char *cmd, *local, *remote, *lmode;
++void recvrequest(char *cmd, char *local, char *remote, char *lmode, char *printnames)
+ {
+ 	FILE *fout, *din = 0, *popen();
+ 	int (*closefunc)(), pclose(), fclose();
+@@ -1320,8 +1317,7 @@ psabort()
+ 	abrtflag++;
+ }
+ 
+-pswitch(flag)
+-	int flag;
++void pswitch(int flag)
+ {
+ 	extern int proxy, abrtflag;
+ 	sig_t oldintr;
+@@ -1427,8 +1423,7 @@ abortpt()
+ 	longjmp(ptabort, 1);
+ }
+ 
+-proxtrans(cmd, local, remote)
+-	char *cmd, *local, *remote;
++void proxtrans(char *cmd, char *local, char *remote)
+ {
+ 	sig_t oldintr;
+ 	int secndflag = 0, prox_type, nfnd;
diff --git a/net/socks4/patches/patch-ah b/net/socks4/patches/patch-ah
index 359f9f086e1..3760882f669 100644
--- a/net/socks4/patches/patch-ah
+++ b/net/socks4/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1 2005/12/27 13:48:56 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2013/03/02 18:29:48 joerg Exp $
 
---- lib/Rconnect.c.orig	2005-12-18 19:23:30.000000000 +0000
+--- lib/Rconnect.c.orig	1995-09-07 02:23:42.000000000 +0000
 +++ lib/Rconnect.c
 @@ -2,7 +2,7 @@
  #include <sys/time.h>
@@ -19,3 +19,31 @@ $NetBSD: patch-ah,v 1.1 2005/12/27 13:48:56 joerg Exp $
  extern char	*getenv();
  extern char	*getlogin();
  static struct sockaddr_in	cursin;
+@@ -91,8 +90,7 @@ char code;
+ 	SOCKSinit() must be called once in the application program.
+  */
+ 
+-SOCKSinit(Progname)
+-char *Progname; /* name of the calling program, "rfinger", "rftp", etc. */
++int SOCKSinit(char *Progname)
+ {
+ #ifdef SOCKS_DEFAULT_NS
+ 	static char	*defaultNS = SOCKS_DEFAULT_NS;
+@@ -108,7 +106,7 @@ char *Progname; /* name of the calling p
+ 
+ /* >>> YDL 94/01/25 */
+ 	if (socks_init_done)
+-		return;
++		return 1;
+ 	socks_init_done = 1;
+ /* <<< YDL 94/01/25 */
+ 	socks_port = htons(SOCKS_DEF_PORT);
+@@ -227,7 +225,7 @@ char *Progname; /* name of the calling p
+ 	socks_nsin.sin_family = AF_INET;
+ 	socks_nsin.sin_port = socks_port;
+ 	socks_nsin.sin_addr.s_addr = SocksHost;
+-	
++	return 0;
+ }
+ 
+ 
diff --git a/net/socks4/patches/patch-am b/net/socks4/patches/patch-am
index 5dc37eafa8d..fd6555a6e75 100644
--- a/net/socks4/patches/patch-am
+++ b/net/socks4/patches/patch-am
@@ -1,8 +1,20 @@
-$NetBSD: patch-am,v 1.1 2005/12/27 13:48:56 joerg Exp $
+$NetBSD: patch-am,v 1.2 2013/03/02 18:29:48 joerg Exp $
 
---- rftp/cmds.c.orig	2005-12-18 19:30:53.000000000 +0000
+--- rftp/cmds.c.orig	1994-08-22 19:51:06.000000000 +0000
 +++ rftp/cmds.c
-@@ -80,7 +80,6 @@ extern	char *getenv();
+@@ -72,6 +72,11 @@ extern char *getwd();
+ #include "ftp_var.h"
+ #include "pathnames.h"
+ 
++void sendrequest(char *cmd, char *local, char *remote, int printnames);
++void recvrequest(char *cmd, char *local, char *remote, char *lmode, char *printnames);
++void pswitch(int flag);
++void disconnect(void);
++
+ extern	char *globerr;
+ extern	char **ftpglob();
+ extern	char *home;
+@@ -80,7 +85,6 @@ extern	char *getenv();
  extern	char *index();
  extern	char *rindex();
  extern	char *strerror();
@@ -10,3 +22,477 @@ $NetBSD: patch-am,v 1.1 2005/12/27 13:48:56 joerg Exp $
  extern off_t restart_point;
  extern char reply_string[];
  
+@@ -124,9 +128,7 @@ another(pargc, pargv, prompt)
+  * Connect to peer server and
+  * auto-login, if possible.
+  */
+-setpeer(argc, argv)
+-	int argc;
+-	char *argv[];
++void setpeer(int argc, char *argv[])
+ {
+ 	char *host, *hookup();
+ 	short port;
+@@ -248,9 +250,7 @@ struct	types {
+ /*
+  * Set transfer type.
+  */
+-settype(argc, argv)
+-	int argc;
+-	char *argv[];
++void settype(int argc, char *argv[])
+ {
+ 	register struct types *p;
+ 	int comret;
+@@ -296,8 +296,7 @@ settype(argc, argv)
+  * without changing our notion of the type for data transfers.
+  * Used to change to and from ascii for listings.
+  */
+-changetype(newtype, show)
+-	int newtype, show;
++void changetype(int newtype, int show)
+ {
+ 	register struct types *p;
+ 	int comret, oldverbose = verbose;
+@@ -334,7 +333,7 @@ char *stype[] = {
+  * Set binary transfer type.
+  */
+ /*VARARGS*/
+-setbinary()
++void setbinary(int argc, char *argv[])
+ {
+ 	stype[1] = "binary";
+ 	settype(2, stype);
+@@ -344,7 +343,7 @@ setbinary()
+  * Set ascii transfer type.
+  */
+ /*VARARGS*/
+-setascii()
++void setascii(int argc, char *argv[])
+ {
+ 	stype[1] = "ascii";
+ 	settype(2, stype);
+@@ -354,7 +353,7 @@ setascii()
+  * Set tenex transfer type.
+  */
+ /*VARARGS*/
+-settenex()
++void settenex(int argc, char *argv[])
+ {
+ 	stype[1] = "tenex";
+ 	settype(2, stype);
+@@ -364,9 +363,7 @@ settenex()
+  * Set file transfer mode.
+  */
+ /*ARGSUSED*/
+-setmode(argc, argv)
+-	int argc;
+-	char *argv[];
++void setmode(int argc, char *argv[])
+ {
+ 
+ 	printf("We only support %s mode, sorry.\n", modename);
+@@ -377,9 +374,7 @@ setmode(argc, argv)
+  * Set file transfer format.
+  */
+ /*ARGSUSED*/
+-setform(argc, argv)
+-	int argc;
+-	char *argv[];
++void setform(int argc, char *argv[])
+ {
+ 
+ 	printf("We only support %s format, sorry.\n", formname);
+@@ -390,9 +385,7 @@ setform(argc, argv)
+  * Set file transfer structure.
+  */
+ /*ARGSUSED*/
+-setstruct(argc, argv)
+-	int argc;
+-	char *argv[];
++void setstruct(int argc, char *argv[])
+ {
+ 
+ 	printf("We only support %s structure, sorry.\n", structname);
+@@ -402,9 +395,7 @@ setstruct(argc, argv)
+ /*
+  * Send a single file.
+  */
+-put(argc, argv)
+-	int argc;
+-	char *argv[];
++void put(int argc, char *argv[])
+ {
+ 	char *cmd;
+ 	int loc = 0;
+@@ -450,9 +441,7 @@ usage:
+ /*
+  * Send multiple files.
+  */
+-mput(argc, argv)
+-	int argc;
+-	char **argv;
++void mput(int argc, char *argv[])
+ {
+ 	extern jmp_buf jabort;
+ 	register int i;
+@@ -573,9 +562,7 @@ mput(argc, argv)
+ 	mflag = 0;
+ }
+ 
+-reget(argc, argv)
+-	int argc;
+-	char *argv[];
++void reget(int argc, char *argv[])
+ {
+ 	(void) getit(argc, argv, 1, "r+w");
+ }
+@@ -702,7 +689,7 @@ usage:
+ }
+ 
+ void
+-mabort()
++mabort(int argc, char *argv[])
+ {
+ 	int ointer;
+ 	extern jmp_buf jabort;
+@@ -725,9 +712,7 @@ mabort()
+ /*
+  * Get multiple files.
+  */
+-mget(argc, argv)
+-	int argc;
+-	char **argv;
++void mget(int argc, char *argv[])
+ {
+ 	extern jmp_buf jabort;
+ 	sig_t oldintr;
+@@ -863,9 +848,7 @@ onoff(bool)
+  * Show status.
+  */
+ /*ARGSUSED*/
+-status(argc, argv)
+-	int argc;
+-	char *argv[];
++void status(int argc, char *argv[])
+ {
+ 	int i;
+ 
+@@ -1008,9 +991,7 @@ setglob()
+  * set level of debugging.
+  */
+ /*VARARGS*/
+-setdebug(argc, argv)
+-	int argc;
+-	char *argv[];
++void setdebug(int argc, char *argv[])
+ {
+ 	int val;
+ 
+@@ -1036,9 +1017,7 @@ setdebug(argc, argv)
+  * Set current working directory
+  * on remote machine.
+  */
+-cd(argc, argv)
+-	int argc;
+-	char *argv[];
++void cd(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "remote-directory")) {
+@@ -1057,9 +1036,7 @@ cd(argc, argv)
+  * Set current working directory
+  * on local machine.
+  */
+-lcd(argc, argv)
+-	int argc;
+-	char *argv[];
++void lcd(int argc, char *argv[])
+ {
+ 	char buf[MAXPATHLEN];
+ #ifndef GETCWD
+@@ -1093,9 +1070,7 @@ lcd(argc, argv)
+ /*
+  * Delete a single file.
+  */
+-delete(argc, argv)
+-	int argc;
+-	char *argv[];
++void delete(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "remote-file")) {
+@@ -1109,9 +1084,7 @@ delete(argc, argv)
+ /*
+  * Delete multiple files.
+  */
+-mdelete(argc, argv)
+-	int argc;
+-	char **argv;
++void mdelete(int argc, char **argv)
+ {
+ 	extern jmp_buf jabort;
+ 	sig_t oldintr;
+@@ -1152,9 +1125,7 @@ mdelete(argc, argv)
+ /*
+  * Rename a remote file.
+  */
+-renamefile(argc, argv)
+-	int argc;
+-	char *argv[];
++void renamefile(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "from-name"))
+@@ -1173,9 +1144,7 @@ usage:
+  * Get a directory listing
+  * of remote files.
+  */
+-ls(argc, argv)
+-	int argc;
+-	char *argv[];
++void ls(int argc, char *argv[])
+ {
+ 	char *cmd;
+ 
+@@ -1205,9 +1174,7 @@ ls(argc, argv)
+  * Get a directory listing
+  * of multiple remote files.
+  */
+-mls(argc, argv)
+-	int argc;
+-	char **argv;
++void mls(int argc, char **argv)
+ {
+ 	extern jmp_buf jabort;
+ 	sig_t oldintr;
+@@ -1256,9 +1223,7 @@ usage:
+  * Do a shell escape
+  */
+ /*ARGSUSED*/
+-shell(argc, argv)
+-	int argc;
+-	char **argv;
++void shell(int argc, char **argv)
+ {
+ 	int pid;
+ 	sig_t old1, old2;
+@@ -1315,15 +1280,13 @@ shell(argc, argv)
+ 	else {
+ 		code = 0;
+ 	}
+-	return (0);
++	return;
+ }
+ 
+ /*
+  * Send new user information (re-login)
+  */
+-user(argc, argv)
+-	int argc;
+-	char **argv;
++void user(int argc, char **argv)
+ {
+ 	char acct[80], *getpass();
+ 	int n, aflag = 0;
+@@ -1333,7 +1296,7 @@ user(argc, argv)
+ 	if (argc < 2 || argc > 4) {
+ 		printf("usage: %s username [password] [account]\n", argv[0]);
+ 		code = -1;
+-		return (0);
++		return;
+ 	}
+ 	n = command("USER %s", argv[1]);
+ 	if (n == CONTINUE) {
+@@ -1361,19 +1324,19 @@ user(argc, argv)
+ 	}
+ 	if (n != COMPLETE) {
+ 		fprintf(stdout, "Login failed.\n");
+-		return (0);
++		return;
+ 	}
+ 	if (!aflag && argc == 4) {
+ 		(void) command("ACCT %s", argv[3]);
+ 	}
+-	return (1);
++	return;
+ }
+ 
+ /*
+  * Print working directory.
+  */
+ /*VARARGS*/
+-pwd()
++void pwd(int argc, char *argv[])
+ {
+ 	int oldverbose = verbose;
+ 
+@@ -1391,9 +1354,7 @@ pwd()
+ /*
+  * Make a directory.
+  */
+-makedir(argc, argv)
+-	int argc;
+-	char *argv[];
++void makedir(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "directory-name")) {
+@@ -1411,9 +1372,7 @@ makedir(argc, argv)
+ /*
+  * Remove a directory.
+  */
+-removedir(argc, argv)
+-	int argc;
+-	char *argv[];
++void removedir(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "directory-name")) {
+@@ -1431,9 +1390,7 @@ removedir(argc, argv)
+ /*
+  * Send a line, verbatim, to the remote machine.
+  */
+-quote(argc, argv)
+-	int argc;
+-	char *argv[];
++void quote(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "command line to send")) {
+@@ -1449,9 +1406,7 @@ quote(argc, argv)
+  * is sent verbatim to the remote machine, except that the
+  * word "SITE" is added at the front.
+  */
+-site(argc, argv)
+-	int argc;
+-	char *argv[];
++void site(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "arguments to SITE command")) {
+@@ -1488,9 +1443,7 @@ quote1(initial, argc, argv)
+ 	}
+ }
+ 
+-do_chmod(argc, argv)
+-	int argc;
+-	char *argv[];
++void do_chmod(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "mode"))
+@@ -1504,9 +1457,7 @@ usage:
+ 	(void) command("SITE CHMOD %s %s", argv[1], argv[2]);
+ }
+ 
+-do_umask(argc, argv)
+-	int argc;
+-	char *argv[];
++void do_umask(int argc, char *argv[])
+ {
+ 	int oldverbose = verbose;
+ 
+@@ -1559,7 +1510,7 @@ quit()
+ /*
+  * Terminate session, but don't exit.
+  */
+-disconnect()
++void disconnect(void)
+ {
+ 	extern FILE *cout;
+ 	extern int data;
+@@ -1677,9 +1628,7 @@ proxabort()
+ 	longjmp(abortprox,1);
+ }
+ 
+-doproxy(argc,argv)
+-	int argc;
+-	char *argv[];
++void doproxy(int argc, char *argv[])
+ {
+ 	extern struct cmd cmdtab[];
+ 	extern jmp_buf abortprox;
+@@ -1751,9 +1700,7 @@ setcr()
+ 	code = crflag;
+ }
+ 
+-setntrans(argc,argv)
+-	int argc;
+-	char *argv[];
++void setntrans(int argc, char *argv[])
+ {
+ 	if (argc == 1) {
+ 		ntflag = 0;
+@@ -1801,9 +1748,7 @@ dotrans(name)
+ 	return(new);
+ }
+ 
+-setnmap(argc, argv)
+-	int argc;
+-	char *argv[];
++void setnmap(int argc, char *argv[])
+ {
+ 	char *cp;
+ 
+@@ -2027,9 +1972,7 @@ cdup()
+ }
+ 
+ /* restart transfer at specific point */
+-restart(argc, argv)
+-	int argc;
+-	char *argv[];
++void restart(int argc, char *argv[])
+ {
+ 	extern long atol();
+ 	if (argc != 2)
+@@ -2042,14 +1985,12 @@ restart(argc, argv)
+ }
+ 
+ /* show remote system type */
+-syst()
++void syst(int argc, char *argv[])
+ {
+ 	(void) command("SYST");
+ }
+ 
+-macdef(argc, argv)
+-	int argc;
+-	char *argv[];
++void macdef(int argc, char *argv[])
+ {
+ 	char *tmp;
+ 	int c;
+@@ -2110,9 +2051,7 @@ macdef(argc, argv)
+ /*
+  * get size of file on remote machine
+  */
+-sizecmd(argc, argv)
+-	int argc;
+-	char *argv[];
++void sizecmd(int argc, char *argv[])
+ {
+ 
+ 	if (argc < 2 && !another(&argc, &argv, "filename")) {
+@@ -2126,9 +2065,7 @@ sizecmd(argc, argv)
+ /*
+  * get last modification time of file on remote machine
+  */
+-modtime(argc, argv)
+-	int argc;
+-	char *argv[];
++void modtime(int argc, char *argv[])
+ {
+ 	int overbose;
+ 
+@@ -2155,9 +2092,7 @@ modtime(argc, argv)
+ /*
+  * show status on reomte machine
+  */
+-rmtstatus(argc, argv)
+-	int argc;
+-	char *argv[];
++void rmtstatus(int argc, char *argv[])
+ {
+ 	(void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
+ }
diff --git a/net/socks4/patches/patch-rftp_domacro.c b/net/socks4/patches/patch-rftp_domacro.c
new file mode 100644
index 00000000000..81bc461eca3
--- /dev/null
+++ b/net/socks4/patches/patch-rftp_domacro.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-rftp_domacro.c,v 1.1 2013/03/02 18:29:48 joerg Exp $
+
+--- rftp/domacro.c.orig	1994-08-22 19:56:34.000000000 +0000
++++ rftp/domacro.c
+@@ -49,9 +49,7 @@ static char sccsid[] = "@(#)domacro.c	1.
+ # endif
+ #endif
+ 
+-domacro(argc, argv)
+-	int argc;
+-	char *argv[];
++void domacro(int argc, char *argv[])
+ {
+ 	register int i, j;
+ 	register char *cp1, *cp2;
diff --git a/net/socks4/patches/patch-rftp_main.c b/net/socks4/patches/patch-rftp_main.c
new file mode 100644
index 00000000000..74a051983a6
--- /dev/null
+++ b/net/socks4/patches/patch-rftp_main.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-rftp_main.c,v 1.1 2013/03/02 18:29:48 joerg Exp $
+
+--- rftp/main.c.orig	1994-07-05 19:47:08.000000000 +0000
++++ rftp/main.c
+@@ -58,6 +58,8 @@ static char sccsid[] = "@(#)main.c	5.18 
+ #include <netdb.h>
+ #include <pwd.h>
+ 
++void help(int argc, char *argv[]);
++
+ uid_t	getuid();
+ void	intr(), lostpeer();
+ extern	char *home;
+@@ -228,7 +230,6 @@ cmdscanner(top)
+ 	register struct cmd *c;
+ 	register int l;
+ 	struct cmd *getcmd();
+-	extern int help();
+ 
+ 	if (!top)
+ 		(void) putchar('\n');
+@@ -458,9 +459,7 @@ OUT:
+  * Help command.
+  * Call each command handler with argc == 0 and argv[0] == name.
+  */
+-help(argc, argv)
+-	int argc;
+-	char *argv[];
++void help(int argc, char *argv[])
+ {
+ 	extern struct cmd cmdtab[];
+ 	register struct cmd *c;