Index: head/audio/festival-freebsoft-utils/Makefile
===================================================================
--- head/audio/festival-freebsoft-utils/Makefile	(revision 458724)
+++ head/audio/festival-freebsoft-utils/Makefile	(revision 458725)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	festival-freebsoft-utils
 PORTVERSION=	0.10
 PORTREVISION=	3
 CATEGORIES=	audio accessibility
 MASTER_SITES=	http://www.freebsoft.org/pub/projects/${PORTNAME}/
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Festival utilities focused on interaction with Speech Dispatcher
 
-OPTIONS_DEFINE=	DOCS
-
 RUN_DEPENDS=	festival:audio/festival \
 		sox:audio/sox
 
 NO_BUILD=	yes
 USES=		iconv
 
+INFO=		${PORTNAME}
 PORTDOCS=	ANNOUNCE NEWS README
 
-INFO=		${PORTNAME}
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/festival/lib
-	cd ${WRKSRC} && ${INSTALL_DATA} *.scm ${STAGEDIR}${PREFIX}/share/festival/lib
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${PORTNAME}.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/festival/lib
+	${INSTALL_DATA} ${WRKSRC}/*.scm ${STAGEDIR}${PREFIX}/share/festival/lib
+	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
+		${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>