[Midnightbsd-cvs] mports: mports/Mk: Make changes for possible later include of QT4.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed May 21 02:06:22 EDT 2008


Log Message:
-----------
Make changes for possible later include of QT4.  This needs more testing (magus run?)

Modified Files:
--------------
    mports/Mk:
        bsd.kde.mk (r1.7 -> r1.8)
        bsd.mport.mk (r1.103 -> r1.104)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.103
retrieving revision 1.104
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.103 -r1.104
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -424,8 +424,8 @@
 # USE_KDELIBS_VER
 #				- Set to 3 to use the KDE libraries.
 #				  Implies inclusion of bsd.kde.mk.
-# USE_QT_VER	- Set to 3 to use the QT libraries.
-#				  Implies inclusion of bsd.kde.mk.
+# USE_QT_VER	- Set to 3 to use the QT3 libraries which implies bsd.kde.mk.
+#				  Set to 4 to use QT4 which implies bsd.qt.mk.
 ##
 # USE_LINUX		- Set to yes to say the port needs the default linux base port.
 #				  Set to value <X>, if the port needs emulators/linux_base-<X>.
@@ -1381,10 +1381,14 @@
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .endif
 
-.if defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .endif
 
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
 .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"
 .endif
Index: bsd.kde.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.kde.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -L Mk/bsd.kde.mk -L Mk/bsd.kde.mk -u -r1.7 -r1.8
--- Mk/bsd.kde.mk
+++ Mk/bsd.kde.mk
@@ -59,7 +59,7 @@
 .if !defined(_NO_KDE_CONFTARGET_HACK)
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd6.0 \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
+		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
 		--disable-as-needed
 .endif
 
@@ -115,9 +115,9 @@
 #LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
 BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
 RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
-QTCPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include \
+QTCPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include \
 				-I${QT_PREFIX}/include -D_GETOPT_H
-QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
+QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \
 				-L${QT_PREFIX}/lib
 .if defined(PACKAGE_BUILDING)
 TMPDIR?=	/tmp
@@ -130,7 +130,8 @@
 				--with-qt-libraries=${QT_PREFIX}/lib \
 				--with-extra-libs=${LOCALBASE}/lib \
 				--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+		QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
 .endif # !defined(QT_NONSTANDARD)
 .else
 IGNORE=			cannot install: unsupported value of USE_QT_VER


More information about the Midnightbsd-cvs mailing list