aboutsummaryrefslogtreecommitdiff
path: root/irc
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2013-01-02 15:27:48 +0000
committerChris Rees <crees@FreeBSD.org>2013-01-02 15:27:48 +0000
commit9ddb119916a2992e84c2db5b3d9de6bca21d3d8e (patch)
tree26d8105a6f20b6b23e5fc432d04d888c0cb034d8 /irc
parent07b041985652b4e5ea3aca5025212e5553330b2a (diff)
downloadports-9ddb119916a2992e84c2db5b3d9de6bca21d3d8e.tar.gz
ports-9ddb119916a2992e84c2db5b3d9de6bca21d3d8e.zip
Notes
Diffstat (limited to 'irc')
-rw-r--r--irc/charybdis/Makefile29
-rw-r--r--irc/charybdis/files/charybdis.in2
-rw-r--r--irc/charybdis/files/patch-configure-ac11
-rw-r--r--irc/charybdis/pkg-plist1
4 files changed, 27 insertions, 16 deletions
diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile
index a1fe74aed1b5..b2925ff26873 100644
--- a/irc/charybdis/Makefile
+++ b/irc/charybdis/Makefile
@@ -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-ratbox-devel-[0-9]* \
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}
diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in
index 4876c4d6467a..80536e765c68 100644
--- a/irc/charybdis/files/charybdis.in
+++ b/irc/charybdis/files/charybdis.in
@@ -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%%
}
diff --git a/irc/charybdis/files/patch-configure-ac b/irc/charybdis/files/patch-configure-ac
new file mode 100644
index 000000000000..61d9cc1788c1
--- /dev/null
+++ b/irc/charybdis/files/patch-configure-ac
@@ -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])
diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist
index 49f9fa1bbceb..a4318a7719e1 100644
--- a/irc/charybdis/pkg-plist
+++ b/irc/charybdis/pkg-plist
@@ -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