- Fix PID file for system-wide daemon mode

- Fix package: Create /var/run/fetchmail in pkg-install instead of
  post-install target.
- Bump PORTREVISION

PR:		ports/97283
Submitted by:	Martin Jackson <mhjacks@swbell.net>

mail/fetchmail/Makefile

@@ -11,6 +11,7 @@
 
 PORTNAME=	fetchmail
 PORTVERSION=	6.3.4
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://download.berlios.de/%SUBDIR%/ \
 		http://home.pages.de/~mandree/%SUBDIR%/ \
@@ -111,10 +112,11 @@ post-install:
 
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/libexec
-	${INSTALL} -d -m 755 -o fetchmail -g fetchmail /var/run/fetchmail
+
 	${INSTALL} -m 644 -o fetchmail -g fetchmail ${FILESDIR}/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc.sample
 	if [ ! -f ${PREFIX}/etc/fetchmailrc ]; then \
-	        ${CP} -p ${PREFIX}/etc/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc ; \
+		cp -p ${PREFIX}/etc/fetchmailrc.sample ${PREFIX}/etc/fetchmailrc ; \
 	fi
 
+
 .include <bsd.port.post.mk>

mail/fetchmail/files/fetchmail.in

@@ -52,7 +52,7 @@ name=fetchmail
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/fetchmail/${name}.pid
 extra_commands="awaken"
 awaken_cmd="fetchmail_awaken"
 

mail/fetchmail/pkg-install

@@ -42,3 +42,5 @@ if [ x"$2" = xPRE-INSTALL ]; then
 		fi
 	fi
 fi
+
+/usr/bin/install -d -m 755 -o fetchmail -g fetchmail /var/run/fetchmail