upgrade to 2.6

7 files changed, 34 insertions, 35 deletions

diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index f4b6f9aae7fc..876f2a03c749 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	ctrlproxy
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6
+PORTREVISION=	0
 CATEGORIES=	irc
 MASTER_SITES=	http://jelmer.vernstok.nl/ctrlproxy/
 
@@ -32,7 +32,7 @@ MAN1=	ctrlproxy.1
 MAN5=	ctrlproxyrc.5
 MAN7=	admin.7ctrlproxy antiflood.7ctrlproxy auto-away.7ctrlproxy \
 	ctcp.7ctrlproxy log_custom.7ctrlproxy log_irssi.7ctrlproxy \
-	nickserv.7ctrlproxy noticelog.7ctrlproxy repl_memory.7ctrlproxy \
+	nickserv.7ctrlproxy noticelog.7ctrlproxy \
 	socket.7ctrlproxy stats.7ctrlproxy strip.7ctrlproxy
 
 post-patch:
diff --git a/irc/ctrlproxy/distinfo b/irc/ctrlproxy/distinfo
index 52044f19953b..d3f66562f40e 100644
--- a/irc/ctrlproxy/distinfo
+++ b/irc/ctrlproxy/distinfo
@@ -1 +1 @@
-MD5 (ctrlproxy-2.5.tar.gz) = 42ce7a61b3ca885f110125bfd28fff3e
+MD5 (ctrlproxy-2.6.tar.gz) = f4d242cad2175f1626bb1d5558a8326a
diff --git a/irc/ctrlproxy/files/patch-Makefile.in b/irc/ctrlproxy/files/patch-Makefile.in
index e239f79bd91a..17710b499de0 100644
--- a/irc/ctrlproxy/files/patch-Makefile.in
+++ b/irc/ctrlproxy/files/patch-Makefile.in
@@ -1,14 +1,5 @@
 --- Makefile.in.orig	Tue Oct 14 02:15:45 2003
 +++ Makefile.in	Wed Oct 22 22:47:20 2003
-@@ -5,7 +5,7 @@
- CFLAGS = @CFLAGS@ @PKG_CFLAGS@
- INSTALL = @INSTALL@
- bindir = @bindir@
--docdir = @prefix@/doc/ctrlproxy
-+docdir = @prefix@/share/doc/ctrlproxy
- modulesdir = @libdir@/ctrlproxy
- includedir = @includedir@
- man1dir = @mandir@/man1
 @@ -23,7 +23,7 @@
  	$(CC) $(LIBS) -rdynamic -o $@ $(OBJS)
  
diff --git a/irc/ctrlproxy/files/patch-doc:Makefile.in b/irc/ctrlproxy/files/patch-doc:Makefile.in
deleted file mode 100644
index cd504ab25c0e..000000000000
--- a/irc/ctrlproxy/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Wed Oct 22 22:44:44 2003
-+++ doc/Makefile.in	Wed Oct 22 22:45:09 2003
-@@ -4,7 +4,7 @@
- DOCS = ctrlproxy.1 ctrlproxyrc.5 ctrlproxy.pdf ctrlproxy.html $(MOD_DOCS)
- XSLTPROC = @XSLTPROC@ --xinclude
- XMLTO = @XMLTO@
--docdir = @prefix@/doc/ctrlproxy
-+docdir = @prefix@/share/doc/ctrlproxy
- INSTALL = @INSTALL@
- prefix = @prefix@
- mandir = @mandir@
diff --git a/irc/ctrlproxy/files/patch-mods:stats.c b/irc/ctrlproxy/files/patch-mods:stats.c
new file mode 100644
index 000000000000..ea4f0703ad15
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-mods:stats.c
@@ -0,0 +1,13 @@
+--- mods/stats.c.orig	Wed Jan  7 09:20:11 2004
++++ mods/stats.c	Wed Jan  7 09:20:19 2004
+@@ -28,9 +28,9 @@
+ #include <malloc.h>
+ #include <stdio.h>
+ #include <time.h>
+-#include <tdb.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <tdb.h>
+ #include <fcntl.h>
+ 
+ #define MAX_REGEX_SUBMATCHES 30
diff --git a/irc/ctrlproxy/files/patch-printstats.c b/irc/ctrlproxy/files/patch-printstats.c
index fd8f70f7f6e1..85bd160b93bb 100644
--- a/irc/ctrlproxy/files/patch-printstats.c
+++ b/irc/ctrlproxy/files/patch-printstats.c
@@ -1,13 +1,13 @@
---- printstats.c.orig	Wed Oct 22 22:34:42 2003
-+++ printstats.c	Wed Oct 22 22:34:48 2003
-@@ -34,9 +34,9 @@
+--- printstats.c.orig	Wed Jan  7 09:18:37 2004
++++ printstats.c	Wed Jan  7 09:18:46 2004
+@@ -27,9 +27,9 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <time.h>
+-#include <tdb.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <tdb.h>
+ #include <fcntl.h>
  
  int traverse_keys(TDB_CONTEXT *tdb_context, TDB_DATA key, TDB_DATA value, void *pattern)
- {
-+	long *ivalue;
- 	if(!key.dptr) return 0;
- 
--	long *ivalue;
- 	ivalue = (long *)value.dptr;
- 	printf("%s: %ld\n", key.dptr, *ivalue);
- 	return 0;
diff --git a/irc/ctrlproxy/pkg-plist b/irc/ctrlproxy/pkg-plist
index be9e812a03fe..38dd686fd444 100644
--- a/irc/ctrlproxy/pkg-plist
+++ b/irc/ctrlproxy/pkg-plist
@@ -4,11 +4,17 @@ lib/ctrlproxy/libadmin.so
 lib/ctrlproxy/libantiflood.so
 lib/ctrlproxy/libauto-away.so
 lib/ctrlproxy/libctcp.so
+lib/ctrlproxy/liblinestack_memory.so
 lib/ctrlproxy/liblog_custom.so
 lib/ctrlproxy/liblog_irssi.so
+lib/ctrlproxy/libmotd_file.so
 lib/ctrlproxy/libnickserv.so
 lib/ctrlproxy/libnoticelog.so
+lib/ctrlproxy/librepl_command.so
+lib/ctrlproxy/librepl_highlight.so
 lib/ctrlproxy/librepl_memory.so
+lib/ctrlproxy/librepl_none.so
+lib/ctrlproxy/librepl_simple.so
 lib/ctrlproxy/libsocket.so
 lib/ctrlproxy/libstats.so
 lib/ctrlproxy/libstrip.so