diff --git a/www/webreport/Makefile b/www/webreport/Makefile
index 98a4de795564..3ced443778c6 100644
--- a/www/webreport/Makefile
+++ b/www/webreport/Makefile
@@ -3,29 +3,34 @@
 
 PORTNAME=	webreport
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.inter7.com/webreport/
 
 MAINTAINER=	ismail@EnderUNIX.org
 COMMENT=	WebReport is a web log statistics program  for web hosting sites
 
+SUB_FILES=	pkg-message
 PORTDOCS=	INSTALL
 PLIST_FILES=	bin/webreport etc/webreport.conf-dist
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+# silence clang errors on 10.0+
+CFLAGS+=	-Wno-return-type
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,ulong,unsigned long,;s,/etc/,${PREFIX}/etc/,' ${WRKSRC}/webreport.h
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/webreport ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/webreport.conf ${PREFIX}/etc/webreport.conf-dist
+	@${INSTALL_PROGRAM} ${WRKSRC}/webreport ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/webreport.conf ${STAGEDIR}${PREFIX}/etc/webreport.conf-dist
 
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g'
-
 .include <bsd.port.mk>
diff --git a/www/webreport/pkg-message b/www/webreport/files/pkg-message.in
similarity index 100%
rename from www/webreport/pkg-message
rename to www/webreport/files/pkg-message.in