Convert to USES=jpeg

18 files changed, 27 insertions, 44 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 33264d6b105b..7cf9a3753b28 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -13,11 +13,9 @@ COMMENT=	Extension to the Tk toolkit
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 
-USES=		gmake shebangfix tk zip
+USES=		gmake jpeg shebangfix tk zip
 SHEBANG_FILES=	demos/scripts/xcolors.tcl
 SHEBANG_LANG=	bltwish
 bltwish_OLD_CMD=../bltwish
diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile
index d0f01d93e1b8..7c2fd77e81ea 100644
--- a/x11-toolkits/fltk-devel/Makefile
+++ b/x11-toolkits/fltk-devel/Makefile
@@ -14,7 +14,6 @@ COMMENT=	Cross-platform C++ graphical user interface toolkit
 LICENSE=	LGPL20
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
@@ -24,7 +23,7 @@ EXAMPLES_CMAKE_OFF=	-DOPTION_BUILD_EXAMPLES:BOOL=OFF
 USE_XORG=	xft
 USE_GL=		glu
 USE_LDCONFIG=	${PREFIX}/lib/fltk-devel
-USES+=		cmake:outsource
+USES+=		cmake:outsource jpeg
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS+=	-DOPTION_BUILD_SHARED_LIBS:BOOL=ON \
     		-DPREFIX_BIN:PATH=${PREFIX}/bin/fltk-devel \
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index a223a494c445..e3fe04fe4ada 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		pkgconfig
+USES=		jpeg pkgconfig
 USE_XORG=	xft
 USE_GL=		glu
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 0520e03eb3f8..1850933d7a39 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -16,15 +16,14 @@ COMMENT=	Fast and extensive C++ GUI toolkit
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 MAJORVER=	${PORTVERSION:R}
 SHVER=		${PORTVERSION:S/${MAJORVER}.//}
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
-USES=		libtool
+USES=		jpeg libtool
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=yes \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 302f673a997a..02cdf18345d3 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -14,11 +14,10 @@ COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.6
 
 LICENSE=	LGPL3 # (or later)
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
-USES=		libtool pathfix
+USES=		jpeg libtool pathfix
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl --with-x --with-xim
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 8b6a78691a6c..62e21b2320ec 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -33,7 +33,7 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+USES+=		jpeg
 .else
 CONFIGURE_ARGS+=--disable-jpeg
 .endif
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 032cc1ff21da..a8346214708f 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -13,7 +13,6 @@ LICENSE_COMB=	multi
 LICENSE=	GPLv3 LGPL3
 
 LIB_DEPENDS+=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
@@ -30,7 +29,7 @@ CONFIGURE_ARGS=	--with-tiff-library=${LOCALBASE}/lib \
 		--enable-graphics=cairo \
 		--disable-glitz
 
-USES=		gnustep pkgconfig
+USES=		gnustep jpeg pkgconfig
 USE_GNUSTEP=	base gui build
 USE_XORG=	xft xrender xmu xext x11 xcursor xfixes xmu
 USE_GL=		yes
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 22dea441bfd7..f53adf139aa4 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -21,7 +21,6 @@ DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html \
 			texi2pdf:${PORTSDIR}/print/texinfo
 
 LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	libgif.so:${PORTSDIR}/graphics/giflib
 LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
@@ -37,7 +36,7 @@ CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/include
 CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/lib
 
-USES=		gnustep pkgconfig
+USES=		gnustep jpeg pkgconfig
 USE_GNUSTEP=	base build
 USE_XORG=	x11 xt
 
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index cbdd93381cf4..6fc9ff599f02 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -13,11 +13,10 @@ COMMENT=	High performance realtime 3D engine
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/readme.txt
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
-USES=		alias dos2unix gmake zip
+USES=		alias dos2unix gmake jpeg zip
 USE_GL=		gl
 USE_XORG=	x11 xxf86vm
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index a9428992c643..99bf5d32b590 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -12,12 +12,11 @@ COMMENT=	Toolkit to explore video and human-computer interaction
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libexif.so:${PORTSDIR}/graphics/libexif \
+LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		gmake libtool pathfix pkgconfig shebangfix tar:bzip2
+USES=		gmake jpeg libtool pathfix pkgconfig shebangfix tar:bzip2
 USE_GL=		glu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-opencv
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 5ca6644e25b2..e787bf7c2692 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -14,15 +14,14 @@ COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif-[0-9]*
 # WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/motif-${PORTVERSION}
 
-USES=		autoreconf gmake iconv libtool:keepla pkgconfig tar:tgz
+USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig tar:tgz
 USE_XORG=	x11 xaw xbitmaps xext xft xt
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index f02462c28c25..3d5c85b521d6 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Extensible Perl toolkit for multi-platform GUI development
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
@@ -22,7 +21,7 @@ OPTIONS_DEFAULT=ICONV XFT
 
 CONFIGURE_ARGS=	EXTRA_CCFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" \
 		X11BASE=${LOCALBASE}
-USES=		perl5
+USES=		jpeg perl5
 USE_PERL5=	configure
 USE_XORG=	x11 xext xpm xrender
 MAKE_JOBS_UNSAFE=	yes
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index fb4672954dfa..e9a3ad4d117f 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Re-port of a perl5 interface to Tk8.4
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 OPTIONS_DEFINE=	XFT
@@ -21,7 +20,7 @@ XFT_DESC=	Client-side fonts via libXft
 
 CONFIGURE_ARGS=	X11INC=${LOCALBASE}/include X11LIB=${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
-USES=		perl5 shebangfix
+USES=		jpeg perl5 shebangfix
 SHEBANG_FILES=	pTk/Tcl-pTk \
 		pTk/mkVFunc
 USE_PERL5=	configure
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index f7ac99a14cf9..d4c121917350 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -13,7 +13,6 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libxcb.so:${PORTSDIR}/x11/libxcb \
 		libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
@@ -23,6 +22,7 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
+USES=		jpeg
 USE_GL=		gl
 USE_GNOME=	glib20
 USE_QT5=	core dbus qmake_build buildtools_build
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 5fd53477ec76..43df6ab2d77d 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -13,11 +13,10 @@ MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
 
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png\
-		libjpeg.so:${PORTSDIR}/graphics/jpeg\
 		libtiff.so:${PORTSDIR}/graphics/tiff\
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
-USES=		compiler iconv gmake pkgconfig tar:bzip2
+USES=		compiler gmake iconv jpeg pkgconfig tar:bzip2
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
 USE_GNOME=	gtk20 pangox-compat
diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile
index 0e33c8767f8d..592c492184d3 100644
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -12,12 +12,11 @@ MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
 
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png\
-		libjpeg.so:${PORTSDIR}/graphics/jpeg\
 		libtiff.so:${PORTSDIR}/graphics/tiff\
 		libexpat.so:${PORTSDIR}/textproc/expat2\
 		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 
-USES+=		compiler:c++11-lib iconv gmake pkgconfig tar:bzip2
+USES+=		compiler:c++11-lib gmake iconv jpeg pkgconfig tar:bzip2
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
 USE_GNOME=	gtk20
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index f6e239993278..2f0ec94ccc15 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Graphical user interface toolkit for X Window System
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
-USES=		libtool
+USES=		jpeg libtool
 USE_XORG=	xpm
 USE_GL=		gl
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 981fa75d1dd0..2179f3425130 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Motif widget set for displaying HTML 3.2 documents
 LICENSE=	LGPL20 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gmake libtool:build motif pkgconfig tar:tgz
+USES=		gmake jpeg libtool:build motif pkgconfig tar:tgz
 USE_XORG=	xft xmu xpm xt
 USE_LDCONFIG=	yes