Remove WITH_IMAGE_PLUGINS knob, as it is broken, and non-default. It's one

less thing we have to worry about when people report problems, too.

PR:	44714

8 files changed, 16 insertions, 64 deletions

diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 9dbf38f7b8ab..e3591223ae1f 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
-PORTREVISION?=  4
+PORTREVISION?=  5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -20,14 +20,6 @@ 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 # WITHOUT_IMAGE_PLUGINS [default]
-IMAGELIB_TYPE=	qt
-PLIST_SUB+=	IMAGE_PLUGINS="@comment "
-.endif # WITHOUT_IMAGE_PLUGINS [default]
-
 QT_PREFIX?=		${PREFIX}
 USE_BZIP2=		yes
 USE_GMAKE=		yes
@@ -39,9 +31,9 @@ HAS_CONFIGURE=		yes
 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 \
+		-qt-imgfmt-png \
+		-qt-imgfmt-jpeg \
+		-qt-imgfmt-mng \
 		-system-libpng -system-libjpeg 	-system-libmng \
 		-no-nas-sound -sm \
 		-docdir ${QT_PREFIX}/share/doc/qt \
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 88db45a59a46..91d670dc8efc 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -514,9 +514,6 @@ plugins/designer/libcppeditor.so
 plugins/designer/libdlgplugin.so
 plugins/designer/librcplugin.so
 plugins/designer/libwizards.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
@@ -2306,7 +2303,6 @@ templates/Dialog_with_Buttons_(Right).ui
 templates/Tab_Dialog.ui
 @dirrm templates
 @dirrm share/doc/qt
-%%IMAGE_PLUGINS%%@dirrm plugins/imageformats
 @dirrm plugins/designer
 @dirrm plugins
 @dirrm mkspecs/win32-watcom
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 9dbf38f7b8ab..e3591223ae1f 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
-PORTREVISION?=  4
+PORTREVISION?=  5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -20,14 +20,6 @@ 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 # WITHOUT_IMAGE_PLUGINS [default]
-IMAGELIB_TYPE=	qt
-PLIST_SUB+=	IMAGE_PLUGINS="@comment "
-.endif # WITHOUT_IMAGE_PLUGINS [default]
-
 QT_PREFIX?=		${PREFIX}
 USE_BZIP2=		yes
 USE_GMAKE=		yes
@@ -39,9 +31,9 @@ HAS_CONFIGURE=		yes
 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 \
+		-qt-imgfmt-png \
+		-qt-imgfmt-jpeg \
+		-qt-imgfmt-mng \
 		-system-libpng -system-libjpeg 	-system-libmng \
 		-no-nas-sound -sm \
 		-docdir ${QT_PREFIX}/share/doc/qt \
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 88db45a59a46..91d670dc8efc 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -514,9 +514,6 @@ plugins/designer/libcppeditor.so
 plugins/designer/libdlgplugin.so
 plugins/designer/librcplugin.so
 plugins/designer/libwizards.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
@@ -2306,7 +2303,6 @@ templates/Dialog_with_Buttons_(Right).ui
 templates/Tab_Dialog.ui
 @dirrm templates
 @dirrm share/doc/qt
-%%IMAGE_PLUGINS%%@dirrm plugins/imageformats
 @dirrm plugins/designer
 @dirrm plugins
 @dirrm mkspecs/win32-watcom
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 9dbf38f7b8ab..e3591223ae1f 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
-PORTREVISION?=  4
+PORTREVISION?=  5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -20,14 +20,6 @@ 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 # WITHOUT_IMAGE_PLUGINS [default]
-IMAGELIB_TYPE=	qt
-PLIST_SUB+=	IMAGE_PLUGINS="@comment "
-.endif # WITHOUT_IMAGE_PLUGINS [default]
-
 QT_PREFIX?=		${PREFIX}
 USE_BZIP2=		yes
 USE_GMAKE=		yes
@@ -39,9 +31,9 @@ HAS_CONFIGURE=		yes
 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 \
+		-qt-imgfmt-png \
+		-qt-imgfmt-jpeg \
+		-qt-imgfmt-mng \
 		-system-libpng -system-libjpeg 	-system-libmng \
 		-no-nas-sound -sm \
 		-docdir ${QT_PREFIX}/share/doc/qt \
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 88db45a59a46..91d670dc8efc 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -514,9 +514,6 @@ plugins/designer/libcppeditor.so
 plugins/designer/libdlgplugin.so
 plugins/designer/librcplugin.so
 plugins/designer/libwizards.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
@@ -2306,7 +2303,6 @@ templates/Dialog_with_Buttons_(Right).ui
 templates/Tab_Dialog.ui
 @dirrm templates
 @dirrm share/doc/qt
-%%IMAGE_PLUGINS%%@dirrm plugins/imageformats
 @dirrm plugins/designer
 @dirrm plugins
 @dirrm mkspecs/win32-watcom
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 9dbf38f7b8ab..e3591223ae1f 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.5
-PORTREVISION?=  4
+PORTREVISION?=  5
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -20,14 +20,6 @@ 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 # WITHOUT_IMAGE_PLUGINS [default]
-IMAGELIB_TYPE=	qt
-PLIST_SUB+=	IMAGE_PLUGINS="@comment "
-.endif # WITHOUT_IMAGE_PLUGINS [default]
-
 QT_PREFIX?=		${PREFIX}
 USE_BZIP2=		yes
 USE_GMAKE=		yes
@@ -39,9 +31,9 @@ HAS_CONFIGURE=		yes
 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 \
+		-qt-imgfmt-png \
+		-qt-imgfmt-jpeg \
+		-qt-imgfmt-mng \
 		-system-libpng -system-libjpeg 	-system-libmng \
 		-no-nas-sound -sm \
 		-docdir ${QT_PREFIX}/share/doc/qt \
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 88db45a59a46..91d670dc8efc 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -514,9 +514,6 @@ plugins/designer/libcppeditor.so
 plugins/designer/libdlgplugin.so
 plugins/designer/librcplugin.so
 plugins/designer/libwizards.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
@@ -2306,7 +2303,6 @@ templates/Dialog_with_Buttons_(Right).ui
 templates/Tab_Dialog.ui
 @dirrm templates
 @dirrm share/doc/qt
-%%IMAGE_PLUGINS%%@dirrm plugins/imageformats
 @dirrm plugins/designer
 @dirrm plugins
 @dirrm mkspecs/win32-watcom