From owner-svn-ports-head@freebsd.org  Thu Aug 13 19:00: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 03B8F9B80FB;
 Thu, 13 Aug 2015 19:00:01 +0000 (UTC) (envelope-from mi@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 E86602D7;
 Thu, 13 Aug 2015 19:00:00 +0000 (UTC) (envelope-from mi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7DJ00Ud091751;
 Thu, 13 Aug 2015 19:00:00 GMT (envelope-from mi@FreeBSD.org)
Received: (from mi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7DJ00vE091748;
 Thu, 13 Aug 2015 19:00:00 GMT (envelope-from mi@FreeBSD.org)
Message-Id: <201508131900.t7DJ00vE091748@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org
 using -f
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Thu, 13 Aug 2015 19:00:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394184 - in head/x11-fonts/cyr-rfx: . files
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2015 19:00:01 -0000

Author: mi
Date: Thu Aug 13 18:59:59 2015
New Revision: 394184
URL: https://svnweb.freebsd.org/changeset/ports/394184

Log:
  Stop using the "legacy" fmake, adjust the Makefile to work
  with the newer bmake.
  
  PR:		201208
  Submitted by:	amdmi3

Modified:
  head/x11-fonts/cyr-rfx/Makefile
  head/x11-fonts/cyr-rfx/files/Makefile.bdf2pcf

Modified: head/x11-fonts/cyr-rfx/Makefile
==============================================================================
--- head/x11-fonts/cyr-rfx/Makefile	Thu Aug 13 18:49:02 2015	(r394183)
+++ head/x11-fonts/cyr-rfx/Makefile	Thu Aug 13 18:59:59 2015	(r394184)
@@ -16,7 +16,7 @@ COMMENT=	Cyrillic X11 bitmap fonts from 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-USES=		fonts fmake
+USES=		fonts
 USE_XORG=	x11
 
 CYR_RFX_ENCODING?=	koi8-o

Modified: head/x11-fonts/cyr-rfx/files/Makefile.bdf2pcf
==============================================================================
--- head/x11-fonts/cyr-rfx/files/Makefile.bdf2pcf	Thu Aug 13 18:49:02 2015	(r394183)
+++ head/x11-fonts/cyr-rfx/files/Makefile.bdf2pcf	Thu Aug 13 18:59:59 2015	(r394184)
@@ -1,6 +1,5 @@
-VPATH=	${.CURDIR}/75dpi:${.CURDIR}/misc
-BDFS!=	echo ${VPATH:S,:,/*.bdf ,}/*.bdf
-PCFS=	${BDFS:T:S/.bdf/.pcf.gz/}
+BDFS!=	echo 75dpi/*.bdf misc/*.bdf
+PCFS=	${BDFS:S/.bdf/.pcf.gz/}
 
 .SUFFIXES:	.bdf .pcf.gz
 
@@ -9,7 +8,7 @@ all:	fonts.dir fonts.alias ${PCFS}
 fonts.dir:	${PCFS}
 	mkfontdir .
 
-fonts.alias: ${VPATH:S,:,/fonts.alias ,}/fonts.alias
+fonts.alias: 75dpi/fonts.alias misc/fonts.alias
 	cat ${.ALLSRC} > ${.TARGET}
 
 .bdf.pcf.gz: