- Update to 3.0.1

PR:		ports/107630
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

8 files changed, 52 insertions, 80 deletions

diff --git a/irc/ctrlproxy/files/patch-Makefile b/irc/ctrlproxy/files/patch-Makefile
new file mode 100644
index 000000000000..6aea93895d83
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-Makefile
@@ -0,0 +1,21 @@
+--- Makefile.orig	Fri Jan  5 06:33:03 2007
++++ Makefile	Fri Jan  5 23:44:47 2007
+@@ -96,17 +96,14 @@
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL) -d $(DESTDIR)$(destincludedir)
+ 	$(INSTALL) -d $(DESTDIR)$(modulesdir)
+-	$(INSTALL) -d $(DESTDIR)$(docdir)
+ 	$(INSTALL) -d $(DESTDIR)$(cdatadir)
+-	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
++	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 
+ install-bin:
+ 	$(INSTALL) ctrlproxy$(EXEEXT) $(DESTDIR)$(bindir)
+ 
+ install-doc: doc
+ 	$(INSTALL) -m 0644 $(headers) $(DESTDIR)$(destincludedir)
+-	$(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir)
+-	$(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION)
+ 
+ install-data:
+ 	$(INSTALL) -m 0644 motd $(DESTDIR)$(cdatadir)
diff --git a/irc/ctrlproxy/files/patch-Makefile.in b/irc/ctrlproxy/files/patch-Makefile.in
deleted file mode 100644
index ad956004efc1..000000000000
--- a/irc/ctrlproxy/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	Wed Feb  4 10:28:45 2004
-+++ Makefile.in	Thu Apr 21 02:05:12 2005
-@@ -24,7 +24,7 @@
- 	$(CC) $(LIBS) -rdynamic -o $@ $(OBJS)
- 
- printstats: printstats.o
--	$(CC) -ltdb -o $@ $<
-+	$(CC) -ltdb -o $@ $< @LDFLAGS@
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) -c $<
-@@ -36,7 +36,6 @@
- 	$(INSTALL) -d $(DESTDIR)$(man5dir)
- 	$(INSTALL) -d $(DESTDIR)$(includedir)
- 	$(INSTALL) -d $(DESTDIR)$(modulesdir)
--	$(INSTALL) -d $(DESTDIR)$(docdir)
- 	$(INSTALL) -d $(DESTDIR)$(cdatadir)
- 	$(MAKE) -C doc install 
- 	
-@@ -45,9 +44,6 @@
- 
- install-doc:
- 	$(INSTALL) ctrlproxy.h $(DESTDIR)$(includedir)
--	$(INSTALL) AUTHORS $(DESTDIR)$(docdir)
--	$(INSTALL) COPYING $(DESTDIR)$(docdir)
--	$(INSTALL) TODO $(DESTDIR)$(docdir)
- 
- install-data:
- 	$(INSTALL) motd $(DESTDIR)$(cdatadir)
diff --git a/irc/ctrlproxy/files/patch-doc-Makefile.in b/irc/ctrlproxy/files/patch-doc-Makefile.in
deleted file mode 100644
index 184c13379be2..000000000000
--- a/irc/ctrlproxy/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon Jan  5 22:30:51 2004
-+++ doc/Makefile.in	Tue Oct 11 07:25:39 2005
-@@ -2,7 +2,7 @@
- MOD_MANPAGES = $(patsubst %.mod.xml,%.7ctrlproxy,$(MOD_SOURCES))
- MOD_MANPAGES_HTML = $(patsubst %.mod.xml,%.7ctrlproxy.html,$(MOD_SOURCES))
- MODS = $(patsubst %.mod.xml,%.xml,$(MOD_SOURCES))
--DOCS = ctrlproxy.1 ctrlproxyrc.5 ctrlproxy.pdf ctrlproxy.html $(MOD_MANPAGES)
-+DOCS = ctrlproxy.1 ctrlproxyrc.5 overview.png overview2.png ctrlproxy.html $(MOD_MANPAGES)
- XSLTPROC = @XSLTPROC@ --xinclude
- PDFLATEX = @PDFLATEX@
- XMLTO = @XMLTO@
diff --git a/irc/ctrlproxy/files/patch-mods:Makefile.in b/irc/ctrlproxy/files/patch-mods:Makefile.in
deleted file mode 100644
index b6ae43ad360c..000000000000
--- a/irc/ctrlproxy/files/patch-mods:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mods/Makefile.in.orig	Wed Oct 22 22:37:21 2003
-+++ mods/Makefile.in	Wed Oct 22 22:37:47 2003
-@@ -17,7 +17,7 @@
- 	$(CC) $(CFLAGS) -fPIC -c $<
- 
- libstats.so: stats.o
--	$(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@
-+	$(CC) $(CFLAGS) -shared -o $@ $< -ltdb @LIB_PCRE@ @LDFLAGS@
- 
- libsocket.so: @SOCKET_OBJS@
- 	$(CC) $(CFLAGS) -shared -o $@ @SOCKET_OBJS@ @SSL_LIB@
diff --git a/irc/ctrlproxy/files/patch-mods:stats.c b/irc/ctrlproxy/files/patch-mods:stats.c
deleted file mode 100644
index 3c25b0f6ea2d..000000000000
--- a/irc/ctrlproxy/files/patch-mods:stats.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- mods/stats.c.orig	Wed Dec 10 05:46:40 2003
-+++ mods/stats.c	Thu Mar  4 19:08:20 2004
-@@ -25,12 +25,10 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <string.h>
--#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
deleted file mode 100644
index 85bd160b93bb..000000000000
--- a/irc/ctrlproxy/files/patch-printstats.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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)
diff --git a/irc/ctrlproxy/files/patch-src__internals.h b/irc/ctrlproxy/files/patch-src__internals.h
new file mode 100644
index 000000000000..b92da079656e
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-src__internals.h
@@ -0,0 +1,18 @@
+--- src/internals.h.orig	Fri Jan  5 06:33:06 2007
++++ src/internals.h	Fri Jan  5 23:27:32 2007
+@@ -29,12 +29,13 @@
+ #  include <unistd.h>
+ #endif
+ #include <netdb.h>
+-#include <sys/socket.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <sys/types.h>
+ #include <string.h>
+ #include <stdarg.h>
+ #include <signal.h>
diff --git a/irc/ctrlproxy/files/patch-src__network.h b/irc/ctrlproxy/files/patch-src__network.h
new file mode 100644
index 000000000000..49e4de7b7b36
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-src__network.h
@@ -0,0 +1,13 @@
+--- src/network.h.orig	Fri Jan  5 06:33:07 2007
++++ src/network.h	Fri Jan  5 23:29:33 2007
+@@ -30,7 +30,10 @@
+ #endif
+ 
+ #include "state.h"
++#include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ 
+ struct global;
+ struct network;