Date: Wed, 2 Jan 2013 15:27:48 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309821 - in head/irc/charybdis: . files Message-ID: <201301021527.r02FRm16013068@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Wed Jan 2 15:27:48 2013 New Revision: 309821 URL: http://svnweb.freebsd.org/changeset/ports/309821 Log: Modify default directory for ban.db; charybdis now works "out of the box", without breaking installs already configured. Fix installation of libratbox.pc Added: head/irc/charybdis/files/patch-configure-ac (contents, props changed) Modified: head/irc/charybdis/Makefile head/irc/charybdis/files/charybdis.in head/irc/charybdis/pkg-plist Modified: head/irc/charybdis/Makefile ============================================================================== --- head/irc/charybdis/Makefile Wed Jan 2 15:21:58 2013 (r309820) +++ head/irc/charybdis/Makefile Wed Jan 2 15:27:48 2013 (r309821) @@ -2,10 +2,11 @@ PORTNAME= charybdis PORTVERSION= 3.4.2 +PORTREVISION= 1 CATEGORIES= irc net MASTER_SITES= http://www.stack.nl/~jilles/irc/ \ http://www.bayofrum.net/dist/${PORTNAME}/ -DISTFILES= ${DISTNAME}.tbz2 +DISTFILES= ${DISTNAME}.tbz2 ${DOCSDIST} EXTRACT_ONLY= ${DISTFILES:M*tbz2} MAINTAINER= crees@FreeBSD.org @@ -19,36 +20,34 @@ CONFLICTS= ircd-ratbox-[0-9]* ircd-ratbo expect-[0-9]* whois-[0-9]* undernet-ircu-[0-9]* \ ru-ircd-hybrid-[0-9]* \ +.for s in ${MASTER_SITES} +MASTER_SITES+= $scharybdis-stable-oper-guide/:pdf +.endfor + MAN8= ircd.8 -PORTDOCS= * +PORTDOCS= charybdis-oper-guide.pdf USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf +USE_GNOME= gnomehack USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes +USERS= ircd +GROUPS= ircd CONFIGURE_ARGS= --with-confdir=${ETCDIR} \ --with-helpdir=${DATADIR}/help \ --with-logdir=/var/log/${PORTNAME} \ --with-moduledir=${DATADIR}/modules \ --enable-kqueue -USERS= ircd -GROUPS= ircd - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} -DISTFILES+= charybdis-oper-guide.pdf:pdf -MASTER_SITES+= http://www.stack.nl/~jilles/irc/charybdis-stable-oper-guide/:pdf +. for d in ${PORTDOCS} +DOCSDIST+= $d:pdf +. endfor .endif -post-patch: - @${REINPLACE_CMD} -e \ - 's#(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#' \ - ${WRKSRC}/libratbox/Makefile.in -# Fix BANDB path madness - @${REINPLACE_CMD} -e 's#bandb_dpath != NULL#0#' \ - ${WRKSRC}/bandb/rsdb_sqlite3.c - pre-su-install: @${MKDIR} ${DATADIR} .if ${PORT_OPTIONS:MDOCS} Modified: head/irc/charybdis/files/charybdis.in ============================================================================== --- head/irc/charybdis/files/charybdis.in Wed Jan 2 15:21:58 2013 (r309820) +++ head/irc/charybdis/files/charybdis.in Wed Jan 2 15:27:48 2013 (r309821) @@ -30,7 +30,7 @@ start_precmd=${name}_prestart charybdis_prestart() { - install -d -o ircd -m755 /var/run/${name} /var/log/${name} + install -d -o ircd -m755 /var/run/${name} /var/log/${name} /var/db/${name} chown -R ircd %%ETCDIR%% } Added: head/irc/charybdis/files/patch-configure-ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/charybdis/files/patch-configure-ac Wed Jan 2 15:27:48 2013 (r309821) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2013-01-02 14:54:13.907049431 +0000 ++++ configure.ac 2013-01-02 15:00:16.779052086 +0000 +@@ -247,7 +247,7 @@ + rundir='${sysconfdir}' + pkgrundir='${rundir}' + localstatedir='${prefix}' +- pkglocalstatedir='${sysconfdir}']) ++ pkglocalstatedir='/var/db/${PACKAGE_TARNAME}']) + pkglibdir='${libdir}/${PACKAGE_TARNAME}' + AC_SUBST([pkglibdir]) + AC_SUBST([rundir]) Modified: head/irc/charybdis/pkg-plist ============================================================================== --- head/irc/charybdis/pkg-plist Wed Jan 2 15:21:58 2013 (r309820) +++ head/irc/charybdis/pkg-plist Wed Jan 2 15:27:48 2013 (r309821) @@ -15,6 +15,7 @@ etc/charybdis/ircd.motd.sample etc/charybdis/reference.conf lib/libratbox.la lib/libratbox.so +libdata/pkgconfig/libratbox.pc %%DATADIR%%/help/opers/accept %%DATADIR%%/help/opers/admin %%DATADIR%%/help/opers/away
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301021527.r02FRm16013068>