Attachment 144622 Details for Bug 191839 – Updated makefile diff with corrected tabs and encoding; sorry.

[patch] Updated makefile diff with corrected tabs and encoding; sorry.

Makefile.diff (text/plain), 2.28 KB, created by Jonathan Price on 2014-07-12 20:43:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2014-07-12 20:43:41 UTC

Size: 2.28 KB

patch

obsolete

>Default diff mode is SVN
>===> Updating from SVN
>Updating '.':
>At revision 361641.
>===> Generating patch
>===> Viewing diff with /usr/local/bin/cdiff
>Index: Makefile
>===================================================================
>--- Makefile	(revision 361641)
>+++ Makefile	(working copy)
>@@ -19,34 +19,33 @@
> 
> PORTDOCS=	boa.texi boa.html boa.txt boa_banner.png
> 
>-NO_STAGE=	yes
> post-patch:
> 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
> 		${WRKSRC}/examples/boa.conf ${WRKSRC}/src/defines.h
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${PREFIX}/sbin
>-	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${PREFIX}/sbin
>-	@${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${PREFIX}/man/man8
>-	@${MKDIR} ${EXAMPLESDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/examples/boa.conf ${EXAMPLESDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/examples/cgi-test.cgi ${EXAMPLESDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/examples/nph-test.cgi ${EXAMPLESDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/examples/resolver.pl ${EXAMPLESDIR}
>+	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${STAGEDIR}${PREFIX}/sbin
>+	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${STAGEDIR}${PREFIX}/sbin
>+	@${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${STAGEDIR}${PREFIX}/man/man8
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/examples/boa.conf ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/examples/cgi-test.cgi ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/examples/nph-test.cgi ${STAGEDIR}${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/examples/resolver.pl ${STAGEDIR}${EXAMPLESDIR}
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in ${PORTDOCS}
>-	@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}
> .endfor
> .endif
>-	@${INSTALL_DATA} ${WRKSRC}/docs/boa.info ${PREFIX}/info
>+	@${INSTALL_DATA} ${WRKSRC}/docs/boa.info ${STAGEDIR}${PREFIX}/info
> 
> post-install:
>-	@if [ ! -f ${PREFIX}/etc/rc.d/boa.sh ]; then \
>-		${ECHO} "Installing ${PREFIX}/etc/rc.d/boa.sh.sample \
>+	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/rc.d/boa.sh ]; then \
>+		${ECHO} "Installing ${STAGEDIR}${PREFIX}/etc/rc.d/boa.sh.sample \
> 			startup file."; \
> 		${INSTALL_SCRIPT} ${FILESDIR}/boa.sh.sample \
>-			${PREFIX}/etc/rc.d; \
>+			${STAGEDIR}${PREFIX}/etc/rc.d; \
> 	fi
> 
> .include <bsd.port.mk>
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 191839: 144614 | 144622 | 145069 | 145070