From e2e3623af53d5a4a05a0a429f05202bf255d2ca7 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Fri, 27 Jun 2014 14:21:37 +0000 Subject: [PATCH] - Stage support - Fix compile errors on 10X and above PR: 190788 --- www/webreport/Makefile | 23 +++++++++++-------- .../{pkg-message => files/pkg-message.in} | 0 2 files changed, 14 insertions(+), 9 deletions(-) rename www/webreport/{pkg-message => files/pkg-message.in} (100%) 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 + 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 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