svn commit: r394184 - in head/x11-fonts/cyr-rfx: . files

Mikhail Teterin mi at FreeBSD.org
Thu Aug 13 19:00:01 UTC 2015


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:


More information about the svn-ports-all mailing list