- use STAGEDIR

- rename patchfiles

3 files changed, 31 insertions, 22 deletions

diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index 9a9a689b7d29..ca56c05eb48c 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -9,55 +9,64 @@ MASTER_SITES=	SF \
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Fido-Internet Gateway and Tosser
 
-.if !defined(WITHOUT_IFCICO)
-RUN_DEPENDS=	${LOCALBASE}/libexec/ifmail/ifcico:${PORTSDIR}/news/ifmail
-.endif
-
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
+NEED_ROOT=	yes
 
 USES=		gmake perl5
 
+FIXDEST=	. doc doc/gatebau doc/html scripts/areas \
+		scripts/maintenance scripts/misc scripts/nodelist \
+		scripts/outbound scripts/run scripts/www src/areafix \
+		src/charset src/ffx src/gate src/tick src/toss src/util
 DOCLIST=	fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \
 		msgid.doc qmail.txt texinfo.tex dirs.html index.html \
 		template.html fido howto misc rfc gatebau/msgid.sgml \
 		gatebau/msgid.tex gatebau/msgid.txt
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+post-patch:
+	${REINPLACE_CMD} -e 's| .(PREFIX)| $$(DESTDIR)$$(PREFIX)|g' \
+		${FIXDEST:S,$,/Makefile,S,^,${WRKSRC}/,}
 
 pre-configure:
 	${TOUCH} ${WRKSRC}/doc/fidogate.info
 	${RM} -f ${WRKSRC}/doc/fidogate.info-?
 	${RM} -f ${WRKSRC}/doc/fidogate.txt
-	@${REINPLACE_CMD} -e "s|.{PREFIX}|${PREFIX}|g" \
+	${REINPLACE_CMD} -e "s|[.]info-|.info|" ${WRKSRC}/doc/Makefile
+	${REINPLACE_CMD} -e "s|.{PREFIX}|${PREFIX}|g" \
 		 -e "s|.{LOCALBASE}|${LOCALBASE}|g" \
 		 -e "s|^CC|#CC|" ${WRKSRC}/config.make
 .if defined(FIDOGATE_RUNAS)
-	@${REINPLACE_CMD} -e "s|OWNER.*= news|OWNER		= ${FIDOGATE_RUNAS}|" \
+	${REINPLACE_CMD} -e "s|OWNER.*= news|OWNER		= ${FIDOGATE_RUNAS}|" \
 		${WRKSRC}/config.make
 .endif
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e "s|test doc|test|" \
+.if !${PORT_OPTIONS:MDOCS}
+	${REINPLACE_CMD} -e "s|test doc|test|" \
 		-e "s|cp ANNOUNCE|#cp ANNOUNCE|" \
 		 ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e "s|run www|run|" ${WRKSRC}/scripts/Makefile
+	${REINPLACE_CMD} -e "s|run www|run|" ${WRKSRC}/scripts/Makefile
 .endif
 
 pre-install:
-	${MKDIR} ${PREFIX}/libexec/fidogate
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/html ${DOCSDIR}/info ${DOCSDIR}/fido \
-		${DOCSDIR}/howto ${DOCSDIR}/misc ${DOCSDIR}/gatebau
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/fidogate
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/html \
+		${STAGEDIR}${DOCSDIR}/info \
+		${STAGEDIR}${DOCSDIR}/fido \
+		${STAGEDIR}${DOCSDIR}/howto \
+		${STAGEDIR}${DOCSDIR}/misc \
+		${STAGEDIR}${DOCSDIR}/gatebau
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@${TAR} -C ${WRKSRC}/doc -cf - ${DOCLIST} | ${TAR} -C ${DOCSDIR} -xf -
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${TAR} -C ${WRKSRC}/doc -cf - ${DOCLIST} | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	@${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf -
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf -
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/news/fidogate/files/patch-ac b/news/fidogate/files/patch-Makefile
index f73a2461c533..f73a2461c533 100644
--- a/news/fidogate/files/patch-ac
+++ b/news/fidogate/files/patch-Makefile
diff --git a/news/fidogate/files/patch-aa b/news/fidogate/files/patch-config.make
index b4f2858448f4..b4f2858448f4 100644
--- a/news/fidogate/files/patch-aa
+++ b/news/fidogate/files/patch-config.make