When there is a do-install target, do not use a post-install target, do

everything at once.  Sometime, rename post-install into a options helper
target.

I did not fix ports that were such a mess that I could not figure out
what they really wanted to do.  I also did not change ports that had
some version of an auto-plist code in post-install, for the same reason.

With hat:	portmgr
Sponsored by:	Absolight

9 files changed, 3 insertions, 16 deletions

diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index fc70ea45508a..921ed7062d44 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -25,8 +25,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/anacron.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/anacrontab.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${FILESDIR}/anacrontab.sample ${STAGEDIR}${PREFIX}/etc
-
-post-install:
 	[ -d ${STAGEDIR}/var/spool/anacron ] || ${MKDIR} ${STAGEDIR}/var/spool/anacron
 
 .include <bsd.port.mk>
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index e8075463e9af..1d150b2e1725 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -130,7 +130,6 @@ do-install:
 	${WRKSRC}/${SERVERDIR}/raidfile-config.8.gz \
 	${STAGEDIR}${PREFIX}/man/man8/
 .endif
-post-install:
 .if ${PORT_OPTIONS:MCLIENT}
 	@${MKDIR} -m 0700 ${STAGEDIR}${PREFIX}/etc/box/bbackupd
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/monthly
diff --git a/sysutils/bsdadminscripts/Makefile b/sysutils/bsdadminscripts/Makefile
index e645158a34aa..8a382398f1a7 100644
--- a/sysutils/bsdadminscripts/Makefile
+++ b/sysutils/bsdadminscripts/Makefile
@@ -47,8 +47,6 @@ do-install:
 	distviper pkg_libchk pkg_upgrade pkg_validate portconfig rcstart uma
 	${INSTALL_MAN} ${WRKSRC}/src/${f}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-
-post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MV} ${STAGEDIR}${PREFIX}/etc/*.sample ${STAGEDIR}${ETCDIR}
 	${RM} -rf ${STAGEDIR}${PREFIX}/etc/*.sample
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index ff4537b4f755..c7698b04b476 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -128,8 +128,6 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${EXAMPLE_CONF_FILE} ${STAGEDIR}${EXAMPLESDIR}/conkyrc.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index 6c64fcc2526f..7a568bc3c1bf 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -55,8 +55,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC_BZIP2_102}/bzip2 ${STAGEDIR}${PREFIX}/bin/bzip2_1.0.2
 	${INSTALL_PROGRAM} ${WRKSRC_BZIP2_103}/bzip2 ${STAGEDIR}${PREFIX}/bin/bzip2_1.0.3
 	${INSTALL_MAN} ${WRKSRC}/deltup.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}
diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile
index 960ade965248..6eba88dd1caa 100644
--- a/sysutils/fcron/Makefile
+++ b/sysutils/fcron/Makefile
@@ -52,6 +52,7 @@ do-install:
 .for n in 1 5 8
 	${INSTALL_MAN} ${DOCSRC}/man/*.${n} ${STAGEDIR}${PREFIX}/man/man${n}
 .endfor
+	${MKDIR} -m 770 ${STAGEDIR}/var/spool/fcron
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -63,7 +64,4 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${DOCSRC}/${d}/* ${STAGEDIR}${DOCSDIR}/${d}
 .endfor
 
-post-install:
-	${MKDIR} -m 770 ${STAGEDIR}/var/spool/fcron
-
 .include <bsd.port.mk>
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index f8adbfe8aa89..d37fdd29eeb5 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -48,7 +48,7 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/flexbackup.conf.5 \
 		${STAGEDIR}${MAN5PREFIX}/man/man5
 
-post-install:
+post-install-DOCS-on:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${DOCLIST}" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/mnrpes/Makefile b/sysutils/mnrpes/Makefile
index 978da1586f82..53208d975910 100644
--- a/sysutils/mnrpes/Makefile
+++ b/sysutils/mnrpes/Makefile
@@ -40,8 +40,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/checks.txt.dist ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/mnrpes-receiver.cfg.dist ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/mnrpes-scheduler.cfg.dist ${STAGEDIR}${ETCDIR}
-
-post-install:
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 
diff --git a/sysutils/plconfig/Makefile b/sysutils/plconfig/Makefile
index 98d645851d2c..084f580b9168 100644
--- a/sysutils/plconfig/Makefile
+++ b/sysutils/plconfig/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/plconfig ${STAGEDIR}${PREFIX}/bin
 
-post-install:
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}