From 875a797428bba9a7c687ac23d946c358e6a924be Mon Sep 17 00:00:00 2001
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Mon, 9 Jan 2017 00:20:55 +0000
Subject: - Update to 3.0.10

PR:		215841
Submitted by:	zi@ (me)
Approved by:	moggie@elasticmind.net (maintainer)
---
 irc/ircd-ratbox/Makefile                           |  3 +--
 irc/ircd-ratbox/distinfo                           |  5 +++--
 irc/ircd-ratbox/files/patch-contrib_Makefile.in    | 25 ----------------------
 .../files/patch-libratbox_src_openssl.c            | 15 -------------
 4 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 irc/ircd-ratbox/files/patch-contrib_Makefile.in
 delete mode 100644 irc/ircd-ratbox/files/patch-libratbox_src_openssl.c

(limited to 'irc/ircd-ratbox')

diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index 0c5647b7546c..4fe30e2fc3d4 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	3.0.8
-PORTREVISION=	9
+PORTVERSION=	3.0.10
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.ratbox.org/download/				\
 		http://www.ratbox.org/download/old/
diff --git a/irc/ircd-ratbox/distinfo b/irc/ircd-ratbox/distinfo
index 59634e47c39e..ee46a7e43291 100644
--- a/irc/ircd-ratbox/distinfo
+++ b/irc/ircd-ratbox/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ircd-ratbox-3.0.8.tar.bz2) = 6d871030ed6fba2b6f46c3e2f3bd37f375fae5dc91441081f9aabc8ccbe2d603
-SIZE (ircd-ratbox-3.0.8.tar.bz2) = 2419597
+TIMESTAMP = 1483736802
+SHA256 (ircd-ratbox-3.0.10.tar.bz2) = 8d871ab81e8581179c3b831e25bd2f6d4f6dfc77380cb190237221bda247ead4
+SIZE (ircd-ratbox-3.0.10.tar.bz2) = 2937050
diff --git a/irc/ircd-ratbox/files/patch-contrib_Makefile.in b/irc/ircd-ratbox/files/patch-contrib_Makefile.in
deleted file mode 100644
index 5976f7d54165..000000000000
--- a/irc/ircd-ratbox/files/patch-contrib_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix linking ssl, used /usr/include/openssl even when --enable-openssl=%LOCALBASE%
-was used
-
---- contrib/Makefile.in.orig	2012-03-11 00:12:06 UTC
-+++ contrib/Makefile.in
-@@ -202,7 +202,7 @@ coredir = @moduledir@
- servicesdir = @moduledir@/autoload
- libmodulesdir = @moduledir@
- contribdir = @moduledir@/contrib
--INCLUDES = -I../include -I../libratbox/include $(INCLTDL)
-+INCLUDES = -I../include -I../libratbox/include $(INCLTDL) $(SSL_INCLUDES)
- AM_CFLAGS = $(WARNFLAGS)
- SRCS = \
- example_module.c        \
-@@ -429,8 +429,8 @@ clean-generic:
- 	$(LIBTOOL) --mode=clean $(RB_RM) -f $(S_OBJS) $(S_CORE_OBJS)  $(ST_OBJS)
- 
- install_modules: $(S_OBJS)
--	-@@$(MKDIR_P) $(contribdir); \
--	for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(contribdir);done
-+	-@@$(MKDIR_P) $(DESTDIR)$(contribdir); \
-+	for x in $(S_OBJS); do $(SHELL) ../install-mod.sh $$x $(DESTDIR)$(contribdir);done
- 
- #install-mkdirs:
- #	@echo "ircd: setting up modular directory structure"
diff --git a/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c b/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c
deleted file mode 100644
index dca47e6bed91..000000000000
--- a/irc/ircd-ratbox/files/patch-libratbox_src_openssl.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libratbox/src/openssl.c.orig	2012-03-16 07:29:42.000000000 +0100
-+++ libratbox/src/openssl.c	2015-03-10 21:01:33.572383130 +0100
-@@ -556,10 +556,12 @@
- 
- 	switch (seed_type)
- 	{
-+#ifndef OPENSSL_NO_EGD
- 	case RB_PRNG_EGD:
- 		if(RAND_egd(path) == -1)
- 			return -1;
- 		break;
-+#endif
- 	case RB_PRNG_FILE:
- 		if(RAND_load_file(path, -1) == -1)
- 			return -1;
-- 
cgit v1.2.3