summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-07-09 21:16:32 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-07-09 21:16:32 +0800
commit97f56d43a2b4a9669b6602b6603ac6cc09265481 (patch)
tree9c7059b25b86cd379600e6f53a815c5f7084e34a
parent405d783749c3d17ffd437d441835897ef97b2977 (diff)
downloadxorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.tar
xorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.tar.gz
xorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.tar.bz2
xorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.tar.lz
xorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.tar.xz
xorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.tar.zst
xorg-devel-ports-97f56d43a2b4a9669b6602b6603ac6cc09265481.zip
Sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1022 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--Mk/bsd.port.mk25
1 files changed, 9 insertions, 16 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index db43b74..3fc5503 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1556,15 +1556,6 @@ check-makefile::
_POSTMKINCLUDED= yes
-# Loading features
-.for f in ${_USES_POST}
-_f=${f:C/\:.*//g}
-.if ${_f} != ${f}
-${_f}_ARGS:= ${f:C/^[^\:]*\://g}
-.endif
-.include "${USESDIR}/${_f}.mk"
-.endfor
-
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
@@ -1921,13 +1912,6 @@ LIB_DEPENDS+= Xm.4:${PORTSDIR}/x11-toolkits/open-motif
.endif
.endif
-X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/encodings
-X_FONTS_100DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-100dpi
-X_FONTS_75DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-75dpi
-X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic
-X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-truetype
-X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1
-
.if defined(USE_DISPLAY) && !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
@@ -2071,6 +2055,15 @@ RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS}
USE_SUBMAKE= yes
.endif
+# Loading features
+.for f in ${_USES_POST}
+_f=${f:C/\:.*//g}
+.if ${_f} != ${f}
+${_f}_ARGS:= ${f:C/^[^\:]*\://g}
+.endif
+.include "${USESDIR}/${_f}.mk"
+.endfor
+
.if defined(USE_XORG)
# Add explicit X options to avoid problems with false positives in configure
.if defined(GNU_CONFIGURE)