svn commit: r338361 - in head/devel/silentbob: . files

[TAKATSU Tomonari]

2014/1/13 Alexey Dokuchaev <danfe at freebsd.org>:
> On Wed, Jan 01, 2014 at 06:49:19AM +0000, TAKATSU Tomonari wrote:
>> New Revision: 338361
>> URL: http://svnweb.freebsd.org/changeset/ports/338361
>>
>> +PORTDOCS=    README
> [...]
>> +.if ${PORT_OPTIONS:MDOCS}
>>  post-install:
>> -.if !defined(NOPORTDOCS)
>> -     @${MKDIR} ${DOCSDIR}
>> -     @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>> -     @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
>> +     @${MKDIR} ${STAGEDIR}${DOCSDIR}
>> +     @${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>
> For a simple cases like this one (when docs are not being built and are just
> a lonely README file), once staged, .if ${PORT_OPTIONS:MDOCS} is no longer
> necessary (and would allow you to remove .include <bsd.port.options.mk>).
>
> Please note that INSTALL_* commands should not be muted (muting MKDIR is
> fine), thank you.
>
> ./danfe

Thank you for pointing out my mistakes.
I'll fix with following patch.

Index: Makefile
===================================================================
--- Makefile    (revision 339683)
+++ Makefile    (working copy)
@@ -18,17 +18,13 @@

 OPTIONS_DEFINE=        DOCS

-.include <bsd.port.options.mk>
-
 post-patch:
        @${RM} ${WRKSRC}/CMakeCache.txt
        @${REINPLACE_CMD} -e
's|/usr/lib/silent_bob/|${PREFIX}/lib/silent_bob/|' \
                ${WRKSRC}/src/init.cxx

-.if ${PORT_OPTIONS:MDOCS}
 post-install:
        @${MKDIR} ${STAGEDIR}${DOCSDIR}
-       @${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+       ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>


Please review it.

Regards,

-- 
TAKATSU Tomonari