Convert to USES=jpeg

44 files changed, 70 insertions, 100 deletions

diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 0072cde1c41..2000235632b 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -13,12 +13,11 @@ COMMENT=	Open source game library useful for 2D game development
 LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		execinfo gmake libtool tar:bzip2
+USES=		execinfo gmake jpeg libtool tar:bzip2
 USE_LDCONFIG=	yes
 USE_SDL=	sdl
 USE_XORG=	xpm
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index dd5d3d1a8f9..dcfde29f34e 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}_demo_source_${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Single player 2D role-playing game
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs
@@ -20,7 +19,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake iconv openal:al lua:51
+USES=		gettext gmake iconv jpeg openal:al lua:51
 USE_SDL=	sdl ttf net
 USE_GL=		yes
 USE_GCC=	any # problems in luabind
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index 5413dd621cc..1634cbd2fbc 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -14,14 +14,13 @@ COMMENT=	Multiplayer networked Tron clone in 3D
 LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake
+USES=		gmake jpeg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-etc --disable-initscripts
 CXXFLAGS+=	${CFLAGS} -I${LOCALBASE}/include
 
 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 OPTIONS_DEFINE=	MUSIC ARMA_SERVER_ONLY
diff --git a/games/cake/Makefile b/games/cake/Makefile
index 605ad5733b2..9af1a633e64 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -13,9 +13,7 @@ COMMENT=	Quake3 map viewer (and powerful 3D game engine)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
-USES=		gmake zip
+USES=		gmake jpeg zip
 USE_GL=		glut
 USE_XORG=	x11 xext xmu xt xi sm ice
 
diff --git a/games/crrcsim/Makefile b/games/crrcsim/Makefile
index 1177eea68bd..b03e182705d 100644
--- a/games/crrcsim/Makefile
+++ b/games/crrcsim/Makefile
@@ -11,11 +11,10 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Model-airplane flight simulation program
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake jpeg
 USE_SDL=	sdl
 USE_GL=		gl glu
 
diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile
index 721725a4b82..7ea20b0b94e 100644
--- a/games/darkplaces/Makefile
+++ b/games/darkplaces/Makefile
@@ -11,10 +11,9 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Quake engine modification
 
 # Loads libraries at run-time, thus RUN_DEPENDS.
-RUN_DEPENDS=	${LOCALBASE}/lib/libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS=	${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USES=		gmake zip:infozip
+USES=		gmake jpeg zip:infozip
 USE_XORG=	xxf86dga xpm
 MAKE_ENV=	DP_FS_BASEDIR="${Q1DIR}" DP_LINK_JPEG=dlopen
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/games/diaspora/Makefile b/games/diaspora/Makefile
index df235a815fa..380f1d4707e 100644
--- a/games/diaspora/Makefile
+++ b/games/diaspora/Makefile
@@ -25,13 +25,12 @@ LICENSE_PERMS_CCBYNCSAv3=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-a
 LICENSE_PERMS_VOLITION=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 LIB_DEPENDS+=	libjansson.so:${PORTSDIR}/devel/jansson \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora
 
-USES=	autoreconf lua:51 openal pkgconfig tar:lzma
+USES=	autoreconf jpeg lua:51 openal pkgconfig tar:lzma
 USE_GL=	yes
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
diff --git a/games/edge/Makefile b/games/edge/Makefile
index bb361b46c42..16d1d1d87a3 100644
--- a/games/edge/Makefile
+++ b/games/edge/Makefile
@@ -18,10 +18,9 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gmake tar:bzip2
+USES=		gmake jpeg tar:bzip2
 USE_GL=		glew
 USE_SDL=	sdl
 MAKEFILE=	Makefile.linux
diff --git a/games/egl/Makefile b/games/egl/Makefile
index 074851992ac..fafdfc62598 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -33,8 +33,8 @@ GAME_DESC=	Build main game (default mod)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+USES+=		jpeg
 USE_GL=		gl
 PLIST_SUB+=	CLIENT=""
 EGL_BIN+=	egl
diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 829869c90ad..dc3bab15f53 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -36,7 +36,7 @@ OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPENGL X11 OPTIMIZED_CFLAGS
 OPTIONS_SUB=	yes
 
-OPENGL_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+OPENGL_USES=		jpeg
 OPENGL_USE=		GL=yes
 
 X11_USE=		XORG=xxf86dga
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index f55130d8381..988539b37e5 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -17,8 +17,7 @@ COMMENT=	The FlightGear flight simulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
 		libosg.so:${PORTSDIR}/graphics/osg \
@@ -34,7 +33,7 @@ USE_GL=		gl glu glut
 USE_SQLITE=	3
 USE_QT5=	core buildtools qmake widgets
 
-USES=		cpe tar:bzip2 dos2unix cmake compiler openal:al,alut
+USES=		cpe dos2unix cmake compiler jpeg openal:al,alut tar:bzip2
 DOS2UNIX_REGEX=	.*\.(c|h|cxx|cpp|hxx|hpp)
 CMAKE_ARGS+=	-DENABLE_JS_SERVER:BOOL=ON \
 		-DSYSTEM_SQLITE:BOOL=ON \
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 341c4ef7868..675f8d2aee3 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Clone of the Commodore game Paradroid
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		iconv
+USES=		iconv jpeg
 USE_SDL=	mixer image sdl
 
 GNU_CONFIGURE=	yes
diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile
index 07eef20a210..e2060923072 100644
--- a/games/freeminer/Makefile
+++ b/games/freeminer/Makefile
@@ -39,9 +39,9 @@ LUAJIT_DESC=	LuaJIT support
 
 CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
 CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
-CLIENT_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-			libpng.so:${PORTSDIR}/graphics/png \
+CLIENT_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 			libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+CLIENT_USES=		jpeg
 CLIENT_USE=		GL=gl XORG=x11
 SERVER_CMAKE_ON=	-DBUILD_SERVER=1
 SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 5aace20f520..6e42a3c887c 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -37,9 +37,9 @@ PLIST_FILES+=	bin/fteqw-sv
 .endif
 
 .if ${PORT_OPTIONS:MGLCLIENT} || !empty(PORT_OPTIONS:MSDLCLIENT)
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
+USES+=		jpeg
 .endif
 
 .if ${PORT_OPTIONS:MGLCLIENT}
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 04c23bb3051..88af704e80d 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -12,11 +12,10 @@ COMMENT=	3D motor sport simulator
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+		libpng.so:${PORTSDIR}/graphics/png
 
 USE_GL=		glut
-USES=		gmake perl5 tcl:84
+USES=		gmake jpeg perl5 tcl:84
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-plib=${LOCALBASE}
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index 5effc047238..f82869efd23 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -14,10 +14,9 @@ COMMENT=	OpenGL jigsaw puzzle game
 LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gmake tar:tgz
+USES=		gmake jpeg tar:tgz
 USE_SDL=	sdl mixer
 USE_GL=		gl
 MAKE_ARGS=	CXX=${CXX}
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index a907cfae451..3030e069c2d 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -40,7 +40,7 @@ X86_ASM_DESC= Enable x86 assembly code
 
 .if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+USES+=		jpeg
 ALL_TARGET+=	glx
 PLIST_SUB+=	GLX=""
 .else
diff --git a/games/lugaru/Makefile b/games/lugaru/Makefile
index dc4e3aa7b14..4455b82a7ff 100644
--- a/games/lugaru/Makefile
+++ b/games/lugaru/Makefile
@@ -15,11 +15,10 @@ LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libogg.so:${PORTSDIR}/audio/libogg
 
-USES=		cmake openal:soft pkgconfig tar:bzip2
+USES=		cmake jpeg openal:soft pkgconfig tar:bzip2
 USE_GL=		glu
 USE_SDL=	sdl
 USE_XORG=	sm
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 592904de1cb..7c8d03b687d 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 LICENSE=	GPLv2 # or later
@@ -35,7 +34,7 @@ RESTRICTED_FILES=	\
 		macopix-mascot-marimite-euc-ja-2.20.tar.gz \
 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
 
-USES=		gettext gmake iconv libtool pkgconfig
+USES=		gettext gmake iconv jpeg libtool pkgconfig
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index 969811bd192..4d6fc3792fc 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -12,7 +12,6 @@ MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Open source 3D real-time strategy game
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
 		libftgl.so:${PORTSDIR}/graphics/ftgl \
@@ -23,7 +22,7 @@ RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSD
 
 SUB_FILES=	pkg-message
 
-USES=		cmake compiler:c++11-lib display:build dos2unix lua \
+USES=		cmake compiler:c++11-lib display:build dos2unix jpeg lua \
 		openal:al,alut pkgconfig tar:xz
 USE_GL=		glew gl glu
 USE_SDL=	yes
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 771cf11909b..e03b6058146 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -38,9 +38,9 @@ LUAJIT_DESC=	LuaJIT support
 
 CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
 CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
-CLIENT_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-			libpng.so:${PORTSDIR}/graphics/png \
+CLIENT_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 			libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht
+CLIENT_USES=		jpeg
 CLIENT_USE=		GL=gl XORG=x11
 SERVER_CMAKE_ON=	-DBUILD_SERVER=1
 SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
diff --git a/games/netradiant/Makefile b/games/netradiant/Makefile
index ee0a4c6906c..239e95465db 100644
--- a/games/netradiant/Makefile
+++ b/games/netradiant/Makefile
@@ -17,10 +17,9 @@ COMMENT=	Fork of the well-known GtkRadiant 1.5 FPS games map editor
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libwebp.so:${PORTSDIR}/graphics/webp
 
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake jpeg pkgconfig tar:bzip2
 USE_GL=		gl
 USE_GNOME=	gtk20 libxml2
 MAKE_ENV=	BUILD=release DOWNLOAD_GAMEPACKS=no LIBS_DL="" \
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index ced985654e1..4c7604e12bc 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -13,11 +13,10 @@ COMMENT=	Tilt the floor to guide a ball through an obstacle course
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libphysfs.so:${PORTSDIR}/devel/physfs
 
-USES=		gmake iconv
+USES=		gmake iconv jpeg
 USE_GL=		gl
 USE_SDL=	sdl2 ttf2
 MAKE_ARGS+=	DATADIR="${DATADIR}" \
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 41d3c28a33f..5aff4de42ef 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -13,15 +13,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
 MANUAL_PACKAGE_BUILD=	huge (880MiB)
 
-USES=		shebangfix zip:infozip
+USES=		jpeg shebangfix zip:infozip
 SHEBANG_FILES=	server/rcon.pl server/rcon2irc/rcon2irc.pl
 WRKSRC=		${WRKDIR}/Nexuiz
 BUILD_WRKSRC=	${WRKSRC}/sources/darkplaces
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 799babc6d66..9ac33d463ac 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -19,7 +19,6 @@ LICENSE_PERMS_CCbySA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	libclanCore.so:${PORTSDIR}/devel/clanlib1 \
-	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 	libpng.so:${PORTSDIR}/graphics/png
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -29,7 +28,7 @@ USE_GNOME=	pygtk2
 USE_XORG=	xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
 USE_GL=		gl glu
 USE_SDL=	sdl gfx
-USES=		autoreconf pkgconfig iconv shebangfix gmake
+USES=		autoreconf gmake iconv jpeg pkgconfig shebangfix
 SHEBANG_FILES=	openalchemist-config
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
index de06e606bab..c99f6e60977 100644
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@@ -16,12 +16,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USES=		compiler:c++11-lib cmake desktop-file-utils iconv pkgconfig tar:bzip2
+USES=		compiler:c++11-lib cmake desktop-file-utils iconv jpeg pkgconfig tar:bzip2
 USE_GL=		glew
 USE_GNOME=	gtk20
 USE_SDL=	sdl mixer
diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile
index 0d36ed9a479..2f8e01154ae 100644
--- a/games/penguin-command/Makefile
+++ b/games/penguin-command/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Clone of the classic game Missile Command
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
+USES=		jpeg
 USE_SDL=	mixer image sdl
 GNU_CONFIGURE=	yes
 
diff --git a/games/q2p/Makefile b/games/q2p/Makefile
index 2aa8ff8b4b1..4800735b7b3 100644
--- a/games/q2p/Makefile
+++ b/games/q2p/Makefile
@@ -36,8 +36,8 @@ SDLGL_DESC=	Build SDL OpenGL renderer
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+USES+=		jpeg
 USE_GL=		glu
 .endif
 
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index 540de6a7579..322d7723f6c 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -62,8 +62,8 @@ PLIST_SUB+=	GAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGL}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+USES+=		jpeg
 USE_GL=		gl
 ALL_TARGET+=	ref_newgl
 PLIST_SUB+=	GL=""
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index f6bb472a2df..6ce9329a902 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -72,7 +72,7 @@ PLIST_SUB+=	GLX="@comment "
 
 .if ${PORT_OPTIONS:MEYECANDY}
 DISTFILES+=	maxpak.pak
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+USES+=		jpeg
 USE_GL=		glu
 MAKE_ARGS+=	BUILD_QMAX=YES
 PLIST_SUB+=	QMAX=""
diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile
index c474297edd5..8937bcdc6fc 100644
--- a/games/quake2max/Makefile
+++ b/games/quake2max/Makefile
@@ -42,8 +42,8 @@ SDLGL_DESC=	Build SDL OpenGL renderer
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+USES+=		jpeg
 USE_GL=		glu
 .endif
 
diff --git a/games/qudos/Makefile b/games/qudos/Makefile
index e56704f4fdd..54531244453 100644
--- a/games/qudos/Makefile
+++ b/games/qudos/Makefile
@@ -63,9 +63,9 @@ PLIST_SUB+=	${mod}="@comment "
 .endfor
 
 .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL}
+USES+=		jpeg
 USE_GL=		glu
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 .endif
 
 .if ${PORT_OPTIONS:MSDL} || ${PORT_OPTIONS:MSDLGL}
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index 56bca97c04f..71857e2dd68 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -62,10 +62,10 @@ PLIST_SUB+=	GAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MREF_GL}
+USES+=		jpeg
 USE_GL=		gl
 USE_SDL=	sdl
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 ALL_TARGET+=	ref_gl
 PLIST_SUB+=	REF_GL=""
 .else
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 46d77fbd85b..2f61895f18f 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libGLEW.so:${PORTSDIR}/graphics/glew \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
@@ -30,7 +29,7 @@ USE_SDL=	mixer net sdl
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
-USES=		autoreconf dos2unix gmake iconv openal:al,alut perl5 pkgconfig
+USES=		autoreconf dos2unix gmake iconv jpeg openal:al,alut perl5 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR}
 
diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile
index ad157640947..19e2cf90425 100644
--- a/games/sdlquake2/Makefile
+++ b/games/sdlquake2/Makefile
@@ -26,8 +26,8 @@ PLIST_SUB=	LIBDIR=${LIBDIR:S/${PREFIX}\///}
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
-CLIENT_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-			libpng.so:${PORTSDIR}/graphics/png
+CLIENT_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+CLIENT_USES=		jpeg
 CLIENT_USE=		GL=yes
 CLIENT_USE=		SDL=sdl
 CLIENT_MAKE_ENV=	BUILD_CLIENT=YES
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 9260b04ea3d..8500ab94b4e 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -16,14 +16,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+		libpng.so:${PORTSDIR}/graphics/png
 
 BROKEN_powerpc=		does not configure on powerpc
 BROKEN_FreeBSD_8=	does not build on 8.x
 
 USES=           alias cmake compiler:c++11-lib dos2unix gettext \
-		gmake openal:al pkgconfig tar:xz
+		gmake jpeg openal:al pkgconfig tar:xz
 USE_GL=		gl glu
 USE_SDL=	sdl
 USE_XORG=	x11 xext sm ice
diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index abe020ab3a0..a4832b011ef 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -12,13 +12,12 @@ COMMENT=	Shufflepuck Cafe Clone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USE_SDL=	sdl
-USES=		gmake
+USES=		gmake jpeg
 ALL_TARGET=	${PORTNAME}
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index de4f4574ce7..9bf0955cdfa 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -13,7 +13,6 @@ MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Strategy game featuring tactical combat
 
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora \
@@ -25,7 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/u
 USE_GL=		yes
 USE_SDL=	sdl image mixer ttf
 USE_CXXSTD=	c++11
-USES=		compiler:c++11-lang execinfo gettext gmake openal:soft pkgconfig \
+USES=		compiler:c++11-lang execinfo gettext gmake jpeg openal:soft pkgconfig \
 		python:build tar:bzip2
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-release --target-os=freebsd
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index 0ab7b7d7c7d..9c7f4f5631c 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Doom, Doom II, Heretic, Hexen, and Strife source port
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		cmake dos2unix tar:bzip2
+USES=		cmake dos2unix jpeg tar:bzip2
 DOS2UNIX_REGEX=	((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$)
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index bb4abfcb0ab..0205abb0ad1 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -69,7 +69,7 @@ ALL_TARGET+=	ftlib
 . if ${PORT_OPTIONS:MREF_GL}
 USE_GL=		gl
 USE_XORG+=	xinerama
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+USES+=		jpeg
 ALL_TARGET+=	ref_gl
 . endif
 
diff --git a/games/xglk/Makefile b/games/xglk/Makefile
index fc04fa21400..9630fcd3d18 100644
--- a/games/xglk/Makefile
+++ b/games/xglk/Makefile
@@ -12,11 +12,11 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X Windows Implementation of the Glk API
 
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		jpeg
 USE_XORG=	x11
 MAKE_ENV+=	AR=${AR} RANLIB=${RANLIB} ECHO=${ECHO} RM=${RM:Q}
 
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index ff0a1104791..f9b3c372423 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -13,7 +13,6 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Challenging 2D motocross platform game
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libxdg-basedir.so:${PORTSDIR}/x11/libxdg-basedir
 BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
@@ -22,7 +21,7 @@ LICENSE=	GPLv2 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		gmake dos2unix lua:51
+USES=		dos2unix gmake jpeg lua:51
 USE_GNOME=	libxml2
 USE_SQLITE=	3
 USE_SDL=	sdl mixer ttf net
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index dab94a7d918..0e876eb8aea 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -12,12 +12,11 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+		libpng.so:${PORTSDIR}/graphics/png
 
 MANUAL_PACKAGE_BUILD=	huge (930M)
 
-USES=		shebangfix zip:infozip
+USES=		jpeg shebangfix zip:infozip
 SHEBANG_FILES=	server/rcon.pl server/rcon2irc/rcon2irc.pl
 WRKSRC=		${WRKDIR}/Xonotic
 BUILD_WRKSRC=	${WRKSRC}/source/darkplaces
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 7d4c0a4b9df..751583a8efd 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -10,10 +10,8 @@ MASTER_SITES=	http://www.bigorno.net/xrick/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clone of Rick Dangerous
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 RESTRICTED=	Copyright status of the graphics and sounds is uncertain
-USES=		gmake tar:tgz
+USES=		gmake jpeg tar:tgz
 USE_SDL=	sdl
 
 PLIST_FILES=	bin/xrick man/man6/xrick.6.gz share/xrick/data.zip