5 files changed, 86 insertions, 18 deletions

diff --git a/irc/srvx/Makefile b/irc/srvx/Makefile
index cb05683882d6..3293b97fcc6b 100644
--- a/irc/srvx/Makefile
+++ b/irc/srvx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	srvx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	irc net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	srvx
@@ -26,17 +25,19 @@ CONFIGURE_ARGS+=	--enable-debug
 CONFIGURE_ARGS+=	--with-protocol=bahamut
 .endif
 
-PLIST_FILES=	bin/srvx etc/srvx.conf.example 		\
-		etc/sockcheck.conf.example 		\
-		share/doc/${PORTNAME}/chanserv.help 	\
-		share/doc/${PORTNAME}/global.help 	\
-		share/doc/${PORTNAME}/helpserv.help 	\
-		share/doc/${PORTNAME}/modcmd.help 	\
-		share/doc/${PORTNAME}/nickserv.help 	\
-		share/doc/${PORTNAME}/opserv.help 	\
-		share/doc/${PORTNAME}/saxdb.help 	\
-		share/doc/${PORTNAME}/sendmail.help 	\
-		share/doc/${PORTNAME}/sockcheck.help
+PLIST_FILES=	bin/srvx 					\
+		etc/srvx.conf.example				\
+		etc/sockcheck.conf.example 			\
+		share/doc/${PORTNAME}/chanserv.help 		\
+		share/doc/${PORTNAME}/global.help 		\
+		share/doc/${PORTNAME}/mod-helpserv.help		\
+		share/doc/${PORTNAME}/mod-memoserv.help 	\
+		share/doc/${PORTNAME}/mod-sockcheck.help	\
+		share/doc/${PORTNAME}/modcmd.help 		\
+		share/doc/${PORTNAME}/nickserv.help	 	\
+		share/doc/${PORTNAME}/opserv.help 		\
+		share/doc/${PORTNAME}/saxdb.help	 	\
+		share/doc/${PORTNAME}/sendmail.help
 PLIST_DIRS=	share/doc/${PORTNAME}
 
 pre-fetch:
@@ -56,8 +57,7 @@ pre-fetch:
 post-install:
 	@ ${ECHO} ""
 	@ ${ECHO} "	When you 'make deinstall', any files generated by ${PORTNAME} (logs, etc)"
-	@ ${ECHO} "	will remain in ${PREFIX}/etc/.  These files must be removed"
-	@ ${ECHO} "	manually."
+	@ ${ECHO} "	will remain in ${PREFIX}/etc/. These files must be removed manually."
 	@ ${ECHO} ""
 	@ ${ECHO} "	${PORTNAME} .help files are located in ${DOCSDIR}."
 	@ ${ECHO} ""
diff --git a/irc/srvx/distinfo b/irc/srvx/distinfo
index 3872c3982123..74af2071188e 100644
--- a/irc/srvx/distinfo
+++ b/irc/srvx/distinfo
@@ -1,2 +1,2 @@
-MD5 (srvx-1.2.1.tar.gz) = 4c1c4982fbc23156dbeb6d5c33850c3b
-SIZE (srvx-1.2.1.tar.gz) = 556892
+MD5 (srvx-1.3.tar.gz) = 856d4d452d32340224400dfdfeaf70bc
+SIZE (srvx-1.3.tar.gz) = 572481
diff --git a/irc/srvx/files/patch-src-Makefile.in b/irc/srvx/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..89d4d0e03468
--- /dev/null
+++ b/irc/srvx/files/patch-src-Makefile.in
@@ -0,0 +1,20 @@
+--- src/Makefile.am.old	Mon Mar 14 23:35:03 2005
++++ src/Makefile.am	Mon Mar 14 23:35:13 2005
+@@ -11,7 +11,6 @@
+ .PHONY: checkversion
+ arch-version.h: checkversion
+ checkversion:
+-	@tla logs -f >/dev/null || exit 0; \
+ 	TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \
+ 	echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \
+ 	if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \
+--- src/Makefile.in.old	Mon Mar 14 23:35:17 2005
++++ src/Makefile.in	Mon Mar 14 23:35:33 2005
+@@ -527,7 +527,6 @@
+ .PHONY: checkversion
+ arch-version.h: checkversion
+ checkversion:
+-	@tla logs -f >/dev/null || exit 0; \
+ 	TMPFILE=`mktemp arch-version.h.XXXXXX` || exit 1 ; \
+ 	echo "#define ARCH_VERSION \"`tla logs -f | tail -n 1`\"" >> $$TMPFILE ; \
+ 	if diff -q arch-version.h $$TMPFILE >/dev/null 2>&1 ; then \
diff --git a/irc/srvx/files/patch-src-proto-p10.c b/irc/srvx/files/patch-src-proto-p10.c
new file mode 100644
index 000000000000..b091a3cae966
--- /dev/null
+++ b/irc/srvx/files/patch-src-proto-p10.c
@@ -0,0 +1,49 @@
+--- src/proto-p10.c.old	Tue Feb 22 05:11:21 2005
++++ src/proto-p10.c	Mon Mar 14 22:21:12 2005
+@@ -367,10 +367,10 @@
+     if (srv == self) {
+         /* The +s, ignored by Run's ircu, means "service" to Undernet's ircu */
+         putsock(P10_SERVER " %s %d %li %li J10 %s%s +s :%s",
+-                srv->name, srv->hops+1, srv->boot, srv->link, srv->numeric, extranum, srv->description);
++                srv->name, srv->hops+1, (long)srv->boot, (long)srv->link, srv->numeric, extranum, srv->description);
+     } else {
+         putsock("%s " P10_SERVER " %s %d %li %li %c10 %s%s +s :%s",
+-                self->numeric, srv->name, srv->hops+1, srv->boot, srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description);
++                self->numeric, srv->name, srv->hops+1, (long)srv->boot, (long)srv->link, (srv->self_burst ? 'J' : 'P'), srv->numeric, extranum, srv->description);
+     }
+ }
+ 
+@@ -408,10 +408,10 @@
+ 
+         /* we don't need to put the + in modes because it's in the format string. */
+         putsock("%s " P10_NICK " %s %d %li %s %s +%s %s %s :%s",
+-                user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info);
++                user->uplink->numeric, user->nick, user->uplink->hops+1, (long)user->timestamp, user->ident, user->hostname, modes, b64ip, user->numeric, user->info);
+     } else {
+         putsock("%s " P10_NICK " %s %d %li %s %s %s %s :%s",
+-                user->uplink->numeric, user->nick, user->uplink->hops+1, user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info);
++                user->uplink->numeric, user->nick, user->uplink->hops+1, (long)user->timestamp, user->ident, user->hostname, b64ip, user->numeric, user->info);
+     }
+ }
+ 
+@@ -545,7 +545,7 @@
+ irc_gline(struct server *srv, struct gline *gline)
+ {
+     putsock("%s " P10_GLINE " %s +%s %ld :%s",
+-            self->numeric, (srv ? srv->numeric : "*"), gline->target, gline->expires-now, gline->reason);
++            self->numeric, (srv ? srv->numeric : "*"), gline->target, (long)gline->expires-now, gline->reason);
+ }
+ 
+ void
+@@ -680,9 +680,9 @@
+ {
+     if (what->members.used == 1) {
+         putsock("%s " P10_CREATE " %s %lu",
+-                who->numeric, what->name, what->timestamp);
++                who->numeric, what->name, (long)what->timestamp);
+     } else {
+-        putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, what->timestamp);
++        putsock("%s " P10_JOIN " %s %lu", who->numeric, what->name, (long)what->timestamp);
+     }
+ }
+ 
diff --git a/irc/srvx/pkg-descr b/irc/srvx/pkg-descr
index 14e1ee720da4..d12a42986df4 100644
--- a/irc/srvx/pkg-descr
+++ b/irc/srvx/pkg-descr
@@ -14,4 +14,3 @@ full list.
 
 Author:	"Entrope" <entrope@users.sourceforge.net>
 WWW:	http://www.srvx.net
-