diff options
| -rw-r--r-- | irc/dancer-ircd/Makefile | 25 | ||||
| -rw-r--r-- | irc/dancer-ircd/distinfo | 4 | ||||
| -rw-r--r-- | irc/dancer-ircd/files/patch-config.h | 13 | ||||
| -rw-r--r-- | irc/dancer-ircd/files/patch-config.h.fn-include | 66 | ||||
| -rw-r--r-- | irc/dancer-ircd/files/patch-config.h.in | 105 | ||||
| -rw-r--r-- | irc/dancer-ircd/files/patch-paths.c | 38 | ||||
| -rw-r--r-- | irc/dancer-ircd/pkg-plist | 52 |
7 files changed, 140 insertions, 163 deletions
diff --git a/irc/dancer-ircd/Makefile b/irc/dancer-ircd/Makefile index 46ea79352fd7..1afe7637fd15 100644 --- a/irc/dancer-ircd/Makefile +++ b/irc/dancer-ircd/Makefile @@ -6,16 +6,24 @@ # PORTNAME= dancer-ircd -PORTVERSION= 1.0.31m8 -PORTREVISION= 1 -CATEGORIES= irc -MASTER_SITES= http://www.doc.ic.ac.uk/~aps100/dancer/%SUBDIR%/ +PORTVERSION= 1.0.32 +CATEGORIES= irc ipv6 +MASTER_SITES= http://freenode.net/ \ + http://source.freenode.net/~asuffield/dancer/dancer-oper-guide/:doc1 \ + http://source.freenode.net/~asuffield/dancer/dancer-user-guide/:doc2 MASTER_SITE_SUBDIR= ${PORTNAME}/stable/releases -DISTNAME= ${PORTNAME}-${PORTVERSION:S/m/+maint/} +DISTNAME= ${PORTNAME}-${PORTVERSION}+6p4 +DISTFIELS= ${DISTNAME}${EXTRACT_SUFX}${EXTRACT_SUFX} \ + dancer-oper-guide.txt:doc1 \ + dancer-user-guide.txt:doc2 +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= knu@FreeBSD.org COMMENT= An irc daemon based on hybrid ircd +IGNOREFILES= dancer-oper-guide.txt \ + dancer-user-guide.txt + USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -25,7 +33,7 @@ IS_INTERACTIVE= yes .endif post-patch: - ${REINPLACE_CMD} 's:@@prefix@@:${PREFIX}:g' ${WRKSRC}/include/config.h + ${REINPLACE_CMD} 's:@@prefix@@:${PREFIX}:g' ${WRKSRC}/src/paths.c pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -55,7 +63,10 @@ post-install: ${SED} -e "s,/usr/local/,${PREFIX}/,g" ${PKGMESSAGE} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}/ + ${INSTALL_DATA} \ + ${DISTDIR}/${DIST_SUBDIR}/dancer-oper-guide.txt \ + ${DISTDIR}/${DIST_SUBDIR}/dancer-user-guide.txt \ + ${DOCSDIR}/ .endif .include <bsd.port.mk> diff --git a/irc/dancer-ircd/distinfo b/irc/dancer-ircd/distinfo index 164e996d987e..42aff930f28e 100644 --- a/irc/dancer-ircd/distinfo +++ b/irc/dancer-ircd/distinfo @@ -1 +1,3 @@ -MD5 (dancer-ircd-1.0.31+maint8.tar.gz) = a6a3af5c396db56744a77b5630302ef8 +MD5 (dancer-ircd-1.0.32+6p4.tar.gz) = e7d6ab16ceeb1d5c20f1d6f9ddbaaacb +MD5 (dancer-oper-guide.txt) = IGNORE +MD5 (dancer-user-guide.txt) = IGNORE diff --git a/irc/dancer-ircd/files/patch-config.h b/irc/dancer-ircd/files/patch-config.h new file mode 100644 index 000000000000..1d4f0c98c85b --- /dev/null +++ b/irc/dancer-ircd/files/patch-config.h @@ -0,0 +1,13 @@ +--- include/config.h.orig Wed Sep 3 03:11:17 2003 ++++ include/config.h Fri Nov 14 06:16:38 2003 +@@ -36,8 +36,8 @@ + * system limits. If you know what you are doing, increase them now + */ + +-#define HARD_FDLIMIT_ 4096 /* was 256 */ +-#define INIT_MAXCLIENTS 4000 /* was 200 */ ++#define HARD_FDLIMIT_ 512 /* was 256 */ ++#define INIT_MAXCLIENTS 400 /* was 200 */ + + /* + * This is how many 'buffer connections' we allow... diff --git a/irc/dancer-ircd/files/patch-config.h.fn-include b/irc/dancer-ircd/files/patch-config.h.fn-include new file mode 100644 index 000000000000..f1d83f5eba72 --- /dev/null +++ b/irc/dancer-ircd/files/patch-config.h.fn-include @@ -0,0 +1,66 @@ +--- include/config.h.fn-include.orig Wed Aug 20 05:04:07 2003 ++++ include/config.h.fn-include Fri Nov 14 05:29:23 2003 +@@ -109,17 +109,17 @@ + /* NETWORK_NAME + * Displayed in place of the servername when SERVERHIDE is enabled + */ +-#define NETWORK_NAME "irc.freenode.net" ++#define NETWORK_NAME "irc.example.net" + + /* NETWORK_REALNAME + * Displayed in RPL_WELCOME (at least). Don't put punctuation in here. + */ +-#define NETWORK_REALNAME "freenode IRC" ++#define NETWORK_REALNAME "Local IRC" + + /* NETWORK_DESC + * Displayed in place of the server info when SERVERHIDE is enabled + */ +-#define NETWORK_DESC "http://freenode.net/" ++#define NETWORK_DESC "http://www.example.net/" + + /* USE_SERVICES + * Defines whether or not you're using services on your network +@@ -637,7 +637,7 @@ + * the net. for a leaf, 2 is fine. If the number of servers seen + * on the net gets less than 2, a split is deemed to have happened. + */ +-#define SPLIT_SMALLNET_SIZE 10 ++#define SPLIT_SMALLNET_SIZE 0 + + /* + * SPLIT_SMALLNET_USER_SIZE defines how many global users on the +@@ -647,7 +647,7 @@ + * number of users seen on net > SPLIT_SMALLNET_USER_SIZE start + * counting down the SERVER_SPLIT_RECOVERY_TIME + */ +-#define SPLIT_SMALLNET_USER_SIZE 500 /* was 10000 */ ++#define SPLIT_SMALLNET_USER_SIZE 0 /* was 10000 */ + + /* + * SPLIT_PONG will send a PING to a server after the connect burst. +@@ -657,13 +657,13 @@ + * you should be able to crank DEFAULT_SERVER_SPLIT_RECOVERY_TIME + * down to 1. + */ +-#define SPLIT_PONG ++#undef SPLIT_PONG + + /* + * DEFAULT_SERVER_SPLIT_RECOVERY_TIME - determines how long to delay split + * status after resyncing + */ +-#define DEFAULT_SERVER_SPLIT_RECOVERY_TIME 1 ++#define DEFAULT_SERVER_SPLIT_RECOVERY_TIME 0 + + /* LIMIT_UH + * If this is defined, Y line limit is made against the actual +@@ -787,7 +787,7 @@ + * it will show up in /list + */ + +-#define MIN_USERS_FOR_LIST 4 ++#define MIN_USERS_FOR_LIST 2 + + /* USE_KNOCK + * KNOCK allows users to send a "knock" to a +i channel. diff --git a/irc/dancer-ircd/files/patch-config.h.in b/irc/dancer-ircd/files/patch-config.h.in deleted file mode 100644 index 9628697677f0..000000000000 --- a/irc/dancer-ircd/files/patch-config.h.in +++ /dev/null @@ -1,105 +0,0 @@ ---- include/config.h.orig Fri Apr 12 05:04:53 2002 -+++ include/config.h Tue Apr 15 15:53:06 2003 -@@ -66,8 +66,8 @@ - * system limits. If you know what you are doing, increase them now - */ - --#define HARD_FDLIMIT_ 256 /* was 256 */ --#define INIT_MAXCLIENTS 200 /* was 200 */ -+#define HARD_FDLIMIT_ 512 /* was 256 */ -+#define INIT_MAXCLIENTS 400 /* was 200 */ - - /* - * This is how many 'buffer connections' we allow... -@@ -125,15 +125,15 @@ - */ - - #define DPATH "/" --#define SPATH "bin/dancer-ircd" --#define CPATH "etc/dancer-ircd/ircd.conf" --#define KPATH "var/lib/dancer-ircd/kline.conf" --#define DLPATH "var/lib/dancer-ircd/dline.conf" --#define MPATH "etc/dancer-ircd/motd" --#define LPATH "var/log/dancer-ircd/ircd.log" --#define PPATH "var/run/dancer-ircd.pid" --#define HPATH "etc/dancer-ircd/ohelp" --#define OPATH "etc/dancer-ircd/omotd" -+#define SPATH "@@prefix@@/bin/dancer-ircd" -+#define CPATH "@@prefix@@/etc/dancer-ircd/ircd.conf" -+#define KPATH "@@prefix@@/etc/dancer-ircd/kline.conf" -+#define DLPATH "@@prefix@@/etc/dancer-ircd/dline.conf" -+#define MPATH "@@prefix@@/etc/dancer-ircd/motd" -+#define LPATH "/var/log/dancer-ircd/ircd.log" -+#define PPATH "/var/run/dancer-ircd/dancer-ircd.pid" -+#define HPATH "@@prefix@@/etc/dancer-ircd/ohelp" -+#define OPATH "@@prefix@@/etc/dancer-ircd/omotd" - - /* HIDE_OPS - * Define this to prevent non chanops from seeing what ops a channel has -@@ -173,12 +173,12 @@ - /* NETWORK_NAME - * Displayed in place of the servername when SERVERHIDE is enabled - */ --#define NETWORK_NAME "irc.openprojects.net" -+#define NETWORK_NAME "irc.example.net" - - /* NETWORK_DESC - * Displayed in place of the server info when SERVERHIDE is enabled - */ --#define NETWORK_DESC "http://www.openprojects.net/" -+#define NETWORK_DESC "http://www.example.net/" - - /* USE_SERVICES - * Defines whether or not you're using services on your network -@@ -246,7 +246,7 @@ - */ - #define SAVE_MAXCLIENT - #ifdef SAVE_MAXCLIENT --# define MXPATH "etc/dancer-ircd/ircd.max" -+# define MXPATH "@@prefix@@/etc/dancer-ircd/ircd.max" - # define SAVE_TIME 3600 - #endif - -@@ -683,7 +683,7 @@ - * the net. for a leaf, 2 is fine. If the number of servers seen - * on the net gets less than 2, a split is deemed to have happened. - */ --#define SPLIT_SMALLNET_SIZE 2 -+#define SPLIT_SMALLNET_SIZE 0 - - /* - * SPLIT_SMALLNET_USER_SIZE defines how many global users on the -@@ -693,7 +693,7 @@ - * number of users seen on net > SPLIT_SMALLNET_USER_SIZE start - * counting down the SERVER_SPLIT_RECOVERY_TIME - */ --#define SPLIT_SMALLNET_USER_SIZE 2 /* was 10000 */ -+#define SPLIT_SMALLNET_USER_SIZE 0 /* was 10000 */ - - /* - * SPLIT_PONG will send a PING to a server after the connect burst. -@@ -703,13 +703,13 @@ - * you should be able to crank DEFAULT_SERVER_SPLIT_RECOVERY_TIME - * down to 1. - */ --#define SPLIT_PONG -+#undef SPLIT_PONG - - /* - * DEFAULT_SERVER_SPLIT_RECOVERY_TIME - determines how long to delay split - * status after resyncing - */ --#define DEFAULT_SERVER_SPLIT_RECOVERY_TIME 1 -+#define DEFAULT_SERVER_SPLIT_RECOVERY_TIME 0 - - /* LIMIT_UH - * If this is defined, Y line limit is made against the actual -@@ -864,7 +864,7 @@ - * it will show up in /list - */ - --#define MIN_USERS_FOR_LIST 4 -+#define MIN_USERS_FOR_LIST 2 - - /* USE_KNOCK - * KNOCK allows users to send a "knock" to a +i channel. diff --git a/irc/dancer-ircd/files/patch-paths.c b/irc/dancer-ircd/files/patch-paths.c new file mode 100644 index 000000000000..3cef30d4a72c --- /dev/null +++ b/irc/dancer-ircd/files/patch-paths.c @@ -0,0 +1,38 @@ +--- src/paths.c.orig Tue Jul 8 14:41:55 2003 ++++ src/paths.c Fri Nov 14 05:26:16 2003 +@@ -64,20 +64,21 @@ + */ + + #define DPATH PREFIX "/" +-#define SPATH "sbin/dancer-ircd" +-#define CPATH "etc/dancer-ircd/ircd.conf" +-#define MPATH "etc/dancer-ircd/motd" +-#define HPATH "etc/dancer-ircd/ohelp" +-#define OPATH "etc/dancer-ircd/omotd" +-#define LPATH "var/log/dancer-ircd/ircd.log" +-#define HLBASE "var/log/dancer-ircd/hash" +-#define USERLOG "var/log/dancer-ircd/user.log" +-#define OPERLOG "var/log/dancer-ircd/oper.log" +-#define PPATH "var/run/dancer-ircd.pid" +-#define KPATH "var/lib/dancer-ircd/kline.conf" +-#define DLPATH "var/lib/dancer-ircd/dline.conf" +-#define MXPATH "var/lib/dancer-ircd/ircd.max" +-#define DUMPPATH "var/lib/dancer-ircd/dump" ++ ++#define SPATH "@@prefix@@/bin/dancer-ircd" ++#define CPATH "@@prefix@@/etc/dancer-ircd/ircd.conf" ++#define MPATH "@@prefix@@/etc/dancer-ircd/motd" ++#define HPATH "@@prefix@@/etc/dancer-ircd/ohelp" ++#define OPATH "@@prefix@@/etc/dancer-ircd/omotd" ++#define LPATH "/var/log/dancer-ircd/ircd.log" ++#define HLBASE "/var/log/dancer-ircd/hash" ++#define USERLOG "/var/log/dancer-ircd/user.log" ++#define OPERLOG "/var/log/dancer-ircd/oper.log" ++#define PPATH "/var/run/dancer-ircd/dancer-ircd.pid" ++#define KPATH "@@prefix@@/etc/dancer-ircd/kline.conf" ++#define DLPATH "@@prefix@@/etc/dancer-ircd/dline.conf" ++#define MXPATH "@@prefix@@/etc/dancer-ircd/ircd.max" ++#define DUMPPATH "@@prefix@@/etc/dancer-ircd/dump" + + const char *work_dir = DPATH; + const char *config_file = CPATH; diff --git a/irc/dancer-ircd/pkg-plist b/irc/dancer-ircd/pkg-plist index 5b8d98ecde9e..517ce87497d0 100644 --- a/irc/dancer-ircd/pkg-plist +++ b/irc/dancer-ircd/pkg-plist @@ -1,6 +1,4 @@ bin/dancer-ircd -bin/mkpasswd -bin/viconf @unexec if cmp -s %D/etc/dancer-ircd/ircd.conf %D/etc/dancer-ircd/ircd.conf.sample; then rm -f %D/etc/dancer-ircd/ircd.conf; fi etc/dancer-ircd/ircd.conf.sample @exec if [ ! -f %B/ircd.conf ]; then cp %B/%f %B/ircd.conf; fi @@ -22,52 +20,6 @@ etc/dancer-ircd/omotd.sample etc/rc.d/dancer-ircd.sh @exec install -d -o ircd -g ircd -m 700 /var/log/dancer-ircd /var/run/dancer-ircd @unexec rmdir %D/etc/dancer-ircd /var/log/dancer-ircd /var/run/dancer-ircd 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/dancer-ircd /var/log/dancer-ircd /var/run/dancer-ircd`` to remove any configuration files and log files left." | fmt -%%PORTDOCS%%%%DOCSDIR%%/CIDR.txt -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.hybrid-6 -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.FIRST.hybrid-6 -%%PORTDOCS%%%%DOCSDIR%%/README.TSora -%%PORTDOCS%%%%DOCSDIR%%/README.small_nets -%%PORTDOCS%%%%DOCSDIR%%/README.umodes -%%PORTDOCS%%%%DOCSDIR%%/RELNOTES.hybrid-6 -%%PORTDOCS%%%%DOCSDIR%%/Tao-of-IRC.940110 -%%PORTDOCS%%%%DOCSDIR%%/blalloc.txt -%%PORTDOCS%%%%DOCSDIR%%/example.conf -%%PORTDOCS%%%%DOCSDIR%%/hybrid/ChangeLog.hybrid-6.gz -%%PORTDOCS%%%%DOCSDIR%%/hybrid/README -%%PORTDOCS%%%%DOCSDIR%%/hybrid/example.conf -%%PORTDOCS%%%%DOCSDIR%%/hybrid/example.conf.trillian -%%PORTDOCS%%%%DOCSDIR%%/hybrid/mtrie.txt -%%PORTDOCS%%%%DOCSDIR%%/hybrid/opermyth.txt -%%PORTDOCS%%%%DOCSDIR%%/hybrid/opers.txt -%%PORTDOCS%%%%DOCSDIR%%/hybrid/server-version-info -%%PORTDOCS%%%%DOCSDIR%%/hybrid/simple.conf -%%PORTDOCS%%%%DOCSDIR%%/ircd.8 -%%PORTDOCS%%%%DOCSDIR%%/old/Authors -%%PORTDOCS%%%%DOCSDIR%%/old/Etiquette -%%PORTDOCS%%%%DOCSDIR%%/old/README -%%PORTDOCS%%%%DOCSDIR%%/rfc1459.txt -%%PORTDOCS%%%%DOCSDIR%%/sgml/Makefile -%%PORTDOCS%%%%DOCSDIR%%/sgml/README -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/Makefile -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/cmodes.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/commands.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/config.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/dancer-oper-guide.ced -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/dancer-oper-guide.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/intro.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-oper-guide/umodes.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/Makefile -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/changes.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/channels.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/dancer-user-guide.ced -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/dancer-user-guide.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/intro.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/dancer-user-guide/umodes.sgml -%%PORTDOCS%%%%DOCSDIR%%/sgml/fdl.sgml -%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml/dancer-user-guide -%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml/dancer-oper-guide -%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml -%%PORTDOCS%%@dirrm %%DOCSDIR%%/old -%%PORTDOCS%%@dirrm %%DOCSDIR%%/hybrid +%%PORTDOCS%%%%DOCSDIR%%/dancer-oper-guide.txt +%%PORTDOCS%%%%DOCSDIR%%/dancer-user-guide.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% |