Switch to mailnull user as default

PR:             105329
Submitted by:   Victor Balada Diaz <victor@bsdes.net> (maintainer)

mail/milter-bogom/Makefile

@@ -5,13 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	milter-bogom
+PORTNAME=	bogom
 PORTVERSION=	1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.usebox.net/jjm/bogom/ \
 		http://blackshell.usebox.net/bogom/
-DISTNAME=	bogom-${PORTVERSION}
+PKGNAMEPREFIX=	milter-
 
 MAINTAINER=	victor@bsdes.net
 COMMENT=	Simple sendmail milter to interface bogofilter
@@ -51,7 +51,6 @@ do-install:
 .endif
 
 post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

mail/milter-bogom/files/milter-bogom.sh.in

@@ -17,7 +17,7 @@ load_rc_config $name
 
 milterbogom_enable=${milterbogom_enable-"NO"}
 milterbogom_socket=${milterbogom_socket-"unix:/var/run/bogom/milter.sock"}
-milterbogom_user=${milterbogom_user-"bogomilter"}
+milterbogom_user=${milterbogom_user-"mailnull"}
 milterbogom_pid=${milterbogom_pid-"/var/run/bogom/bogom.pid"}
 milterbogom_flags=${milterbogom_flags-"-u ${milterbogom_user} \
 -s ${milterbogom_socket} -p ${milterbogom_pid}"}
@@ -26,11 +26,10 @@ pidfile=${milterbogom_pid}
 
 bogom_precmd()
 {
-    if [ -d `dirname ${milterbogom_pid}` ]
+    if [ ! -d `dirname ${milterbogom_pid}` ]
     then
-	return;
+    	mkdir -p `dirname ${milterbogom_pid}`
     fi
-    mkdir -p `dirname ${milterbogom_pid}`
     chown ${milterbogom_user} `dirname ${milterbogom_pid}`
 }
 

mail/milter-bogom/pkg-deinstall

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-DEINSTALL" ] 
-then
-	echo "***************************************************************"
-	echo "* The bogomilter user will not be removed by this port        *"
-	echo "* if you are not upgrading and will not use this port anymore *"
-	echo "* delete the bogomilter user using:                           *"
-	echo "* pw userdel bogomilter                                       *"
-	echo "***************************************************************"
-fi

mail/milter-bogom/pkg-install

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]
-then
-	exit 0;
-fi
-
-# check if bogomilter user exists
-pw user show bogomilter > /dev/null 2>&1
-
-if [ $? != 0 ]
-then
-	echo "===>  Adding user bogomilter"
-	pw useradd bogomilter -u 174 -c "milter-bogom" -s /sbin/nologin \
-	-d /nonexistent
-else
-	echo "===>  Using existing user bogomilter" 
-fi