svn commit: r373099 - in head/irc/bopm: . files

[Tijl Coosemans]

Author: tijl
Date: Sat Nov 22 20:04:49 2014
New Revision: 373099
URL: https://svnweb.freebsd.org/changeset/ports/373099
QAT: https://qat.redports.org/buildarchive/r373099/

Log:
  Create a subdirectory of /var/run that is writeable by the bopm user and
  put the pidfile there.
  
  Tested by:	Michael D <me at md-5.net>

Modified:
  head/irc/bopm/Makefile
  head/irc/bopm/files/bopm.in
  head/irc/bopm/pkg-plist

Modified: head/irc/bopm/Makefile
==============================================================================
--- head/irc/bopm/Makefile	Sat Nov 22 19:48:51 2014	(r373098)
+++ head/irc/bopm/Makefile	Sat Nov 22 20:04:49 2014	(r373099)
@@ -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/
 MAINTAINER=	ports at 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>

Modified: head/irc/bopm/files/bopm.in
==============================================================================
--- head/irc/bopm/files/bopm.in	Sat Nov 22 19:48:51 2014	(r373098)
+++ head/irc/bopm/files/bopm.in	Sat Nov 22 20:04:49 2014	(r373099)
@@ -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.

Modified: head/irc/bopm/pkg-plist
==============================================================================
--- head/irc/bopm/pkg-plist	Sat Nov 22 19:48:51 2014	(r373098)
+++ head/irc/bopm/pkg-plist	Sat Nov 22 20:04:49 2014	(r373099)
@@ -9,4 +9,5 @@ lib/libopm.a
 lib/libopm.so
 lib/libopm.so.0
 lib/libopm.so.0.0.0
- at dir(bopm,bopm,750) %%LOGDIR%%
+ at dir(bopm,bopm,750) /var/log/bopm
+ at dir(bopm,bopm,750) /var/run/bopm