summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-11-22 20:04:49 +0000
committertijl <tijl@FreeBSD.org>2014-11-22 20:04:49 +0000
commit2e3b3317eea573bab4efca900c8197753b5a50f5 (patch)
tree70704e6b2177e9667725dbf274dd6d49afe562d6
parentbb04a17560b290cb1e4fa8b3c21a0a2cc02f7d6d (diff)
downloadFreeBSD-ports-2e3b3317eea573bab4efca900c8197753b5a50f5.zip
FreeBSD-ports-2e3b3317eea573bab4efca900c8197753b5a50f5.tar.gz
Create a subdirectory of /var/run that is writeable by the bopm user and
put the pidfile there. Tested by: Michael D <me@md-5.net>
-rw-r--r--irc/bopm/Makefile15
-rw-r--r--irc/bopm/files/bopm.in2
-rw-r--r--irc/bopm/pkg-plist3
3 files changed, 10 insertions, 10 deletions
diff --git a/irc/bopm/Makefile b/irc/bopm/Makefile
index 42ebf09..f358d94 100644
--- a/irc/bopm/Makefile
+++ b/irc/bopm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bopm
PORTVERSION= 3.1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= irc
MASTER_SITES= http://static.blitzed.org/www.blitzed.org/bopm/files/ \
ftp://rusunix.org/pub/FreeBSD/distfiles/
@@ -11,17 +11,13 @@ MASTER_SITES= http://static.blitzed.org/www.blitzed.org/bopm/files/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Open proxy and DNSBL monitor designed for use with ircds
-LOGDIR= /var/log/${PORTNAME}
-
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --localstatedir=${LOGDIR}
+CONFIGURE_ARGS= --localstatedir=/var/log/bopm
INSTALL_TARGET= install-strip
USES= libtool
USE_LDCONFIG= yes
USE_RC_SUBR= bopm
-PLIST_SUB= LOGDIR=${LOGDIR}
-
USERS= bopm
GROUPS= bopm
@@ -29,8 +25,11 @@ MAKE_JOBS_UNSAFE= yes
post-patch:
@${REINPLACE_CMD} \
- -e 's,/some/path/bopm.pid,/var/run/bopm.pid,g' \
- -e 's,/some/path/scan.log,${LOGDIR}/scan.log,g' \
+ -e 's,/some/path/bopm.pid,/var/run/bopm/bopm.pid,g' \
+ -e 's,/some/path/scan.log,/var/log/bopm/scan.log,g' \
${WRKSRC}/bopm.conf.sample
+post-stage:
+ @${MKDIR} ${STAGEDIR}/var/run/bopm
+
.include <bsd.port.mk>
diff --git a/irc/bopm/files/bopm.in b/irc/bopm/files/bopm.in
index 30388ed..682b091 100644
--- a/irc/bopm/files/bopm.in
+++ b/irc/bopm/files/bopm.in
@@ -24,7 +24,7 @@ load_rc_config $name
: ${bopm_config="%%PREFIX%%/etc/bopm.conf"}
bopm_user="bopm"
-pidfile="/var/run/bopm.pid"
+pidfile="/var/run/bopm/bopm.pid"
required_files="${bopm_config}"
# NOTE: bopm behaves differently with or without the -d flag.
diff --git a/irc/bopm/pkg-plist b/irc/bopm/pkg-plist
index 7372226..cd278c6 100644
--- a/irc/bopm/pkg-plist
+++ b/irc/bopm/pkg-plist
@@ -9,4 +9,5 @@ lib/libopm.a
lib/libopm.so
lib/libopm.so.0
lib/libopm.so.0.0.0
-@dir(bopm,bopm,750) %%LOGDIR%%
+@dir(bopm,bopm,750) /var/log/bopm
+@dir(bopm,bopm,750) /var/run/bopm
OpenPOWER on IntegriCloud