From c70aca1ff836df55d52741f6279b9bc30f550732 Mon Sep 17 00:00:00 2001 From: mm Date: Mon, 19 Apr 2010 16:19:26 +0000 Subject: - Update to 1.2.0 RC1 - Take maintainership from ports@ --- irc/dircproxy/Makefile | 18 ++++++++++++------ irc/dircproxy/distinfo | 6 +++--- irc/dircproxy/files/patch-doc-Makefile.in | 11 +++++++++++ irc/dircproxy/files/patch-src_dcc_net.c | 11 ----------- irc/dircproxy/files/patch-src_irc_server.c | 29 ----------------------------- irc/dircproxy/files/patch-src_net.c | 11 ----------- irc/dircproxy/files/pkg-message.in | 8 ++++++-- irc/dircproxy/pkg-plist | 2 +- 8 files changed, 33 insertions(+), 63 deletions(-) create mode 100644 irc/dircproxy/files/patch-doc-Makefile.in delete mode 100644 irc/dircproxy/files/patch-src_dcc_net.c delete mode 100644 irc/dircproxy/files/patch-src_irc_server.c delete mode 100644 irc/dircproxy/files/patch-src_net.c (limited to 'irc/dircproxy') diff --git a/irc/dircproxy/Makefile b/irc/dircproxy/Makefile index fceb7069fc2a..b69fc486cc30 100644 --- a/irc/dircproxy/Makefile +++ b/irc/dircproxy/Makefile @@ -6,21 +6,27 @@ # PORTNAME= dircproxy -PORTVERSION= 1.0.5 -PORTREVISION= 1 +DISTVERSION= 1.2.0-RC1 CATEGORIES= irc -MASTER_SITES= http://www.securiweb.net/pub/oss/dircproxy/1.0/ \ - ftp://ftp.netsplit.com/pub/dircproxy/stable/ +MASTER_SITES= http://dircproxy.googlecode.com/files/ +PKGNAMESUFFIX= -devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mm@FreeBSD.org COMMENT= A detachable irc proxy server with many features GNU_CONFIGURE= yes +MAKE_JOBS_SAFE= yes +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +.if !defined(NO_INSTALL_MANPAGES) MAN1= dircproxy.1 dircproxy-crypt.1 -SUB_FILES= pkg-message +.endif post-install: +.if !defined(NO_INSTALL_MANPAGES) + @cd ${WRKSRC}/doc && make install-man +.endif @${CAT} ${PKGMESSAGE} .include diff --git a/irc/dircproxy/distinfo b/irc/dircproxy/distinfo index 4787250c6691..84e68f69373a 100644 --- a/irc/dircproxy/distinfo +++ b/irc/dircproxy/distinfo @@ -1,3 +1,3 @@ -MD5 (dircproxy-1.0.5.tar.gz) = 33b92e0f28530a5faa9fea801d1ad807 -SHA256 (dircproxy-1.0.5.tar.gz) = caec20ed458a5606be8700400ecba27aff00ad6227ff0e8d4db1d3d5bf9f9d37 -SIZE (dircproxy-1.0.5.tar.gz) = 217965 +MD5 (dircproxy-1.2.0-RC1.tar.gz) = 4fe2e82619c7b575599bfb236adbd872 +SHA256 (dircproxy-1.2.0-RC1.tar.gz) = 40ad50ffd13681114f995519dc3f65f48cb5eac41e780ad14ce8ffd49463757f +SIZE (dircproxy-1.2.0-RC1.tar.gz) = 811366 diff --git a/irc/dircproxy/files/patch-doc-Makefile.in b/irc/dircproxy/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..ae3441c66a3b --- /dev/null +++ b/irc/dircproxy/files/patch-doc-Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Thu Feb 8 14:47:57 2007 ++++ doc/Makefile.in Thu Feb 8 14:48:11 2007 +@@ -295,7 +295,7 @@ + + info-am: + +-install-data-am: install-man ++install-data-am: + + install-exec-am: + diff --git a/irc/dircproxy/files/patch-src_dcc_net.c b/irc/dircproxy/files/patch-src_dcc_net.c deleted file mode 100644 index 5bd9775c5ce3..000000000000 --- a/irc/dircproxy/files/patch-src_dcc_net.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dcc_net.c.orig 2007-10-02 13:31:06.000000000 +0200 -+++ src/dcc_net.c 2007-10-02 13:31:27.000000000 +0200 -@@ -364,7 +364,7 @@ - n = p->next; - _dccnet_free(p); - -- p = (l ? l->next : proxies) = n; -+ p = *(l ? &(l->next) : &(proxies)) = n; - } else { - l = p; - p = p->next; diff --git a/irc/dircproxy/files/patch-src_irc_server.c b/irc/dircproxy/files/patch-src_irc_server.c deleted file mode 100644 index 69bf380ef73c..000000000000 --- a/irc/dircproxy/files/patch-src_irc_server.c +++ /dev/null @@ -1,29 +0,0 @@ ---- src/irc_server.c.orig 2002-01-31 15:56:37.000000000 +0100 -+++ src/irc_server.c 2007-11-05 12:35:57.000000000 +0100 -@@ -700,7 +700,7 @@ - free(s); - - /* Was in the squelch list, so remove it and stop looking */ -- s = (l ? l->next : p->squelch_modes) = n; -+ s = *(l ? &(l->next) : &(p->squelch_modes)) = n; - squelch = 1; - break; - } else { -@@ -741,7 +741,7 @@ - free(s); - - /* Was in the squelch list, so remove it and stop looking */ -- s = (l ? l->next : p->squelch_modes) = n; -+ s = *(l ? &(l->next) : &(p->squelch_modes)) = n; - squelch = 1; - break; - } else { -@@ -1076,7 +1076,7 @@ - - if (!strcmp(cmsg.cmd, "ACTION")) { - if (p->conn_class->log_events & IRC_LOG_ACTION) -- irclog_ctcp(p, msg.params[0], msg.src.orig, "%s", cmsg.orig); -+ irclog_ctcp(p, (msg.params != NULL ) ? msg.params[0]: "none", msg.src.orig, "%s", cmsg.orig); - - } else if (!strcmp(cmsg.cmd, "DCC") - && p->conn_class->dcc_proxy_incoming) { diff --git a/irc/dircproxy/files/patch-src_net.c b/irc/dircproxy/files/patch-src_net.c deleted file mode 100644 index 9d6f9f4d2d7f..000000000000 --- a/irc/dircproxy/files/patch-src_net.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/net.c.orig 2007-10-02 13:33:00.000000000 +0200 -+++ src/net.c 2007-10-02 13:33:28.000000000 +0200 -@@ -459,7 +459,7 @@ - return 0; - } - -- l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last); -+ l = (buff == SB_IN ? &(s->in_buff_last) : &(s->out_buff_last)); - - /* Check whether we can just add to the existing buffer */ - if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) { diff --git a/irc/dircproxy/files/pkg-message.in b/irc/dircproxy/files/pkg-message.in index bfc09578a622..376da0d3bfbf 100644 --- a/irc/dircproxy/files/pkg-message.in +++ b/irc/dircproxy/files/pkg-message.in @@ -1,4 +1,8 @@ +################################################################## + +A default dircproxy configuration file has been installed as: +%%DATADIR%%/dircproxyrc.sample -A default dircproxy configuration file has been installed as -%%DATADIR%%/dircproxyrc. Please read this and the dircproxy(1) manpage to set up dircproxy. + +################################################################## diff --git a/irc/dircproxy/pkg-plist b/irc/dircproxy/pkg-plist index 1624d9788a3d..1034d2296fcc 100644 --- a/irc/dircproxy/pkg-plist +++ b/irc/dircproxy/pkg-plist @@ -1,7 +1,7 @@ bin/dircproxy bin/dircproxy-crypt %%DATADIR%%/cronchk.sh -%%DATADIR%%/dircproxyrc +%%DATADIR%%/dircproxyrc.sample %%DATADIR%%/log.pl %%DATADIR%%/privmsg-log.pl @dirrm %%DATADIR%% -- cgit