summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2004-10-02 22:09:46 +0000
committeradrianp <adrianp@pkgsrc.org>2004-10-02 22:09:46 +0000
commitf89da151de281b41142d314f3fe254aab74f7bab (patch)
tree6823624fa0652620049eaf72352b96fb46517c8a
parent7747b9437cd4a726bf1d395290fc2471b4406179 (diff)
downloadpkgsrc-f89da151de281b41142d314f3fe254aab74f7bab.tar.gz
- Update irc-services from 5.0.16 to 5.0.40
Pkgsrc changes: - Add a startup script - Use SUBST_* framework (a lot) - Install documentation and man pages - Use CONF_FILES_* for installing config files App changes: - bugfixes - documentation updates - feature improvements - See the Changes file for full details
-rw-r--r--chat/ircservices/Makefile55
-rw-r--r--chat/ircservices/PLIST42
-rw-r--r--chat/ircservices/distinfo10
-rw-r--r--chat/ircservices/files/ircservices.sh22
-rw-r--r--chat/ircservices/patches/patch-aa58
-rw-r--r--chat/ircservices/patches/patch-ab13
-rw-r--r--chat/ircservices/patches/patch-ac22
7 files changed, 180 insertions, 42 deletions
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 78c734117da..0b6027868ed 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/04/11 05:53:08 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/02 22:09:46 adrianp Exp $
#
-DISTNAME= ircservices-5.0.16
-PKGREVISION= 2
+DISTNAME= ircservices-5.0.40
CATEGORIES= chat
MASTER_SITES= ftp://ftp.esper.net/ircservices/ \
ftp://ftp.esper.net/ircservices/old/
@@ -13,12 +12,60 @@ COMMENT= Services for IRC networks
HAS_CONFIGURE= YES
USE_BUILDLINK3= YES
+USE_PKGINSTALL= YES
USE_GNU_TOOLS+= make
-USE_GNU_TOOLS+= grep
+USE_GNU_TOOLS+= grep sed
USE_PERL5= build
+RCD_SCRIPTS= ircservices
CONFIGURE_ARGS= -prefix ${PREFIX}
+SUBST_CLASSES= install utils conf
+SUBST_STAGE.install= post-patch
+SUBST_FILES.install= install-script tools/ircservices-chk.in
+SUBST_SED.install= -e "s|/bin/cp|${CP}|g" \
+ -e "s|/bin/chown|${CHOWN}|g" \
+ -e "s|/bin/chgrp|${CHGRP}|g" \
+ -e "s|/bin/chmod|${CHMOD}|g" \
+ -e "s|@DATDEST@|${VARBASE}/run|g"
+SUBST_MESSAGE.install= "Fixing scripts."
+
+SUBST_STAGE.utils= post-patch
+SUBST_FILES.utils= data/Makefile tools/Makefile
+SUBST_SED.utils= -e "s|chgrp|${CHGRP}|g" \
+ -e "s|chmod|${CHMOD}|g" \
+ -e "s|find|${FIND}|g"
+SUBST_MESSAGE.utils= "Fixing paths of hard-coded utilities."
+
+SUBST_STAGE.conf= post-patch
+SUBST_FILES.conf= data/example-ircservices.conf data/example-modules.conf
+SUBST_SED.conf= -e "s|/usr/local|${PREFIX}|g" \
+ -e "s|ircservices.log|${VARBASE}/log/ircservices.log|g"\
+ -e "s|ircservices.pid|${VARBASE}/run/ircservices.pid|g"\
+ -e "s|/usr/lib/sendmail|/usr/sbin/sendmail|g"
+SUBST_MESSAGE.conf= "Fixing configuration files."
+
+CONF_FILES_PERMS= ${PREFIX}/share/examples/ircservices/ircservices.conf \
+ ${PREFIX}/lib/services/ircservices.conf \
+ ${BINOWN} ${BINGRP} 0640
+
+CONF_FILES_PERMS+= ${PREFIX}/share/examples/ircservices/modules.conf \
+ ${PREFIX}/lib/services/modules.conf \
+ ${BINOWN} ${BINGRP} 0640
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ircservices
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ircservices
+ ${INSTALL_MAN_DIR} ${PREFIX}/man/man8
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.html \
+ ${PREFIX}/share/doc/html/ircservices
+ ${INSTALL_MAN} ${WRKSRC}/docs/*.8 ${PREFIX}/man/man8
+ @${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/services/helpfiles
+ ${INSTALL_DATA} ${WRKSRC}/data/example-ircservices.conf \
+ ${PREFIX}/share/examples/ircservices/ircservices.conf
+ ${INSTALL_DATA} ${WRKSRC}/data/example-modules.conf \
+ ${PREFIX}/share/examples/ircservices/modules.conf
+
.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ircservices/PLIST b/chat/ircservices/PLIST
index f7b12ff1e74..4eb386f4237 100644
--- a/chat/ircservices/PLIST
+++ b/chat/ircservices/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/11 17:31:29 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/10/02 22:09:46 adrianp Exp $
lib/services/convert-db
-lib/services/example-ircservices.conf
-lib/services/example-modules.conf
lib/services/helpfiles/help
lib/services/languages/de
lib/services/languages/en_us
@@ -52,6 +50,7 @@ lib/services/modules/operserv/sline.so
lib/services/modules/protocol/bahamut.so
lib/services/modules/protocol/dalnet.so
lib/services/modules/protocol/dreamforge.so
+lib/services/modules/protocol/hybrid.so
lib/services/modules/protocol/monkey.so
lib/services/modules/protocol/ptlink.so
lib/services/modules/protocol/rfc1459.so
@@ -60,8 +59,43 @@ lib/services/modules/protocol/ts8.so
lib/services/modules/protocol/undernet-p9.so
lib/services/modules/protocol/unreal.so
lib/services/modules/statserv/main.so
+man/man8/convert-db.8
+man/man8/ircservices.8
sbin/ircservices
sbin/ircservices-chk
+share/examples/ircservices/modules.conf
+share/examples/ircservices/ircservices.conf
+share/doc/html/ircservices/0.html
+share/doc/html/ircservices/1.html
+share/doc/html/ircservices/2.html
+share/doc/html/ircservices/3.html
+share/doc/html/ircservices/4.html
+share/doc/html/ircservices/5.html
+share/doc/html/ircservices/6.html
+share/doc/html/ircservices/7.html
+share/doc/html/ircservices/COPYING.html
+share/doc/html/ircservices/a.html
+share/doc/html/ircservices/b.html
+share/doc/html/ircservices/c.html
+share/doc/html/ircservices/copyright.html
+share/doc/html/ircservices/faq.html
+share/doc/html/ircservices/index.html
+share/doc/html/ircservices/upgrade.html
+@dirrm share/doc/html/ircservices
+@dirrm share/examples/ircservices
+@dirrm lib/services/helpfiles/ircii/alias
+@dirrm lib/services/helpfiles/ircii/bind
+@dirrm lib/services/helpfiles/ircii/ctcp
+@dirrm lib/services/helpfiles/ircii/dcc
+@dirrm lib/services/helpfiles/ircii/ircii
+@dirrm lib/services/helpfiles/ircii/load
+@dirrm lib/services/helpfiles/ircii/note
+@dirrm lib/services/helpfiles/ircii/on
+@dirrm lib/services/helpfiles/ircii/set
+@dirrm lib/services/helpfiles/ircii/window
+@dirrm lib/services/helpfiles/ircii
+@dirrm lib/services/helpfiles
+@dirrm lib/services/languages
@dirrm lib/services/modules/statserv
@dirrm lib/services/modules/protocol
@dirrm lib/services/modules/operserv
@@ -74,6 +108,4 @@ sbin/ircservices-chk
@dirrm lib/services/modules/database
@dirrm lib/services/modules/chanserv
@dirrm lib/services/modules
-@dirrm lib/services/languages
-@dirrm lib/services/helpfiles
@dirrm lib/services
diff --git a/chat/ircservices/distinfo b/chat/ircservices/distinfo
index db32f539fa9..c42bbd44843 100644
--- a/chat/ircservices/distinfo
+++ b/chat/ircservices/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/06/10 01:55:21 jmc Exp $
+$NetBSD: distinfo,v 1.3 2004/10/02 22:09:46 adrianp Exp $
-SHA1 (ircservices-5.0.16.tar.gz) = 57089f64155e110412b8e1fd0ccf0e317024605c
-Size (ircservices-5.0.16.tar.gz) = 1019798 bytes
-SHA1 (patch-aa) = bb9ca91db11857847bf424e11eafd5ca56c1a46a
+SHA1 (ircservices-5.0.40.tar.gz) = e40c9af831e3d21d99eaa5cd928e253ae0a89ce3
+Size (ircservices-5.0.40.tar.gz) = 1091780 bytes
+SHA1 (patch-aa) = cff60257c4f5ebdfd0af4984008d2677b293029b
+SHA1 (patch-ab) = a15821c44bd9738080436a3626ec62d96c37db63
+SHA1 (patch-ac) = d567871c9cbb05b329247155c55e26e265476b48
diff --git a/chat/ircservices/files/ircservices.sh b/chat/ircservices/files/ircservices.sh
new file mode 100644
index 00000000000..6e1b0d5e63b
--- /dev/null
+++ b/chat/ircservices/files/ircservices.sh
@@ -0,0 +1,22 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: ircservices.sh,v 1.1 2004/10/02 22:09:46 adrianp Exp $
+#
+# PROVIDE: ircservices
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+
+if [ -f /etc/rc.subr ]
+then
+ . /etc/rc.subr
+fi
+
+name="ircservices"
+rcvar=$name
+command="@PREFIX@/sbin/ircservices"
+required_files="@PREFIX@/lib/services/ircservices.conf"
+command_args=""
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/chat/ircservices/patches/patch-aa b/chat/ircservices/patches/patch-aa
index 11d32eb69ed..6d52b697782 100644
--- a/chat/ircservices/patches/patch-aa
+++ b/chat/ircservices/patches/patch-aa
@@ -1,63 +1,63 @@
-$NetBSD: patch-aa,v 1.1 2003/05/25 21:03:26 jmc Exp $
+$NetBSD: patch-aa,v 1.2 2004/10/02 22:09:46 adrianp Exp $
---- configure.orig Thu Apr 10 01:35:14 2003
-+++ configure Sun May 25 20:58:51 2003
-@@ -1012,10 +1012,10 @@
- cat >tmp/test-lib.c <<EOT
+--- configure.orig 2004-10-02 16:05:10.000000000 +0100
++++ configure 2004-10-02 16:11:19.000000000 +0100
+@@ -1310,10 +1310,10 @@
+ cat >$CONFTMP/test-lib.c <<EOT
int foo() {no_such_symbol();}
EOT
-- if run $CC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -o tmp/test ; then
-+ if run $CC -fPIC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -o tmp/test ; then
+- if run $CC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then
++ if run $CC -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then
CC_DYN_LIBS=""
log "dlopen() found (no libs)"
-- elif run $CC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -ldl -o tmp/test
-+ elif run $CC -fPIC $CC_FLAGS $CC_LIBS tmp/test-dlopen.c -ldl -o tmp/test
+- elif run $CC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -ldl -o $CONFTMP/test
++ elif run $CC -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-dlopen.c -ldl -o $CONFTMP/test
then
CC_DYN_LIBS=" -ldl"
log "dlopen() found (libdl)"
-@@ -1024,7 +1024,7 @@
+@@ -1322,7 +1322,7 @@
OK=
fi
if [ "$OK" ] ; then
-- if run $CC -rdynamic $CC_FLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dlopen.c -o tmp/test ; then
-+ if run $CC -rdynamic -fPIC $CC_FLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dlopen.c -o tmp/test ; then
+- if run $CC -rdynamic $CC_FLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then
++ if run $CC -rdynamic -fPIC $CC_FLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dlopen.c -o $CONFTMP/test ; then
log "-rdynamic works"
CC_DYN_LFLAGS=" -rdynamic"
else
-@@ -1038,7 +1038,7 @@
+@@ -1336,7 +1336,7 @@
else
CC_SHARED="$CC -shared"
fi
-- if run $CC_SHARED $CC_FLAGS $CC_LIBS tmp/test-lib.c -o tmp/test-lib.so ; then
-+ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS tmp/test-lib.c -o tmp/test-lib.so ; then
+- if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so ; then
++ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so ; then
log "-shared works"
else
log "no -shared, aborting dlfcn test"
-@@ -1076,8 +1076,8 @@
+@@ -1374,8 +1374,8 @@
return quux(bar)*2;
}
EOT
-- if run $CC_SHARED $CC_FLAGS $CC_LIBS tmp/test-dynamic.c -o tmp/test.so \
-- && run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test
-+ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS tmp/test-dynamic.c -o tmp/test.so \
-+ && run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test
+- if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-dynamic.c -o $CONFTMP/test.so \
+- && run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test
++ if run $CC_SHARED -fPIC $CC_FLAGS $CC_LIBS $CONFTMP/test-dynamic.c -o $CONFTMP/test.so \
++ && run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test
then
- a=`tmp/test 1`
- log "symbol resolution test: tmp/test 1 => $a"
-@@ -1106,7 +1106,7 @@
+ a=`$CONFTMP/test 1`
+ log "symbol resolution test: $CONFTMP/test 1 => $a"
+@@ -1404,7 +1404,7 @@
}
int quux(int x) {return x;}
EOT
-- if run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test
-+ if run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS tmp/test-dynamic2.c tmp/test.so -o tmp/test
+- if run $CC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test
++ if run $CC -fPIC $CC_FLAGS $CC_DYN_LFLAGS $CC_LIBS $CC_DYN_LIBS $CONFTMP/test-dynamic2.c $CONFTMP/test.so -o $CONFTMP/test
then
- a=`tmp/test`
- log "underscore test: tmp/test => $a"
-@@ -1130,6 +1130,7 @@
+ a=`$CONFTMP/test`
+ log "underscore test: $CONFTMP/test => $a"
+@@ -1428,6 +1428,7 @@
if [ "$OK" ] ; then
echo "yes."
STATIC_MODULES=0
-+ CC_FLAGS="-fPIC $CC_FLAGS"
++ CC_FLAGS="-fPIC $CC_FLAGS"
else
log "static modules selected"
echo "no."
diff --git a/chat/ircservices/patches/patch-ab b/chat/ircservices/patches/patch-ab
new file mode 100644
index 00000000000..1e99db886f2
--- /dev/null
+++ b/chat/ircservices/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/10/02 22:09:46 adrianp Exp $
+
+--- data/Makefile.orig 2004-10-02 20:44:29.000000000 +0100
++++ data/Makefile 2004-10-02 20:44:38.000000000 +0100
+@@ -12,8 +12,6 @@
+ all: # Nothing to do
+
+ install: all $(DATDEST)/helpfiles
+- $(INSTALL_DAT) example-ircservices.conf "$(DATDEST)/example-ircservices.conf"
+- $(INSTALL_DAT) example-modules.conf "$(DATDEST)/example-modules.conf"
+
+ $(DATDEST)/helpfiles:
+ $(CP_ALL) helpfiles "$(DATDEST)"
diff --git a/chat/ircservices/patches/patch-ac b/chat/ircservices/patches/patch-ac
new file mode 100644
index 00000000000..2c34eb94efa
--- /dev/null
+++ b/chat/ircservices/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2004/10/02 22:09:46 adrianp Exp $
+
+--- data/example-modules.conf.orig 2004-10-02 20:01:04.000000000 +0100
++++ data/example-modules.conf 2004-10-02 19:59:27.000000000 +0100
+@@ -366,7 +366,7 @@
+ # "Session limit exceeded". If this is commented out, nothing will
+ # be sent.
+
+- SessionLimitExceeded "The session limit for your host %s has been exceeded."
++ SessionLimitExceeded "The session limit for your host %s has been exceeded."
+
+ # SessionLimitDetailsLoc <message> [OPTIONAL]
+ # Same as above, but should be used to provide a website address
+@@ -379,7 +379,7 @@
+ # you supply an address/URL where people can get help regarding
+ # session limits.
+
+- #SessionLimitDetailsLoc "Please visit http://your.website.url/ for more information about session limits."
++ #SessionLimitDetailsLoc "Please visit http://your.website.url/ for more information about session limits."
+
+ # SessionLimitAutokill <max-kill-interval> <num-kills> <expiry> <reason> [OPTIONAL]
+ # With this option, Services will add an automatic autokill when