aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.port.mk
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2001-04-16 10:28:15 +0000
committerSatoshi Asami <asami@FreeBSD.org>2001-04-16 10:28:15 +0000
commitf7ed4a7d587b90bf13891324b6a6bc4ed6029187 (patch)
tree0d7e1f1599bc8a26e1ba6f23849b223d435d72c4 /Mk/bsd.port.mk
parent2767a35bd882f5d827d6c65de431f2272609a546 (diff)
downloadports-f7ed4a7d587b90bf13891324b6a6bc4ed6029187.tar.gz
ports-f7ed4a7d587b90bf13891324b6a6bc4ed6029187.zip
Notes
Diffstat (limited to 'Mk/bsd.port.mk')
-rw-r--r--Mk/bsd.port.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index bca063cc3535..9aff915be650 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -701,6 +701,10 @@ MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \
.include "${PORTSDIR}/Mk/bsd.ruby.mk"
.endif
+.if defined(USE_QT) || defined(USE_QT2) || defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.endif
+
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
# defaults to 3.3.6; will be changed to 4.0 when it is ready
@@ -821,7 +825,7 @@ LIB_DEPENDS+= dps.0:${PORTSDIR}/x11/dgs
LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/Mesa3
.endif
XAWVER= 6
-PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6_7)'
+PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6_8)'
.else
.if defined(USE_IMAKE)
BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4
@@ -890,10 +894,6 @@ LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries
.endif
.endif
-.if defined(USE_QT) || defined(USE_QT2) || defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
-.endif
-
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.if exists(${PORTSDIR}/../Makefile.inc)