aboutsummaryrefslogtreecommitdiffstats
path: root/irc/charybdis
diff options
context:
space:
mode:
authorcrees <crees@FreeBSD.org>2013-12-29 23:46:13 +0800
committercrees <crees@FreeBSD.org>2013-12-29 23:46:13 +0800
commitb426718713599e9ce79dadf5246f683f947aae5b (patch)
treebb6bf1e587f12ca3332817bdb17d2c60f9834051 /irc/charybdis
parent70bd9953a7522088bd1c8a8ffca5b0d497189c8f (diff)
downloadfreebsd-ports-gnome-b426718713599e9ce79dadf5246f683f947aae5b.tar.gz
freebsd-ports-gnome-b426718713599e9ce79dadf5246f683f947aae5b.tar.zst
freebsd-ports-gnome-b426718713599e9ce79dadf5246f683f947aae5b.zip
Stage ports maintained by me in irc java mail
Cleanups in several places
Diffstat (limited to 'irc/charybdis')
-rw-r--r--irc/charybdis/Makefile34
-rw-r--r--irc/charybdis/files/charybdis.in2
-rw-r--r--irc/charybdis/pkg-plist8
3 files changed, 20 insertions, 24 deletions
diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile
index 212d3301a1ab..c8a5dcfeb78c 100644
--- a/irc/charybdis/Makefile
+++ b/irc/charybdis/Makefile
@@ -20,44 +20,38 @@ 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
+MASTER_SITES:= ${MASTER_SITES} \
+ ${MASTER_SITES:S,$,charybdis-stable-oper-guide/:pdf,}
-MAN8= ircd.8
PORTDOCS= charybdis-oper-guide.pdf
-USE_LDCONFIG= yes
USE_AUTOTOOLS= autoconf
-USES= pathfix
+USES= pathfix
USE_RC_SUBR= ${PORTNAME}
GNU_CONFIGURE= yes
-USERS= ircd
-GROUPS= ircd
+USERS= ircd
+GROUPS= ircd
CONFIGURE_ARGS= --with-confdir=${ETCDIR} \
--with-helpdir=${DATADIR}/help \
--with-logdir=/var/log/${PORTNAME} \
--with-moduledir=${DATADIR}/modules \
--enable-kqueue
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
-. for d in ${PORTDOCS}
-DOCSDIST+= $d:pdf
-. endfor
+DOCSDIST+= ${PORTDOCS}:pdf
.endif
-pre-su-install:
- @${MKDIR} ${DATADIR}
+pre-install:
+ @${MKDIR} ${STAGEDIR}${DATADIR}
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${INSTALL_DATA} ${DISTDIR}/charybdis-oper-guide.pdf \
+ ${STAGEDIR}${DOCSDIR}
.endif
- @${MKDIR} ${ETCDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${ETCDIR}/ircd.motd.sample
- @[ -f ${ETCDIR}/ircd.motd ] || ${CP} -p ${ETCDIR}/ircd.motd.sample \
- ${ETCDIR}/ircd.motd
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+ @${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd \
+ ${STAGEDIR}${ETCDIR}/ircd.motd.sample
.include <bsd.port.mk>
diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in
index 80536e765c68..63fcb6c3bf50 100644
--- a/irc/charybdis/files/charybdis.in
+++ b/irc/charybdis/files/charybdis.in
@@ -1,5 +1,5 @@
#!/bin/sh
-
+#
# $FreeBSD$
#
# PROVIDE: charybdis
diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist
index a4318a7719e1..3c3f08476a4c 100644
--- a/irc/charybdis/pkg-plist
+++ b/irc/charybdis/pkg-plist
@@ -12,10 +12,11 @@ etc/charybdis/example.conf
@unexec cmp -s %D/etc/charybdis/ircd.motd.sample %D/etc/charybdis/ircd.motd && rm -f %D/etc/charybdis/ircd.motd || true
etc/charybdis/ircd.motd.sample
@exec [ -f %D/ircd.motd ] || cp -p %D/%F %B/ircd.motd
-etc/charybdis/reference.conf
+%%ETCDIR%%/reference.conf
lib/libratbox.la
lib/libratbox.so
libdata/pkgconfig/libratbox.pc
+man/man8/ircd.8.gz
%%DATADIR%%/help/opers/accept
%%DATADIR%%/help/opers/admin
%%DATADIR%%/help/opers/away
@@ -279,10 +280,11 @@ libdata/pkgconfig/libratbox.pc
%%DATADIR%%/modules/m_squit.so
@dirrm %%DATADIR%%/modules/extensions
@dirrm %%DATADIR%%/modules/autoload
-@dirrm %%DATADIR%%/modules-old
@dirrm %%DATADIR%%/modules
@dirrm %%DATADIR%%/help/users
@dirrm %%DATADIR%%/help/opers
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%
-@dirrm etc/charybdis
+@dirrm %%ETCDIR%%
+@unexec rmdir >/dev/null 2>&1 /var/log/charybdis || :
+@unexec rmdir >/dev/null 2>&1 /var/db/charybdis || :