1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

(1) Move inclusion of bsd.kde.mk to the right place.

Reviewed by:    will
Tested on:      bento

(2) Chase XFree86-3 revision.
This commit is contained in:
Satoshi Asami 2001-04-16 10:28:15 +00:00
parent 2767a35bd8
commit f7ed4a7d58
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=41456

View File

@ -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)