From 4d5e12f12671c20de7334fe9e14f98a30a66357c Mon Sep 17 00:00:00 2001
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Mon, 16 Jul 2007 21:42:32 +0000
Subject: [PATCH] Update Qt4-specific notes and instructions: Qt4 is now
handled in bsd.qt.mk, which is pre/post-include-safe and there's a new big
library component.
---
.../books/porters-handbook/book.sgml | 24 +++++--------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index b2a03a0bc2..c2076d51ec 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -5734,7 +5734,7 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"</programlisting>
<makevar>QT_COMPONENTS</makevar> variable. Most important
components are listed below (all components are listed in
<makevar>_QT_COMPONENTS_ALL</makevar> of
- <filename>/usr/ports/Mk/bsd.kde.mk</filename>):</para>
+ <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para>
<table frame="none">
<title>Available Qt4 library components</title>
@@ -5779,6 +5779,11 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"</programlisting>
<entry>unit testing library</entry>
</row>
+ <row>
+ <entry><literal>script</literal></entry>
+ <entry>script library</entry>
+ </row>
+
<row>
<entry><literal>sql</literal></entry>
<entry>SQL library</entry>
@@ -5928,23 +5933,6 @@ do-configure:
</listitem>
</itemizedlist>
- <note>
- <para>At the moment, <filename>bsd.kde.mk</filename> isn't
- pre/postmk-safe, which means you cannot use
- <makevar>USE_QT_VER</makevar> and <makevar>QT_COMPONENTS</makevar>
- after including <filename>bsd.port.pre.mk</filename>. If
- your port requires this, please depend on the component you
- need the traditional way for now, for example:</para>
-
- <programlisting>.include <bsd.port.pre.mk>
-
-.if defined(WITH_QT)
-BUILD_DEPENDS+= moc4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+= QtCore:${PORTSDIR}/devel/qt4-corelib
-.endif
-
-.include <bsd.port.post.mk></programlisting>
- </note>
</sect2>
</sect1>