- remove option broken by r385280

- remove @dirrm
- use USERS
- rename MAN macros

2 files changed, 7 insertions, 34 deletions

diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index 4b55eb27e9cc..d19c5f24e698 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -9,16 +9,14 @@ MASTER_SITES=	SUNSITE/system/fido
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	FidoNet(tm) support package for UN*X platform
 
-MAN3=		parsedate.3
-MAN8=		ifmail.8 iftoss.8
-IFMAIL_RUNAS?=	ifmail
-PLIST_SUB+=	IFMAIL_RUNAS="${IFMAIL_RUNAS}"
-# USERS does not work here
-#USERS=		ifmail
+USERS=		ifmail
 CFLAGS+=	-DHAS_STDARG_H -Wall
 GID!=		id -g
 MAKE_ARGS=	OWNER=${UID} CC="${CC}" GROUP=${GID} CFLAGS="${CFLAGS}"
 
+LMAN3=		parsedate.3
+LMAN8=		ifmail.8 iftoss.8
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
@@ -27,10 +25,11 @@ pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ifmail
 
 post-install:
-.for i in ${MAN8}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/ifmail/*
+.for i in ${LMAN8}
 	${INSTALL_MAN} ${WRKSRC}/ifgate/${i} ${STAGEDIR}${PREFIX}/man/man8/
 .endfor
-.for i in ${MAN3}
+.for i in ${LMAN3}
 	${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${STAGEDIR}${PREFIX}/man/man3/
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/news/ifmail/pkg-plist b/news/ifmail/pkg-plist
index 23c4d894f5a7..84ef8906371a 100644
--- a/news/ifmail/pkg-plist
+++ b/news/ifmail/pkg-plist
@@ -1,8 +1,6 @@
 man/man3/parsedate.3.gz
 man/man8/ifmail.8.gz
 man/man8/iftoss.8.gz
-@exec if ! pw usershow %%IFMAIL_RUNAS%% 2>/dev/null; then pw useradd %%IFMAIL_RUNAS%% -g uucp -u 75 -h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi
-@unexec if pw usershow %%IFMAIL_RUNAS%% | grep -q 75:66; then pw userdel %%IFMAIL_RUNAS%%; fi
 @owner ifmail
 @group uucp
 libexec/ifmail/ifcico
@@ -17,12 +15,10 @@ libexec/ifmail/ifunpack
 libexec/ifmail/nlpatch
 @owner
 @group
-@dirrm libexec/ifmail
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.ifcico
 %%PORTDOCS%%%%DOCSDIR%%/README.ifgate
 %%PORTDOCS%%%%DOCSDIR%%/README.iflib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Areas
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DEBUG
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FAQ
@@ -158,27 +154,5 @@ libexec/ifmail/nlpatch
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/routes
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/scheduler.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/sm.conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cnews
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/abbs2nf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/areafix-0.5.07
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/areafix-0.5.07-jv10
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/areafix-0.6.02
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/mmdf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/tic/config
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/tic
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/u-tic
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/news_via_mail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/fdpass
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/iftelnetd
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/exim
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inn
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inouttabs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sendmail/ifmail.m4-srtxg
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sendmail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/smail
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcp
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/zmailer
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ; echo "ifcico		60179/tcp  #ifcico server (ifmail)") > /etc/services
 @unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ) > /etc/services