Attachment 153570 Details for Bug 197103 – Fix for the duplicated repalcement

[patch] Fix for the duplicated repalcement

scince_vmd.20150227.diff (text/plain), 1.37 KB, created by sakaue.mamoru on 2015-02-27 04:22:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sakaue.mamoru

Created: 2015-02-27 04:22:35 UTC

Size: 1.37 KB

patch

obsolete

>diff -urN /usr/ports/science/vmd/Makefile.orig /usr/ports/science/vmd/Makefile
>--- /usr/ports/science/vmd/Makefile.orig	2015-02-24 18:46:15.000000000 +0900
>+++ /usr/ports/science/vmd/Makefile	2015-02-27 13:04:32.000000000 +0900
>@@ -78,7 +78,7 @@
> 	${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" ${WRKSRC}/configure
> 	${REINPLACE_CMD} -E "s/(SHLD[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \
> 		${WRKDIR}/plugins/Make-arch
>-	${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)cc/\1${CC}/" \
>+	${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)(gcc|cc)/\1${CC}/" \
> 		${WRKSRC}/lib/stride/Makefile \
> 		${WRKSRC}/lib/surf/Makefile \
> 		${WRKSRC}/lib/tachyon/unix/Make-arch \
>@@ -86,13 +86,8 @@
> 		${WRKDIR}/plugins/cionize/Makefile.specialbuilds \
> 		${WRKDIR}/plugins/cionize/Makefile.mine \
> 		${WRKDIR}/plugins/cionize/Makefile.testing \
>-		${WRKDIR}/plugins/Make-arch
>-	${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \
> 		${WRKDIR}/plugins/Make-arch \
>-		${WRKDIR}/plugins/cionize/Makefile.mine \
>-		${WRKDIR}/plugins/cionize/Makefile.specialbuilds \
>-		${WRKDIR}/plugins/molfile_plugin/f77/Makefile \
>-		${WRKSRC}/lib/tachyon/unix/Make-arch
>+		${WRKDIR}/plugins/molfile_plugin/f77/Makefile
> 	${REINPLACE_CMD} -E "s/(CXX[[:space:]]*=[[:space:]]*)g\+\+/\1${CXX}/" \
> 		${WRKDIR}/plugins/cionize/Makefile.specialbuilds \
> 		${WRKDIR}/plugins/fmtool/Makefile.specialbuilds \

Actions: View | Diff

Attachments on bug 197103: 152189 | 152281 | 153570