diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-04-14 20:43:29 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-04-14 20:43:29 +0000 |
| commit | 58386d31fcb9114d578b5a62576e10752048a16b (patch) | |
| tree | 8381b8d363e3a3c02786d767e31967385b9060d3 /Mk/bsd.kde.mk | |
| parent | make bento happier (bibelot.pl -> bibelot) (diff) | |
Fix glaring logic/typo bugs:
1) Move USE_KDEBASE_VER above USE_KDELIBS_VER so the implication works.
2) QTCFLIBS -> QTCFGLIBS, fixes port pre-definition of QTCFGLIBS.
3) Use libkonq.so.4, NOT libkparts.so.4 (part of kdelibs2!) for indication
of kdebase2 installation.
Wake-up call from: demon (whose kwix port now works :)
Notes
Notes:
svn path=/head/; revision=41382
Diffstat (limited to 'Mk/bsd.kde.mk')
| -rw-r--r-- | Mk/bsd.kde.mk | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index ef6ae5d2237c..95aa5471a146 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -34,6 +34,24 @@ pre-everything:: @${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!" .endif +# USE_KDEBASE_VER section +.if defined(USE_KDEBASE_VER) + +# kdebase 1.x common stuff +.if ${USE_KDEBASE_VER} == 1 +RUN_DEPENDS+= kcontrol:${PORTSDIR}/x11/kdebase11 +USE_KDELIBS_VER=1 + +.else + +# kdebase 2.x common stuff -- DEFAULT +LIB_DEPENDS+= konq.4:${PORTSDIR}/x11/kdebase2 +USE_KDELIBS_VER=2 + +.endif +.endif +# End of USE_KDEBASE_VER + # USE_KDELIBS_VER section .if defined(USE_KDELIBS_VER) @@ -52,24 +70,6 @@ USE_QT_VER= 2 .endif # End of USE_KDELIBS_VER section -# USE_KDEBASE_VER section -.if defined(USE_KDEBASE_VER) - -# kdebase 1.x common stuff -.if ${USE_KDEBASE_VER} == 1 -RUN_DEPENDS+= kcontrol:${PORTSDIR}/x11/kdebase11 -USE_KDELIBS_VER=1 - -.else - -# kdebase 2.x common stuff -- DEFAULT -LIB_DEPENDS+= kparts.4:${PORTSDIR}/x11/kdebase2 -USE_KDELIBS_VER=2 - -.endif -.endif -# End of USE_KDEBASE_VER - # USE_QT_VER section .if defined(USE_QT_VER) @@ -88,7 +88,7 @@ CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}" .else QTCPPFLAGS?= -QTCFLIBS?= +QTCGFLIBS?= # Qt 2.x common stuff -- DEFAULT LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23 |