diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-07 12:56:07 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-07-07 12:56:07 +0000 |
| commit | edf7ecb35660831a96496ee61c7dff9d8c7bb98d (patch) | |
| tree | 2f61165f9065a3f19091b56bfdde8504c2e07e3f /Mk | |
| parent | Remove usage of X_FONTS_MISC_PORT and X_FONTS_ALIAS_PORT (diff) | |
Remove direct usage of X_FONTS_MISC_PORT and X_FONTS_ALIAS_PORT
While here fixed missing ${PORTSDIR} [1]
Reported by: rm [1]
Notes
Notes:
svn path=/head/; revision=322438
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/display.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk index 13f4de9b47bd..97861b26fe5f 100644 --- a/Mk/Uses/display.mk +++ b/Mk/Uses/display.mk @@ -19,8 +19,8 @@ IGNORE= USES=display can only take 'build', 'install' and none .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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d0104b95e233..cb1b0dda0619 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1918,9 +1918,9 @@ X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1 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) |