Upgrade to 5.0.1.

PR:		44493
Submitted by:	maintainer

7 files changed, 42 insertions, 83 deletions

diff --git a/irc/tr-ircd/files/patch-configure b/irc/tr-ircd/files/patch-configure
index 36fe023e5742..157de53458da 100644
--- a/irc/tr-ircd/files/patch-configure
+++ b/irc/tr-ircd/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun May 19 11:10:35 2002
-+++ configure	Sun May 19 11:10:57 2002
-@@ -2457,7 +2457,7 @@
+--- configure.orig	Sat Oct 26 10:25:29 2002
++++ configure	Sat Oct 26 10:26:46 2002
+@@ -3129,7 +3129,7 @@
    ;;
  esac
  fi
@@ -8,4 +8,4 @@
 +MD5SUMS=../md5/$ac_cv_path_MD5SUMS
  
  if test -n "$MD5SUMS"; then
-   echo "$as_me:2463: result: $MD5SUMS" >&5
+   echo "$as_me:$LINENO: result: $MD5SUMS" >&5
diff --git a/irc/tr-ircd/files/patch-doc::Makefile.in b/irc/tr-ircd/files/patch-doc::Makefile.in
index 9044c8048b79..022f172d2ae0 100644
--- a/irc/tr-ircd/files/patch-doc::Makefile.in
+++ b/irc/tr-ircd/files/patch-doc::Makefile.in
@@ -1,12 +1,15 @@
---- doc/Makefile.in.orig	Sun May  5 11:01:56 2002
-+++ doc/Makefile.in	Sun May  5 11:03:18 2002
-@@ -60,7 +60,8 @@
- install: build
- 	@echo "Installing config files"
- 	$(INSTALL) -d ${sysconfdir}
--	${INSTALL} $(CONFS) $(DEFAULTCONFS) ${sysconfdir}
-+	${INSTALL} $(CONFS) ${sysconfdir}/ircd.conf.sample
-+	${INSTALL} $(DEFAULTCONFS) ${sysconfdir}
- 	touch ${sysconfdir}/kline.conf
- 	@echo "Installing manpages"
- 	$(INSTALL) -d ${mandir}        
+--- doc/Makefile.in.orig	Sat Oct 26 10:10:17 2002
++++ doc/Makefile.in	Sat Oct 26 10:11:51 2002
+@@ -77,9 +77,9 @@
+ 	$(INSTALL_DATA) $(CONFMANPAGE) ${confmandir}
+ 	$(INSTALL_DATA) $(MD5MANPAGE) ${md5mandir}
+ 	@echo "Installing documentation"
+-	$(INSTALL) -d ${datadir}
+-	$(INSTALL_DATA) $(DOCUMENTATION) ${datadir}
+-	$(INSTALL_DATA) $(CONFS) ${datadir}	
++	$(INSTALL) -d ${datadir}/doc/tr-ircd
++	$(INSTALL_DATA) $(DOCUMENTATION) ${datadir}/doc/tr-ircd
++	$(INSTALL_DATA) $(CONFS) ${datadir}/doc/tr-ircd	
+ 
+ uninstall:
+ 	@echo "Removing manpages"
diff --git a/irc/tr-ircd/files/patch-help::Makefile.in b/irc/tr-ircd/files/patch-help::Makefile.in
index f261abd4ced8..6870aa2b7c7e 100644
--- a/irc/tr-ircd/files/patch-help::Makefile.in
+++ b/irc/tr-ircd/files/patch-help::Makefile.in
@@ -1,13 +1,13 @@
---- help/Makefile.in.orig	Sat May 18 17:36:29 2002
-+++ help/Makefile.in	Sun May 19 11:13:10 2002
-@@ -51,8 +51,8 @@
+--- help/Makefile.in.orig	Sat Oct 26 10:12:16 2002
++++ help/Makefile.in	Sat Oct 26 10:13:01 2002
+@@ -53,8 +53,8 @@
  
  install:
  	@echo "Installing help files"
--	@${RM} -rf ${prefix}/help/en_us
--	@${CP} -dpR en_us ${prefix}/help/
-+	@mkdir -p ${prefix}/share/tr-ircd/help
-+	@${CP} -pR en_us ${prefix}/share/tr-ircd/help/
+-	$(INSTALL) -d ${datadir}/help
+-	${CP} -R en_us ${datadir}/help/
++	$(INSTALL) -d ${datadir}/tr-ircd/help
++	${CP} -R en_us ${datadir}/tr-ircd/help/
  
- makesums:
- 	@echo "Creating .md5sums..."
+ uninstall:
+ 	@echo "Removing help files"
diff --git a/irc/tr-ircd/files/patch-include::capabflag.h b/irc/tr-ircd/files/patch-include::capabflag.h
deleted file mode 100644
index 4e9f97f880b3..000000000000
--- a/irc/tr-ircd/files/patch-include::capabflag.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/capabflag.h.orig	Sat May  4 15:31:48 2002
-+++ include/capabflag.h	Sat May  4 15:32:07 2002
-@@ -396,6 +396,7 @@
-  * defined debugging levels
-  */
- #define LOG_FATAL  0
-+#define LOG_CRIT   0
- #define LOG_ERROR  1          /* report_error() and other errors that
-                                  * are found */
- #define LOG_NOTICE 2
diff --git a/irc/tr-ircd/files/patch-include::config.h b/irc/tr-ircd/files/patch-include::config.h
index 937dbe5dacad..796e61e06c3e 100644
--- a/irc/tr-ircd/files/patch-include::config.h
+++ b/irc/tr-ircd/files/patch-include::config.h
@@ -1,27 +1,18 @@
---- include/config.h.orig	Sat May  4 15:57:33 2002
-+++ include/config.h	Sat May  4 15:59:21 2002
-@@ -33,12 +33,12 @@
- #define KLINEFILE	IRCD_PREFIX "/etc/kline.conf"
- #define	MOTD		IRCD_PREFIX "/etc/ircd.motd"
- #define	SHORTMOTD	IRCD_PREFIX "/etc/ircd.smotd"
--#define	LOGFILE		IRCD_PREFIX "/etc/ircd.log"
-+#define	LOGFILE		            "/var/log/ircd.log"
- #define LINKSFILE	IRCD_PREFIX "/etc/ircd.links"
+--- include/config.h.orig	Sat Oct 26 10:03:41 2002
++++ include/config.h	Sat Oct 26 10:13:43 2002
+@@ -38,11 +38,11 @@
+ #define LANGPATH 	IRCD_PREFIX_LIB "/languages"
+ #define CHANMODEPATH 	IRCD_PREFIX_LIB "/chanmodes"
  
--#define IRCD_PIDFILE    IRCD_PREFIX "/tmp/ircd.pid"
-+#define IRCD_PIDFILE                "/var/run/ircd.pid"
+-#define LOGFILE		IRCD_PREFIX_VAR "/logfiles/ircd.log"
+-#define IRCD_PIDFILE    IRCD_PREFIX_VAR "/ircd.pid"
+-#define LINKSFILE       IRCD_PREFIX_VAR "/ircd.links"
++#define LOGFILE		IRCD_PREFIX_VAR "/log/ircd.log"
++#define IRCD_PIDFILE    IRCD_PREFIX_VAR "/run/ircd.pid"
++#define LINKSFILE       IRCD_PREFIX_VAR "/run/ircd.links"
  
--#define HELPPATH	IRCD_PREFIX "/help/en_us"
-+#define HELPPATH	IRCD_PREFIX "/share/tr-ircd/help/en_us"
+-#define HELPPATH	IRCD_PREFIX_DOC "/help/en_us"
++#define HELPPATH	IRCD_PREFIX_DOC "/tr-ircd/help/en_us"
  
- /*
-  * LOCKFILE - Exclusive use of ircd.conf and kline.conf during writes
-@@ -51,7 +51,7 @@
-  * minutes have elapsed.
-  */
- 
--#define LOCKFILE 	IRCD_PREFIX "/tmp/ircd.conf.lock"
-+#define LOCKFILE 	            "/tmp/ircd.conf.lock"
- 
- #define USE_FAKEHOST
+ #define USE_FAKEHOST 1
  
diff --git a/irc/tr-ircd/files/patch-include::memory.h b/irc/tr-ircd/files/patch-include::memory.h
deleted file mode 100644
index 6fd6408a49d5..000000000000
--- a/irc/tr-ircd/files/patch-include::memory.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/memory.h.orig	Sun May 19 11:25:19 2002
-+++ include/memory.h	Sun May 19 11:25:32 2002
-@@ -17,12 +17,6 @@
-  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--#ifndef HAVE_STDINT_H
--#ifndef HAVE_UINTPTR_T
--typedef unsigned long uintptr_t;
--#endif
--#endif
--
- #define MyFree(x)       if ((x) != NULL) free(x)
- 
- extern char *MyMalloc(size_t);
diff --git a/irc/tr-ircd/files/patch-src::Makefile.in b/irc/tr-ircd/files/patch-src::Makefile.in
deleted file mode 100644
index 0b8b57da2d72..000000000000
--- a/irc/tr-ircd/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Sat May  4 16:20:36 2002
-+++ src/Makefile.in	Sat May  4 16:22:57 2002
-@@ -88,7 +88,6 @@
- install:
- 	@echo "Installing ircd"	
- 	$(INSTALL) -d ${bindir}
--	$(INSTALL) -d ${prefix}/tmp
- 	$(INSTALL) $(PROGS) ${bindir}
- 
- makesums: