With the power of USES=dos2unix, get rid of most patches and files

with CRLF.

While there, run make makepatch, rename patches to use the new scheme,
and various fixes.

With hat:	portmgr
Sponsored by:	Absolight

12 files changed, 46 insertions, 63 deletions

diff --git a/irc/psybnc/files/patch-Makefile b/irc/psybnc/files/patch-Makefile
index 85e3a71c6aed..013844412a81 100644
--- a/irc/psybnc/files/patch-Makefile
+++ b/irc/psybnc/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile	Sun Jul  7 18:09:25 2002
-+++ ../../psybnc.mina/Makefile	Sun Nov 24 19:41:57 2002
-@@ -7,7 +7,7 @@
+--- Makefile.orig	2007-03-20 14:02:50 UTC
++++ Makefile
+@@ -7,7 +7,7 @@ all:	$(OBJS)
  	@$(CC) tools/convconf.c -o tools/convconf
  	@tools/convconf
  	@echo [*] Running Autoconfig.
@@ -9,7 +9,7 @@
  	@tools/autoconf
  	@echo [*] Compiling MakeSalt for Encryption..
  	@$(CC) -I. -o makesalt tools/makesalt.c
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ menuconfig:
  	@$(CC) tools/convconf.c -o tools/convconf
  	@tools/convconf
  	@echo [*] Running Autoconfig.
@@ -18,7 +18,7 @@
  	@tools/autoconf
  	@echo [*] Creating Menu, please wait.
  	@echo This needs the 'ncurses' library. If it is not available, menuconf wont work. If you are using 'curses', use make menuconfig-curses instead.
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ menuconfig-curses:
  	@$(CC) tools/convconf.c -o tools/convconf
  	@tools/convconf
  	@echo [*] Running Autoconfig.
diff --git a/irc/psybnc/files/patch-lang_english.lng b/irc/psybnc/files/patch-lang_english.lng
index 67225e322250..48c65f706605 100644
--- a/irc/psybnc/files/patch-lang_english.lng
+++ b/irc/psybnc/files/patch-lang_english.lng
@@ -1,6 +1,6 @@
---- ./lang/english.lng	Sat Jun  1 18:07:47 2002
-+++ ../../psybnc.mina/lang/english.lng	Sun Nov 24 19:14:01 2002
-@@ -1998,7 +1998,7 @@
+--- lang/english.lng.orig	2008-10-22 19:09:46 UTC
++++ lang/english.lng
+@@ -1999,7 +1999,7 @@ msg0994=SYSTEM
  ; psybnc.c line 201:
  msg0995=PORT1
  ; psybnc.c line 203:
diff --git a/irc/psybnc/files/patch-lang_german.lng b/irc/psybnc/files/patch-lang_german.lng
index 8f19c8cb4808..ef291091da49 100644
--- a/irc/psybnc/files/patch-lang_german.lng
+++ b/irc/psybnc/files/patch-lang_german.lng
@@ -1,6 +1,6 @@
---- ./lang/german.lng	Sat Jun  1 18:08:01 2002
-+++ ../../psybnc.mina/lang/german.lng	Sun Nov 24 19:14:22 2002
-@@ -2003,7 +2003,7 @@
+--- lang/german.lng.orig	2008-10-22 19:10:34 UTC
++++ lang/german.lng
+@@ -2004,7 +2004,7 @@ msg0994=SYSTEM
  ; psybnc.c line 201:
  msg0995=PORT1
  ; psybnc.c line 203:
diff --git a/irc/psybnc/files/patch-lang_italiano.lng b/irc/psybnc/files/patch-lang_italiano.lng
index 8b26de115606..e08978a9e5d2 100644
--- a/irc/psybnc/files/patch-lang_italiano.lng
+++ b/irc/psybnc/files/patch-lang_italiano.lng
@@ -1,6 +1,6 @@
---- ./lang/italiano.lng	Sat Jun  1 18:08:25 2002
-+++ ../../psybnc.mina/lang/italiano.lng	Sun Nov 24 19:14:44 2002
-@@ -1998,7 +1998,7 @@
+--- lang/italiano.lng.orig	2008-10-22 19:10:54 UTC
++++ lang/italiano.lng
+@@ -1999,7 +1999,7 @@ msg0994=SYSTEM
  ; psybnc.c line 201:
  msg0995=PORT1
  ; psybnc.c line 203:
diff --git a/irc/psybnc/files/patch-src_match.c b/irc/psybnc/files/patch-src_match.c
index 74e6063319ea..de4407673c75 100644
--- a/irc/psybnc/files/patch-src_match.c
+++ b/irc/psybnc/files/patch-src_match.c
@@ -1,6 +1,5 @@
-diff -Naurp src/match.c src/match.c
---- src/match.c	2007-02-26 12:26:10.000000000 +0000
-+++ src/match.c	2007-02-26 12:26:17.000000000 +0000
+--- src/match.c.orig	2016-06-20 14:41:27 UTC
++++ src/match.c
 @@ -36,6 +36,7 @@
  /* Remove the next line to use this in IrcII */
  #define EGGDROP
diff --git a/irc/psybnc/files/patch-src_p_blowfish.c b/irc/psybnc/files/patch-src_p__blowfish.c
index 1f56e326b397..610f3a2cd4c0 100644
--- a/irc/psybnc/files/patch-src_p_blowfish.c
+++ b/irc/psybnc/files/patch-src_p__blowfish.c
@@ -1,5 +1,5 @@
---- src/p_blowfish.c	2005-06-04 22:22:45.000000000 +0400
-+++ src/p_blowfish.c	2008-02-25 23:42:07.000000000 +0300
+--- src/p_blowfish.c.orig	2016-06-20 14:41:27 UTC
++++ src/p_blowfish.c
 @@ -27,16 +27,21 @@
  static char rcsid[] = "@(#)$Id: p_blowfish.c,v 1.3 2005/06/04 18:00:14 hisi Exp $";
  #endif
@@ -22,7 +22,7 @@
  
  unsigned char *hashstring(unsigned char *str,int len);
  unsigned char *unhashstring(unsigned char *str);
-@@ -478,10 +483,11 @@
+@@ -478,10 +483,11 @@ char * BLOWencrypt(unsigned char *str)
     char *p, *s, *dest, *d, *pt;
     char rim[5],ep[5],rep[5];
     int i;
diff --git a/irc/psybnc/files/patch-src_p_global.h b/irc/psybnc/files/patch-src_p__global.h
index 67a4f7e3f9f3..71b50ff458d8 100644
--- a/irc/psybnc/files/patch-src_p_global.h
+++ b/irc/psybnc/files/patch-src_p__global.h
@@ -1,20 +1,6 @@
---- ./src/p_global.h	Sun Jul  7 08:07:23 2002
-+++ ../../psybnc.mina/src/p_global.h	Sun Nov 24 18:20:55 2002
-@@ -1264,8 +1264,8 @@
- #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
- #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
- 
--#define SSLCERT "key/psybnc.cert.pem"
--#define SSLKEY "key/psybnc.key.pem"
-+#define SSLCERT PSYBASE "/key/psybnc.cert.pem"
-+#define SSLKEY PSYBASE "/key/psybnc.key.pem"
- 
- #ifdef HAVE_SSL
- #ifndef SSLSEC
-diff -urN src/p_global.h psybnc.new/src/p_global.h
---- src/p_global.h	2005-06-04 22:22:45.000000000 +0400
-+++ src/p_global.h	2008-02-25 23:36:21.000000000 +0300
-@@ -972,7 +972,7 @@
+--- src/p_global.h.orig	2016-06-20 14:41:27 UTC
++++ src/p_global.h
+@@ -972,7 +972,7 @@ int checklogging(int usern);
  #endif
  
  #ifndef P_MEMORY
@@ -23,7 +9,7 @@ diff -urN src/p_global.h psybnc.new/src/p_global.h
  void _pfree(void * pointer,char *module, char *function, int line);
  struct usert *user(int usern);
  struct newpeert *newpeer(int usern);
-@@ -1267,8 +1267,8 @@
+@@ -1267,8 +1267,8 @@ extern char * BLOW_stringdecrypt(unsigne
  
  #endif
  
diff --git a/irc/psybnc/files/patch-src_p_idea.c b/irc/psybnc/files/patch-src_p__idea.c
index fd271dbd5366..4191c9a44231 100644
--- a/irc/psybnc/files/patch-src_p_idea.c
+++ b/irc/psybnc/files/patch-src_p__idea.c
@@ -1,7 +1,6 @@
-diff -urN src/p_idea.c psybnc.new/src/p_idea.c
---- src/p_idea.c	2005-06-04 22:22:45.000000000 +0400
-+++ src/p_idea.c	2008-02-25 23:44:12.000000000 +0300
-@@ -50,6 +50,9 @@
+--- src/p_idea.c.orig	2016-06-20 14:41:27 UTC
++++ src/p_idea.c
+@@ -50,6 +50,9 @@ static char rcsid[] = "@(#)$Id: p_idea.c
   * string encryption by psychoid
   */
  
@@ -11,7 +10,7 @@ diff -urN src/p_idea.c psybnc.new/src/p_idea.c
  #include <time.h>
  #include <string.h>
  #include <stdlib.h>
-@@ -62,7 +65,7 @@
+@@ -62,7 +65,7 @@ extern int cline;
  
  #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
  #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
diff --git a/irc/psybnc/files/patch-src_p_memory.c b/irc/psybnc/files/patch-src_p__memory.c
index 092a5a73147a..3d29fb64f9c5 100644
--- a/irc/psybnc/files/patch-src_p_memory.c
+++ b/irc/psybnc/files/patch-src_p__memory.c
@@ -1,7 +1,6 @@
-diff -urN src/p_memory.c psybnc.new/src/p_memory.c
---- src/p_memory.c	2005-06-04 22:22:45.000000000 +0400
-+++ src/p_memory.c	2008-02-25 23:31:29.000000000 +0300
-@@ -32,10 +32,10 @@
+--- src/p_memory.c.orig	2016-06-20 14:41:27 UTC
++++ src/p_memory.c
+@@ -32,10 +32,10 @@ FILE *logm=NULL;
  
  /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
  
@@ -15,7 +14,7 @@ diff -urN src/p_memory.c psybnc.new/src/p_memory.c
      {
  	p_log(LOG_ERROR,-1,lngtxt(602),module,function,line);
  	exit(0x0);
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
      return rc;
  }
  
@@ -24,7 +23,7 @@ diff -urN src/p_memory.c psybnc.new/src/p_memory.c
  {
  #ifdef LOGALLOC
      if(logm==NULL)
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ void _pfree(unsigned long *pointer, char
      free(pointer);
  }
  
@@ -32,3 +31,4 @@ diff -urN src/p_memory.c psybnc.new/src/p_memory.c
 +#define free(a) _pfree((void *)a,__FILE__,(char*)__FUNCTION__,__LINE__)
  
  /* struct wrappers. Those alloc, delete and return the needed structures */
+ 
diff --git a/irc/psybnc/files/patch-src_p_string.c b/irc/psybnc/files/patch-src_p__string.c
index 94851f48e29a..deaa2623baa7 100644
--- a/irc/psybnc/files/patch-src_p_string.c
+++ b/irc/psybnc/files/patch-src_p__string.c
@@ -1,7 +1,6 @@
- #ifndef SSLSEC
---- ./src/p_string.c	Fri Jul 19 09:01:52 2002
-+++ ../../psybnc.mina/src/p_string.c	Sun Nov 24 17:58:56 2002
-@@ -613,7 +613,7 @@
+--- src/p_string.c.orig	2016-06-20 14:41:27 UTC
++++ src/p_string.c
+@@ -616,7 +616,7 @@ int loadlanguage(char *langf)
      int msg;
      pcontext;
      clearlanguage();
diff --git a/irc/psybnc/files/patch-src_psybnc.c b/irc/psybnc/files/patch-src_psybnc.c
index 07c3209c5d86..a4c2ef801b3d 100644
--- a/irc/psybnc/files/patch-src_psybnc.c
+++ b/irc/psybnc/files/patch-src_psybnc.c
@@ -1,6 +1,6 @@
---- ./src/psybnc.c	Wed Jul 24 17:19:05 2002
-+++ ../../psybnc.mina/src/psybnc.c	Sun Nov 24 19:54:52 2002
-@@ -43,6 +43,8 @@
+--- src/psybnc.c.orig	2016-06-20 14:41:27 UTC
++++ src/psybnc.c
+@@ -44,6 +44,8 @@ int slice=0;
  
  #ifdef HAVE_SSL
  
@@ -9,7 +9,7 @@
  void initSSL()
  {
      SSL_load_error_strings();
-@@ -170,13 +172,17 @@
+@@ -171,13 +173,17 @@ main (int argc, char **argv)
    if(argc==2)
    {
        strmncpy(configfile,argv[1],sizeof(configfile));
@@ -29,9 +29,9 @@
       exit (0x0);
    }
    fclose(conffile);
-@@ -301,3 +307,15 @@
+@@ -302,3 +308,15 @@ main (int argc, char **argv)
    bncmain();
- }

+ }
  
 +int fexists(char *fname)
 +{
diff --git a/irc/psybnc/files/patch-tools_autoconf.c b/irc/psybnc/files/patch-tools_autoconf.c
index 9e281d82e0ef..bbb25ca3c206 100644
--- a/irc/psybnc/files/patch-tools_autoconf.c
+++ b/irc/psybnc/files/patch-tools_autoconf.c
@@ -1,6 +1,6 @@
---- tools/autoconf.c.orig	2006-11-16 00:27:04.000000000 +0000
-+++ tools/autoconf.c	2013-01-18 13:55:10.102047624 +0000
-@@ -443,9 +443,9 @@
+--- tools/autoconf.c.orig	2016-06-20 14:41:27 UTC
++++ tools/autoconf.c
+@@ -443,9 +443,9 @@ int main()
  	fprintf(makefile,"INCLUDE = -I./src/ -I.\n");
      fprintf(makefile,"OBJS	= src/psybnc.o src/match.o src/p_client.o src/p_crypt.o src/p_dcc.o src/p_hash.o src/p_idea.o src/p_inifunc.o src/p_link.o src/p_log.o src/p_memory.o src/p_network.o src/p_parse.o src/p_peer.o src/p_server.o src/p_socket.o src/p_string.o src/p_sysmsg.o src/p_userfile.o src/p_uchannel.o src/p_script.o src/p_topology.o src/p_intnet.o src/p_blowfish.o src/p_translate.o src/p_coredns.o src/snprintf.o %s\n",env);
      if(provi==0)
@@ -12,7 +12,7 @@
      fprintf(makefile,"TARGET	= psybnc\n");
      fprintf(makefile,"\n");
      fprintf(makefile,"all:	$(OBJS)\n");
-@@ -453,7 +453,8 @@
+@@ -453,7 +453,8 @@ int main()
      fprintf(makefile,"	@strip $(TARGET)\n");
      if(ssl==0)
      {