Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Mar 2014 22:23:02 +0100 (CET)
From:      Gerald Pfeifer <gerald@pfeifer.com>
To:        ports-committers@freebsd.org, cyberbotx@cyberbotx.com
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org
Subject:   Re: svn commit: r347678 - in head: . audio audio/libmtp multimedia multimedia/libmtp
Message-ID:  <alpine.LSU.2.11.1403092221080.7314@tuna.site>
In-Reply-To: <alpine.LSU.2.11.1403092030560.7314@tuna.site>
References:  <201403091814.s29IEoKg084520@svn.freebsd.org> <531CBDEA.7010204@freebsd.org> <alpine.LSU.2.11.1403092030560.7314@tuna.site>

next in thread | previous in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.LSU.2.11.1403092221080.7314>