svn commit: r322438 - in head/Mk: . Uses

[Baptiste Daroussin]

Author: bapt
Date: Sun Jul  7 12:56:07 2013
New Revision: 322438
URL: http://svnweb.freebsd.org/changeset/ports/322438

Log:
  Remove direct usage of X_FONTS_MISC_PORT and X_FONTS_ALIAS_PORT
  While here fixed missing ${PORTSDIR} [1]
  
  Reported by:	rm [1]

Modified:
  head/Mk/Uses/display.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/Uses/display.mk
==============================================================================
--- head/Mk/Uses/display.mk	Sun Jul  7 12:36:22 2013	(r322437)
+++ head/Mk/Uses/display.mk	Sun Jul  7 12:56:07 2013	(r322438)
@@ -19,8 +19,8 @@ IGNORE=	USES=display can only take 'buil
 
 .if !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
-	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
+	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
 	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 	xkbcomp:${PORTSDIR}/x11/xkbcomp
 

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sun Jul  7 12:36:22 2013	(r322437)
+++ head/Mk/bsd.port.mk	Sun Jul  7 12:56:07 2013	(r322438)
@@ -1918,9 +1918,9 @@ X_FONTS_TYPE1_PORT=	${PORTSDIR}/x11-font
 X_FONTS_ALIAS_PORT=	${PORTSDIR}/x11-fonts/font-alias
 
 .if defined(USE_DISPLAY) && !defined(DISPLAY)
-BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver \
-	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
-	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
+	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
 	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 	xkbcomp:${PORTSDIR}/x11/xkbcomp
 .if !defined(PACKAGE_BUILDING)