pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/unrealircd pkglintification



details:   https://anonhg.NetBSD.org/pkgsrc/rev/696f1aad5d40
branches:  trunk
changeset: 509263:696f1aad5d40
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Tue Mar 07 17:23:51 2006 +0000

description:
pkglintification
Add rehash option to rc.d script
Remove dud mirror site
Sort PLIST
Bump pkgrevision

diffstat:

 chat/unrealircd/Makefile            |  89 +++++++++++++++++++-----------------
 chat/unrealircd/PLIST               |  10 ++--
 chat/unrealircd/distinfo            |   8 +-
 chat/unrealircd/files/unrealircd.sh |  10 +++-
 chat/unrealircd/options.mk          |   8 +-
 5 files changed, 68 insertions(+), 57 deletions(-)

diffs (263 lines):

diff -r 6ef214312bf0 -r 696f1aad5d40 chat/unrealircd/Makefile
--- a/chat/unrealircd/Makefile  Tue Mar 07 15:21:33 2006 +0000
+++ b/chat/unrealircd/Makefile  Tue Mar 07 17:23:51 2006 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2006/02/16 21:30:06 adrianp Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/07 17:23:51 adrianp Exp $
 
 DISTNAME=      Unreal3.2.4
 PKGNAME=       unrealircd-3.2.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat
-MASTER_SITES=  http://unrealircd.atlanti-ka.org/ \
+MASTER_SITES=  http://unreal.fire-com.net/ \
                http://www.ilmarinen.us/unreal/ \
                http://www1.dnwt.net/unreal/
 
 MAINTAINER=    adrianp%NetBSD.org@localhost
-HOMEPAGE=      http://www.unrealircd.com/
+HOMEPAGE=      http://www.unrealircd.com/
 COMMENT=       Advanced IRC server with IPv6 and SSL support
 
 CONFLICTS+=    ircu-[0-9]*
@@ -21,19 +21,19 @@
 TRE_NEEDED=    0.7.2
 CARES_NEEDED=  1.3.0
 
-BUILDLINK_DEPENDS.tre+=        tre-${TRE_NEEDED}
-BUILDLINK_DEPENDS.libcares+= libcares-${CARES_NEEDED}
+BUILDLINK_DEPENDS.tre+=                tre-${TRE_NEEDED}
+BUILDLINK_DEPENDS.libcares+=   libcares-${CARES_NEEDED}
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ENV+=        tre_version=${TRE_NEEDED:Q}
-CONFIGURE_ENV+=        TRELIBS="-L${PREFIX}/lib -ltre"
-CONFIGURE_ENV+= cares_version=${CARES_NEEDED:Q}
-CONFIGURE_ENV+= CARESINCDIR="${PREFIX}/include"
-CONFIGURE_ENV+= CARESLIBS="-L${PREFIX}/lib -lcares"
+CONFIGURE_ENV+=                tre_version=${TRE_NEEDED:Q}
+CONFIGURE_ENV+=                TRELIBS='-L${PREFIX:Q}/lib -ltre'
+CONFIGURE_ENV+=                cares_version=${CARES_NEEDED:Q}
+CONFIGURE_ENV+=                CARESINCDIR='${PREFIX:Q}/include'
+CONFIGURE_ENV+=                CARESLIBS='-L${PREFIX:Q}/lib -lcares'
 
 CONFIGURE_ARGS+=       --with-dpath=${UIRCD_HOME:Q}
-CONFIGURE_ARGS+=       --with-spath=${PREFIX}/sbin/ircd
+CONFIGURE_ARGS+=       --with-spath=${PREFIX:Q}/sbin/ircd
 CONFIGURE_ARGS+=       --with-permissions=0660
 CONFIGURE_ARGS+=       --enable-dynamic-linking
 
@@ -47,9 +47,9 @@
 
 .include "options.mk"
 
-IRCD_DOCS=     ${PREFIX}/share/doc/unrealircd
-IRCD_SHARE=    ${PREFIX}/share/unrealircd
-IRCD_EG=       ${PREFIX}/share/examples/unrealircd
+IRCD_DOCS=     ${PREFIX:Q}/share/doc/unrealircd
+IRCD_SHARE=    ${PREFIX:Q}/share/unrealircd
+IRCD_EG=       ${PREFIX:Q}/share/examples/unrealircd
 
 BUILD_DEFS+=   UIRCD_SENDQ UIRCD_LISTEN UIRCD_BUFFER UIRCD_USER UIRCD_HOST
 BUILD_DEFS+=   UIRCD_HOME UIRCD_NICKHIST UIRCD_FDSIZE UIRCD_GROUP
@@ -69,13 +69,14 @@
 UIRCD_HOST?=           localhost
 UIRCD_HOME?=           ${VARBASE}/unrealircd
 
-DOC_FILES=     doc/Authors doc/coding-guidelines doc/tao.of.irc LICENSE
+DOC_FILES=             doc/Authors doc/coding-guidelines doc/tao.of.irc LICENSE
 
-CONF_FILES_PERMS=      ${IRCD_EG}/example.conf ${UIRCD_HOME}/unrealircd.conf \
+CONF_FILES_PERMS=      ${IRCD_EG:Q}/example.conf \
+                       ${UIRCD_HOME:Q}/unrealircd.conf \
                        ${UIRCD_USER} ${UIRCD_GROUP} 0660
 
-PKG_USERS=     ${UIRCD_USER}:${UIRCD_GROUP}::UnrealIRCD\ user:${UIRCD_HOME}:${NOLOGIN}
-PKG_GROUPS=    ${UIRCD_GROUP}
+PKG_USERS=     ${UIRCD_USER:Q}:${UIRCD_GROUP:Q}::UnrealIRCD\ user:${UIRCD_HOME:Q}:${NOLOGIN:Q}
+PKG_GROUPS=    ${UIRCD_GROUP:Q}
 RCD_SCRIPTS=   unrealircd
 
 MESSAGE_SRC+=  ${WRKDIR}/.MESSAGE_SRC
@@ -91,8 +92,9 @@
                        -e "s|include \"|include \"${IRCD_SHARE}/|g"
 SUBST_MESSAGE.homedir= Fixing home directory of the IRC server.
 
-OWN_DIRS_PERMS+=       ${UIRCD_HOME} ${UIRCD_USER} ${UIRCD_GROUP} 0770
-OWN_DIRS_PERMS+=       ${UIRCD_HOME}/tmp ${UIRCD_USER} ${UIRCD_GROUP} 0770
+OWN_DIRS_PERMS+=       ${UIRCD_HOME:Q} ${UIRCD_USER:Q} ${UIRCD_GROUP:Q} 0770
+OWN_DIRS_PERMS+=       ${UIRCD_HOME:Q}/tmp ${UIRCD_USER:Q} \
+                       ${UIRCD_GROUP:Q} 0770
 
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=YES
@@ -103,34 +105,35 @@
 .include "../../devel/tre/buildlink3.mk"
 
 post-build:
-       @${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC
+       @${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC
 .if !empty(PKG_OPTIONS:Minet6)
-       @${CP} ${PKGDIR}/MESSAGE.inet6 ${WRKDIR}/.MESSAGE_SRC.inet6
+       @${CP} ${PKGDIR:Q}/MESSAGE.inet6 ${WRKDIR:Q}/.MESSAGE_SRC.inet6
 .endif
 
 do-install:
        ${INSTALL_DATA_DIR} ${IRCD_SHARE}
-       ${INSTALL_DATA_DIR} ${IRCD_SHARE}/networks
-       ${INSTALL_DATA_DIR} ${IRCD_SHARE}/aliases
-       ${INSTALL_DATA_DIR} ${IRCD_SHARE}/modules
-       ${INSTALL_DATA_DIR} ${IRCD_DOCS}
-       ${INSTALL_DATA_DIR} ${IRCD_EG}
+       ${INSTALL_DATA_DIR} ${IRCD_SHARE:Q}/networks
+       ${INSTALL_DATA_DIR} ${IRCD_SHARE:Q}/aliases
+       ${INSTALL_DATA_DIR} ${IRCD_SHARE:Q}/modules
+       ${INSTALL_DATA_DIR} ${IRCD_DOCS:Q}
+       ${INSTALL_DATA_DIR} ${IRCD_EG:Q}
 
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${PREFIX}/sbin
-       ${INSTALL_DATA} ${WRKSRC}/networks/*.network ${IRCD_SHARE}/networks
-       ${INSTALL_DATA} ${WRKSRC}/networks/networks.ndx ${IRCD_SHARE}/networks
-       ${INSTALL_SCRIPT} ${WRKSRC}/networks/makenet ${IRCD_SHARE}/networks
-       ${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${IRCD_SHARE}/aliases
-       ${INSTALL_DATA} ${WRKSRC}/badwords*.conf ${IRCD_SHARE}
-       ${INSTALL_DATA} ${WRKSRC}/help.* ${IRCD_SHARE}
-       ${INSTALL_DATA} ${WRKSRC}/doc/help.* ${IRCD_SHARE}
-       ${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${IRCD_SHARE}
-       ${INSTALL_DATA} ${WRKSRC}/src/modules/*.so ${IRCD_SHARE}/modules
-       ${INSTALL_DATA} ${WRKSRC}/doc/unreal32docs.* ${IRCD_DOCS};
-       ${INSTALL_DATA} ${WRKSRC}/doc/example.* ${IRCD_EG}
+       ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ircd ${PREFIX:Q}/sbin
+       ${INSTALL_DATA} ${WRKSRC:Q}/networks/*.network ${IRCD_SHARE:Q}/networks
+       ${INSTALL_DATA} ${WRKSRC:Q}/networks/networks.ndx \
+               ${IRCD_SHARE:Q}/networks
+       ${INSTALL_SCRIPT} ${WRKSRC:Q}/networks/makenet ${IRCD_SHARE:Q}/networks
+       ${INSTALL_DATA} ${WRKSRC:Q}/aliases/*.conf ${IRCD_SHARE:Q}/aliases
+       ${INSTALL_DATA} ${WRKSRC:Q}/badwords*.conf ${IRCD_SHARE:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/help.* ${IRCD_SHARE:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/doc/help.* ${IRCD_SHARE:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/spamfilter.conf ${IRCD_SHARE:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/src/modules/*.so ${IRCD_SHARE:Q}/modules
+       ${INSTALL_DATA} ${WRKSRC:Q}/doc/unreal32docs.* ${IRCD_DOCS:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/doc/example.* ${IRCD_EG:Q}
 
-       for f in ${DOC_FILES}; do \
-               ${INSTALL_DATA} ${WRKSRC}/$$f ${IRCD_DOCS}; \
-       done
+.      for f in ${DOC_FILES}
+               ${INSTALL_DATA} ${WRKSRC:Q}/${f:Q} ${IRCD_DOCS:Q}
+.      endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6ef214312bf0 -r 696f1aad5d40 chat/unrealircd/PLIST
--- a/chat/unrealircd/PLIST     Tue Mar 07 15:21:33 2006 +0000
+++ b/chat/unrealircd/PLIST     Tue Mar 07 17:23:51 2006 +0000
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/16 21:30:06 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/07 17:23:51 adrianp Exp $
 sbin/ircd
 share/doc/unrealircd/Authors
 share/doc/unrealircd/LICENSE
 share/doc/unrealircd/coding-guidelines
 share/doc/unrealircd/tao.of.irc
-share/doc/unrealircd/unreal32docs.html
 share/doc/unrealircd/unreal32docs.de.html
 share/doc/unrealircd/unreal32docs.es.html
 share/doc/unrealircd/unreal32docs.fr.html
 share/doc/unrealircd/unreal32docs.gr.html
+share/doc/unrealircd/unreal32docs.html
 share/doc/unrealircd/unreal32docs.hu.html
 share/doc/unrealircd/unreal32docs.nl.html
 share/doc/unrealircd/unreal32docs.ru.html
 share/examples/rc.d/unrealircd
+share/examples/unrealircd/example.bg.conf
 share/examples/unrealircd/example.conf
-share/examples/unrealircd/example.bg.conf
 share/examples/unrealircd/example.de.conf
 share/examples/unrealircd/example.fr.conf
 share/examples/unrealircd/example.hu.conf
@@ -123,11 +123,11 @@
 share/unrealircd/modules/m_umode2.so
 share/unrealircd/modules/m_undccdeny.so
 share/unrealircd/modules/m_unkline.so
-share/unrealircd/modules/m_user.so
-share/unrealircd/modules/m_userip.so
 share/unrealircd/modules/m_unsqline.so
 share/unrealircd/modules/m_unzline.so
+share/unrealircd/modules/m_user.so
 share/unrealircd/modules/m_userhost.so
+share/unrealircd/modules/m_userip.so
 share/unrealircd/modules/m_vhost.so
 share/unrealircd/modules/m_wallops.so
 share/unrealircd/modules/m_watch.so
diff -r 6ef214312bf0 -r 696f1aad5d40 chat/unrealircd/distinfo
--- a/chat/unrealircd/distinfo  Tue Mar 07 15:21:33 2006 +0000
+++ b/chat/unrealircd/distinfo  Tue Mar 07 17:23:51 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/02/16 21:30:06 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2006/03/07 17:23:51 adrianp Exp $
 
-SHA1 (unrealircd-3.2.4nb2/Unreal3.2.4.tar.gz) = 79232726ec3e6e56445ede399c343263cc0858f8
-RMD160 (unrealircd-3.2.4nb2/Unreal3.2.4.tar.gz) = 4663fdf389caf5f461399b6ff4281ad022fa0aee
-Size (unrealircd-3.2.4nb2/Unreal3.2.4.tar.gz) = 2503560 bytes
+SHA1 (unrealircd-3.2.4nb3/Unreal3.2.4.tar.gz) = 79232726ec3e6e56445ede399c343263cc0858f8
+RMD160 (unrealircd-3.2.4nb3/Unreal3.2.4.tar.gz) = 4663fdf389caf5f461399b6ff4281ad022fa0aee
+Size (unrealircd-3.2.4nb3/Unreal3.2.4.tar.gz) = 2503560 bytes
 SHA1 (patch-aa) = 762764ac4b520f3e4497f1ded834dc08bb2868e2
 SHA1 (patch-ab) = b66ae1990e25479abe9087a9308a2185692fcba2
 SHA1 (patch-ac) = 4c3e7219d03e93c2a3e8f735c350d919efdf8fbb
diff -r 6ef214312bf0 -r 696f1aad5d40 chat/unrealircd/files/unrealircd.sh
--- a/chat/unrealircd/files/unrealircd.sh       Tue Mar 07 15:21:33 2006 +0000
+++ b/chat/unrealircd/files/unrealircd.sh       Tue Mar 07 17:23:51 2006 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: unrealircd.sh,v 1.1.1.1 2005/11/29 19:17:03 adrianp Exp $
+# $NetBSD: unrealircd.sh,v 1.2 2006/03/07 17:23:51 adrianp Exp $
 #
 # PROVIDE: unrealircd
 # REQUIRE: DAEMON
@@ -16,8 +16,16 @@
 rcvar=${name}
 command="@PREFIX@/sbin/ircd"
 required_files="@UIRCD_HOME@/unrealircd.conf"
+pidfile="@UIRCD_HOME@/ircd.pid"
 unrealircd_user="@UIRCD_USER@"
 unrealircd_group="@UIRCD_GROUP@"
+extra_commands="rehash"
+rehash_cmd="unrealircd_rehash"
+
+unrealircd_rehash()
+{
+       kill -1 `@CAT@ $pidfile`
+}
 
 load_rc_config $name
 run_rc_command "$1"
diff -r 6ef214312bf0 -r 696f1aad5d40 chat/unrealircd/options.mk
--- a/chat/unrealircd/options.mk        Tue Mar 07 15:21:33 2006 +0000
+++ b/chat/unrealircd/options.mk        Tue Mar 07 17:23:51 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:03 rillig Exp $
+# $NetBSD: options.mk,v 1.8 2006/03/07 17:23:51 adrianp Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.unrealircd
 
-PKG_OPTIONS_REQUIRED_GROUPS= role
-PKG_OPTIONS_GROUP.role= unrealircd-leaf unrealircd-hub
+PKG_OPTIONS_REQUIRED_GROUPS=   role
+PKG_OPTIONS_GROUP.role=                unrealircd-leaf unrealircd-hub
 
 PKG_SUPPORTED_OPTIONS= inet6 unrealircd-nospoof unrealircd-leaf
 PKG_SUPPORTED_OPTIONS+=        unrealircd-ziplinks unrealircd-remoteinc ssl
@@ -22,7 +22,7 @@
 CONFIGURE_ARGS+=       --enable-inet6
 MESSAGE_SRC+=          ${WRKDIR}/.MESSAGE_SRC.inet6
 .else
-CONFIGURE_ENV+=        ac_cv_ip6=no
+CONFIGURE_ENV+=                ac_cv_ip6=no
 .endif
 
 ###



Home | Main Index | Thread Index | Old Index