From owner-svn-ports-head@freebsd.org  Wed Jul  1 14:21:01 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 805D2991613;
 Wed,  1 Jul 2015 14:21:01 +0000 (UTC) (envelope-from mi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 71BF02E0D;
 Wed,  1 Jul 2015 14:21:01 +0000 (UTC) (envelope-from mi@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t61EL1qg052605;
 Wed, 1 Jul 2015 14:21:01 GMT (envelope-from mi@FreeBSD.org)
Received: (from mi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t61EL1AS052604;
 Wed, 1 Jul 2015 14:21:01 GMT (envelope-from mi@FreeBSD.org)
Message-Id: <201507011421.t61EL1AS052604@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org
 using -f
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Wed, 1 Jul 2015 14:21:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r391068 - head/audio/festival
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
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: Wed, 01 Jul 2015 14:21:01 -0000

Author: mi
Date: Wed Jul  1 14:21:00 2015
New Revision: 391068
URL: https://svnweb.freebsd.org/changeset/ports/391068

Log:
  Fix build on arm (v6). Do not create empty directories.
  
  PR:		200287, 201202
  Submitted by:	Mikael Urankar, avilla

Modified:
  head/audio/festival/Makefile

Modified: head/audio/festival/Makefile
==============================================================================
--- head/audio/festival/Makefile	Wed Jul  1 14:07:57 2015	(r391067)
+++ head/audio/festival/Makefile	Wed Jul  1 14:21:00 2015	(r391068)
@@ -99,7 +99,7 @@ do-configure:
 		${FALSE}; \
 	fi
 	# This step helps non-i386 systems and is harmless on i386
-	-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH}_unknown.mak
+	-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH:S/armv6/arm/}_unknown.mak
 .endfor
 	${REINPLACE_CMD} \
 	    -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \
@@ -111,13 +111,11 @@ do-configure:
 		${LN} -s gcc_defaults.mak ${WRKDIR}/speech_tools/config/compilers/${CC}.mak
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/voices/english/
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/voices/spanish/
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/dicts
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	${FIND} ${FESTIVAL}/lib -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${FIND} ${FESTIVAL} -type f -name *.orig -delete
-	cd ${FESTIVAL} && ${CP} -pPR lib examples ${STAGEDIR}${DATADIR}
+	${CP} -pPR ${FESTIVAL}/lib ${FESTIVAL}/examples ${STAGEDIR}${DATADIR}
 	${RM} -rf ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
 	    ${STAGEDIR}${DATADIR}/lib/etc/*unknown
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/audsp ${STAGEDIR}${PREFIX}/libexec