From owner-svn-ports-head@FreeBSD.ORG  Sun Mar  9 21:22:53 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4B907BA6;
 Sun,  9 Mar 2014 21:22:53 +0000 (UTC)
Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66])
 by mx1.freebsd.org (Postfix) with ESMTP id 273C380E;
 Sun,  9 Mar 2014 21:22:52 +0000 (UTC)
Received: from [192.168.0.129] (vie-188-118-240-099.dsl.sil.at
 [188.118.240.99])
 by ainaz.pair.com (Postfix) with ESMTPSA id EEC8E3F417;
 Sun,  9 Mar 2014 17:22:48 -0400 (EDT)
Date: Sun, 9 Mar 2014 22:23:02 +0100 (CET)
From: Gerald Pfeifer <gerald@pfeifer.com>
To: ports-committers@freebsd.org, cyberbotx@cyberbotx.com
Subject: Re: svn commit: r347678 - in head: . audio audio/libmtp multimedia
 multimedia/libmtp
In-Reply-To: <alpine.LSU.2.11.1403092030560.7314@tuna.site>
Message-ID: <alpine.LSU.2.11.1403092221080.7314@tuna.site>
References: <201403091814.s29IEoKg084520@svn.freebsd.org>
 <531CBDEA.7010204@freebsd.org> <alpine.LSU.2.11.1403092030560.7314@tuna.site>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2014 21:22:53 -0000

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}