mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Fix glaring logic/typo bugs:

Browse Source 
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 :)
This commit is contained in:
Will Andrews 2001-04-14 20:43:29 +00:00
parent 21a1c241cd
commit 58386d31fc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=41382
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Mk/bsd.kde.mk
View File

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

38
Mk/bsd.kde4.mk
View File

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