- NOPORTDOCS -> PORT_OPTIONS:MDOCS

- Staging
- Use OPTIONS where appropriate
- Rename old-style patch files

2 files changed, 36 insertions, 30 deletions

diff --git a/irc/infobot/Makefile b/irc/infobot/Makefile
index 41616525b9e7..bd4f60cca496 100644
--- a/irc/infobot/Makefile
+++ b/irc/infobot/Makefile
@@ -11,24 +11,27 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bot written in Perl with a rabid AI
 
 USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
-NO_STAGE=	yes
+post-patch:
+	-@${RM} ${WRKSRC}/src/*.orig
+.for i in config help users
+	@${RM} ${WRKSRC}/conf/infobot.$i
+.endfor
+
 do-install:
-	${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CP} -r ${WRKSRC}/src ${WRKSRC}/extras ${WRKSRC}/files \
-		${WRKSRC}/scripts ${DATADIR}/
-	${RM} ${DATADIR}/src/*.orig
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/REVISIONS ${DOCSDIR}
-.endif
-	${MKDIR} ${PREFIX}/etc/infobot
-	${INSTALL_DATA} ${WRKSRC}/conf/* ${PREFIX}/etc/infobot
+		${WRKSRC}/scripts ${STAGEDIR}${DATADIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/REVISIONS ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${ETCDIR}
 	${SED} -e 's,$$param{\(.\)basedir\(.\)} = .*,$$param{\1basedir\2} = "${DATADIR}";,' \
-	-e 's,$$param{\(.\)confdir\(.\)} = .*,$$param{\1confdir\2} = "${PREFIX}/etc/infobot";,' \
+	-e 's,$$param{\(.\)confdir\(.\)} = .*,$$param{\1confdir\2} = "${ETCDIR}";,' \
 	${WRKSRC}/infobot  > ${WRKDIR}/infobot
-	${INSTALL_SCRIPT} ${WRKDIR}/infobot ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/infobot ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/irc/infobot/pkg-plist b/irc/infobot/pkg-plist
index e676a5491076..dc819e5b511c 100644
--- a/irc/infobot/pkg-plist
+++ b/irc/infobot/pkg-plist
@@ -1,18 +1,21 @@
 bin/infobot
-etc/infobot/infobot-are.txt
-etc/infobot/infobot-is.txt
-etc/infobot/infobot.channels
-@unexec if cmp -s %D/etc/infobot/infobot.config %D/etc/infobot/infobot.config-dist; then rm -f %D/etc/infobot/infobot.config; fi
-etc/infobot/infobot.config-dist
-etc/infobot/infobot.crontab
-@unexec if cmp -s %D/etc/infobot/infobot.help %D/etc/infobot/infobot.help-dist; then rm -f %D/etc/infobot/infobot.help; fi
-etc/infobot/infobot.help-dist
-@unexec if cmp -s %D/etc/infobot/infobot.users %D/etc/infobot/infobot.users-dist; then rm -f %D/etc/infobot/infobot.users; fi
-etc/infobot/infobot.users-dist
-etc/infobot/magic8.txt
-etc/infobot/sane-are.txt
-etc/infobot/sane-ignore.txt
-etc/infobot/sane-is.txt
+%%ETCDIR%%/infobot-are.txt
+%%ETCDIR%%/infobot-is.txt
+%%ETCDIR%%/infobot.channels
+@unexec if cmp -s %D/%%ETCDIR%%/infobot.config %D/%%ETCDIR%%/infobot.config-dist; then rm -f %D/%%ETCDIR%%/infobot.config; fi
+%%ETCDIR%%/infobot.config-dist
+@exec if [ ! -f %D/%%ETCDIR%%/infobot.config ]; then cp -p %D/%F %B/infobot.config; fi
+%%ETCDIR%%/infobot.crontab
+@unexec if cmp -s %D/%%ETCDIR%%/infobot.help %D/%%ETCDIR%%/infobot.help-dist; then rm -f %D/%%ETCDIR%%/infobot.help; fi
+%%ETCDIR%%/infobot.help-dist
+@exec if [ ! -f %D/%%ETCDIR%%/infobot.help ]; then cp -p %D/%F %B/infobot.help; fi
+@unexec if cmp -s %D/%%ETCDIR%%/infobot.users %D/%%ETCDIR%%/infobot.users-dist; then rm -f %D/%%ETCDIR%%/infobot.users; fi
+%%ETCDIR%%/infobot.users-dist
+@exec if [ ! -f %D/%%ETCDIR%%/infobot.users ]; then cp -p %D/%F %B/infobot.users; fi
+%%ETCDIR%%/magic8.txt
+%%ETCDIR%%/sane-are.txt
+%%ETCDIR%%/sane-ignore.txt
+%%ETCDIR%%/sane-is.txt
 %%DATADIR%%/extras/ANSI.pl
 %%DATADIR%%/extras/Aviation.pl
 %%DATADIR%%/extras/DNS.pl
@@ -77,6 +80,6 @@ etc/infobot/sane-is.txt
 @dirrm %%DATADIR%%/extras
 @dirrm %%DATADIR%%/files
 @dirrm %%DATADIR%%/scripts
-@dirrmtry etc/infobot
-@dirrmtry share/infobot/src
-@dirrmtry share/infobot
+@dirrmtry %%DATADIR%%/src
+@dirrmtry %%DATADIR%%
+@dirrmtry %%ETCDIR%%