svn commit: r347678 - in head: . audio audio/libmtp multimedia multimedia/libmtp

[Naram Qashat]

On 03/09/14 17:23, Gerald Pfeifer wrote:
> On Sun, 9 Mar 2014, Gerald Pfeifer wrote:
>> My tests now still fails with
>>
>>    --- describe.devel ---
>>    make[5]: "/shscratch/tmp/gerald/4portmgr/devel/mingw32-binutils/Makefile"
>>    line 47: Malformed conditional ((defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr"))
>>    make[5]: Fatal errors encountered -- cannot continue===> devel/mingw32-binutils failed
>>    *** [describe.devel] Error code 1
>>
>> but that seems unrelated.
>
> Am I missing something, or should the following be applied?
>
> Okay?
>
> Gerald
>
> Index: devel/mingw32-binutils/Makefile
> ===================================================================
> --- devel/mingw32-binutils/Makefile	(revision 347685)
> +++ devel/mingw32-binutils/Makefile	(working copy)
> @@ -44,7 +44,9 @@
>   add-plist-post:
>   	@${ECHO_CMD} "@unexec ${RMDIR} -p %D/${PKGNAMEPREFIX:S/-$//}/info 2> /dev/null || true" >> ${TMPPLIST}
>   	@${ECHO_CMD} "@unexec ${RMDIR} -p %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST}
> -.if (defined(PREFIX) && ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
> +.if (defined(PREFIX) && defined(LOCALBASE) && defined(LINUXBASE) \
> +	&& ${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} \
> +	&& ${PREFIX} != "/usr")
>   	@${ECHO_CMD} "@unexec ${RMDIR} %D 2> /dev/null || true" >> ${TMPPLIST}
>   .else
>   	@${DO_NADA}
>

I'm fine with the patch, odd error though.

Thanks,
Naram Qashat