o Bump PORTREVISION

o Fix configure args to match what new configure accepts
o Use -qt-imgfmt-{jpeg,mng,png} to dynamically link the graphics
  libs into libqt-mt.so
o Use image plugins (-plugin-imgfmt-{jpeg,mng,png}) if
  WITH_IMAGE_PLUGINS; QTDIR=/usr/X11R6 needs to be set before
  starting KDE if so
o Use Mesa libs if WITH_OPENGL. This will result in warnings both
  before and after the build; the package will be called qt-opengl;
  a warning will be displayed via pkg-message when the package is
  installed

Submitted by:	Alan E <ports@geeksrus.net>
Approved by:	will

3 files changed, 54 insertions, 16 deletions

diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 96e68a6b64a2..fc9d30f89557 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/ \
                 ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -20,24 +20,42 @@ LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+.if defined(WITH_IMAGE_PLUGINS)
+IMAGELIB_TYPE=	plugin
+PLIST_SUB+=	IMAGE_PLUGINS=""
+.else
+IMAGELIB_TYPE=	qt
+PLIST_SUB+=	IMAGE_PLUGINS="@comment "
+.endif
+
 QT_PREFIX?=	${PREFIX}
 USE_BZIP2=	yes
-USE_MESA=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-system-zlib -system-libpng -system-libjpeg -sm -qt-gif \
-		-system-libmng -thread -disable-opengl -no-g++-exceptions \
-		-enable-styles -enable-kernel -enable-widgets -enable-dialogs \
-		-enable-iconview -enable-workspace -enable-network \
-		-enable-canvas -enable-table -enable-xml -remote -static \
-		-shared -no-nas-sound -no-stl -prefix ${QT_PREFIX} \
+CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
+		-shared -qt-gif -system-zlib \
+		-no-g++-exceptions -thread -no-stl \
+		-${IMAGELIB_TYPE}-imgfmt-png \
+		-${IMAGELIB_TYPE}-imgfmt-jpeg \
+		-${IMAGELIB_TYPE}-imgfmt-mng \
+		-system-libpng -system-libjpeg 	-system-libmng \
+		-no-nas-sound -sm -remote \
 		-docdir ${QT_PREFIX}/share/doc/qt \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 .if !defined(NO_DEBUG)
 CONFIGURE_ARGS+= -debug
 .endif
+.if defined(WITH_OPENGL)
+USE_MESA=	yes
+PLIST_SUB+=	OPENGL=""
+PKGNAMESUFFIX=	-opengl
+.else
+PKGMESSAGE=${NONEXISTENT}
+PLIST_SUB+=	OPENGL="@comment "
+CONFIGURE_ARGS+=-disable-opengl
+.endif
 CONFIGURE_ENV=	${ECHO} yes | QTDIR=${WRKSRC}
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
 ALL_TARGET=	symlinks sub-src sub-tools
@@ -48,13 +66,28 @@ ALL_TARGET=	symlinks sub-src sub-tools
 CFLAGS+=	-O0
 .endif
 
-pre-configure:
-	${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
+.if defined(WITH_OPENGL)
+# Display WITH_OPENGL advisory.
+pre-everything:
+	@${ECHO_MSG} '===> **************************************************'
+	@${ECHO_MSG} '===> NOTE: Use of WITH_OPENGL is not recommended with'
+	@${ECHO_MSG} '===> versions of XFree86 < 4.2.0.' 
+	@${ECHO_MSG} '===> **************************************************'
+.endif
+
+# Remove unneeded dirs (speedup).
+post-patch:
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
+	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
 
-# The following target is necessary if qt30 is installed at the
-# time the port build is started; it is related to the Makefiles
-# having dependencies on these (installed) .prl files. --AlanE
+# Work around qmake generated dependencies
 pre-install:
 	@${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
 
+.if exists(${PKGMESSAGE})
+# Display another GL advisory. This one goes in the package, too.
+post-install:
+	@cat ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt32/pkg-message b/x11-toolkits/qt32/pkg-message
new file mode 100644
index 000000000000..b89693fcc8e5
--- /dev/null
+++ b/x11-toolkits/qt32/pkg-message
@@ -0,0 +1,4 @@
+===> *****************************************************************
+===> This version of QT has been built with OpenGL graphics support.
+===> It may not function correctly with versions of XFree86 < 4.2.0.
+===> *****************************************************************
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 53a3f451013e..cd9b67fa2314 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -512,8 +512,9 @@ plugins/designer/libcppeditor.so
 plugins/designer/libdlgplugin.so
 plugins/designer/librcplugin.so
 plugins/designer/libwizards.so
-plugins/imageformats/libqjpeg.so
-plugins/imageformats/libqmng.so
+%%IMAGE_PLUGINS%%plugins/imageformats/libqjpeg.so
+%%IMAGE_PLUGINS%%plugins/imageformats/libqmng.so
+%%IMAGE_PLUGINS%%plugins/imageformats/libqpng.so
 share/doc/qt/aboutqt.html
 share/doc/qt/abstract-connections.png
 share/doc/qt/abstractwidgets.html
@@ -2258,7 +2259,7 @@ templates/Tab_Dialog.ui
 @comment directories
 @dirrm templates
 @dirrm share/doc/qt
-@dirrm plugins/imageformats
+%%IMAGE_PLUGINS%%@dirrm plugins/imageformats
 @dirrm plugins/designer
 @dirrm plugins
 @dirrm mkspecs/win32-watcom