aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.kde.mk
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2001-04-03 08:14:43 +0000
committerWill Andrews <will@FreeBSD.org>2001-04-03 08:14:43 +0000
commitdbba8af6447e625aae93ec45e619acbecb4ab189 (patch)
treed696a8c2d3e835a743132aa1f6a5cc0557d1c435 /Mk/bsd.kde.mk
parent683eaaa4ff765b627c52f147501abfaec4449cce (diff)
downloadports-dbba8af6447e625aae93ec45e619acbecb4ab189.tar.gz
ports-dbba8af6447e625aae93ec45e619acbecb4ab189.zip
Notes
Diffstat (limited to 'Mk/bsd.kde.mk')
-rw-r--r--Mk/bsd.kde.mk76
1 files changed, 41 insertions, 35 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 1f6ddde7860d..ef6ae5d2237c 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -34,51 +34,18 @@ pre-everything::
@${ECHO} ">>> Warning: this port needs to be updated as it uses the old-style USE_QT2 variable!"
.endif
-# USE_QT_VER section
-.if defined(USE_QT_VER)
-
-# Qt 1.x common stuff
-.if ${USE_QT_VER} == 1
-LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145
-USE_NEWGCC= yes
-MOC?= ${X11BASE}/bin/moc
-.if defined(PREFIX)
-QTDIR= ${PREFIX}
-.else
-QTDIR= ${X11BASE}
-.endif
-CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}"
-
-.else
-
-# Qt 2.x common stuff -- DEFAULT
-LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
-USE_NEWGCC= yes
-QTNAME= qt2
-MOC?= ${X11BASE}/bin/moc2
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
- --with-qt-libraries=${X11BASE}/lib \
- --with-extra-libs=${LOCALBASE}/lib
-QTCPPFLAGS= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include
-QTCFGLIBS= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++
-CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \
- CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
-.endif
-.endif
-# End of USE_QT_VER section
-
# USE_KDELIBS_VER section
.if defined(USE_KDELIBS_VER)
# kdelibs 1.x common stuff
.if ${USE_KDELIBS_VER} == 1
-LIB_DEPENDS+= kdelibs.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS+= kdecore.3:${PORTSDIR}/x11/kdelibs11
USE_QT_VER= 1
.else
# kdelibs 2.x common stuff -- DEFAULT
-LIB_DEPENDS+= kdelibs.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS+= kdecore.4:${PORTSDIR}/x11/kdelibs2
USE_QT_VER= 2
.endif
@@ -103,4 +70,43 @@ USE_KDELIBS_VER=2
.endif
# End of USE_KDEBASE_VER
+# USE_QT_VER section
+.if defined(USE_QT_VER)
+
+# Qt 1.x common stuff
+.if ${USE_QT_VER} == 1
+LIB_DEPENDS+= qt.3:${PORTSDIR}/x11-toolkits/qt145
+USE_NEWGCC= yes
+MOC?= ${X11BASE}/bin/moc
+.if defined(PREFIX)
+QTDIR= ${PREFIX}
+.else
+QTDIR= ${X11BASE}
+.endif
+CONFIGURE_ENV+= MOC="${MOC}" QTDIR="${QTDIR}"
+
+.else
+
+QTCPPFLAGS?=
+QTCFLIBS?=
+
+# Qt 2.x common stuff -- DEFAULT
+LIB_DEPENDS+= qt2.4:${PORTSDIR}/x11-toolkits/qt23
+USE_NEWGCC= yes
+QTNAME= qt2
+MOC?= ${X11BASE}/bin/moc2
+QTCPPFLAGS+= -I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ \
+ -I${LOCALBASE}/include -I${PREFIX}/include -I${X11BASE}/include/qt2
+QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg -lgcc -lstdc++
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib \
+ --with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \
+ CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+.endif
+.endif
+.endif
+# End of USE_QT_VER section
+
# End of use part.