From owner-svn-ports-all@FreeBSD.ORG  Tue Jul 15 15:45:40 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 299B79CA;
 Tue, 15 Jul 2014 15:45:40 +0000 (UTC)
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 1692B2405;
 Tue, 15 Jul 2014 15:45:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FFjdAc039380;
 Tue, 15 Jul 2014 15:45:39 GMT (envelope-from leeym@svn.freebsd.org)
Received: (from leeym@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FFjd3m039378;
 Tue, 15 Jul 2014 15:45:39 GMT (envelope-from leeym@svn.freebsd.org)
Message-Id: <201407151545.s6FFjd3m039378@svn.freebsd.org>
From: Yen-Ming Lee <leeym@FreeBSD.org>
Date: Tue, 15 Jul 2014 15:45:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361958 - head/chinese/opendesktop-fonts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jul 2014 15:45:40 -0000

Author: leeym
Date: Tue Jul 15 15:45:39 2014
New Revision: 361958
URL: http://svnweb.freebsd.org/changeset/ports/361958
QAT: https://qat.redports.org/buildarchive/r361958/

Log:
  - fix improper stage

Modified:
  head/chinese/opendesktop-fonts/Makefile
  head/chinese/opendesktop-fonts/pkg-plist

Modified: head/chinese/opendesktop-fonts/Makefile
==============================================================================
--- head/chinese/opendesktop-fonts/Makefile	Tue Jul 15 15:45:35 2014	(r361957)
+++ head/chinese/opendesktop-fonts/Makefile	Tue Jul 15 15:45:39 2014	(r361958)
@@ -11,7 +11,7 @@ MASTER_SITES?=	ftp://ftp.opendesktop.org
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ming and Kai face of OpenDesktop fonts
 
-CONFLICTS=	zh-fireflyttf-*
+CONFLICTS=	zh-fireflyttf-[0-9]*
 DIST_SUBDIR=	OpenFonts
 NO_BUILD=	yes
 
@@ -41,7 +41,8 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR}
 .if !defined(WITHOUT_X11)
-	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${LOCALBASE}/etc/fonts/local.conf
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts
+	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${PREFIX}/etc/fonts/local.conf
 .endif
 
 .include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"

Modified: head/chinese/opendesktop-fonts/pkg-plist
==============================================================================
--- head/chinese/opendesktop-fonts/pkg-plist	Tue Jul 15 15:45:35 2014	(r361957)
+++ head/chinese/opendesktop-fonts/pkg-plist	Tue Jul 15 15:45:39 2014	(r361958)
@@ -1,3 +1,5 @@
+etc/fonts/local.conf
 %%X11%%@unexec if cmp -s %%LOCALBASE%%/etc/fonts/local.conf %D/%%FONTSDIR%%/local.conf-odo; then rm -f %%LOCALBASE%%/etc/fonts/local.conf; fi
 %%FONTSDIR%%/local.conf-odo
 %%X11%%@exec cp %D/%%FONTSDIR%%/local.conf-odo %%LOCALBASE%%/etc/fonts/local.conf
+@dirrmtry etc/fonts