Convert to USES=jpeg

8 files changed, 9 insertions, 15 deletions

diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile
index 919ce3badb93..e7240cef0c0b 100644
--- a/emulators/generator-cbiere/Makefile
+++ b/emulators/generator-cbiere/Makefile
@@ -15,9 +15,7 @@ COMMENT=	SEGA Genesis emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
-USES=		gmake tar:bzip2
+USES=		gmake jpeg tar:bzip2
 USE_GNOME=	gtk12
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index f690210e715d..f07b98b95adc 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -12,9 +12,7 @@ COMMENT=	SEGA Genesis emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
-USES=		gmake
+USES=		gmake jpeg
 USE_GNOME=	gtk12
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index c523d5b4f361..55b758b96d7a 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -10,7 +10,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Multi Arcade Machine Emulator
 
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
@@ -25,7 +24,7 @@ GH_TAGNAME=	mame${PORTVERSION:S/.//}
 # base clang fails with signal during build (!)
 USE_GCC=	yes
 
-USES=		gmake pkgconfig python:2,build shebangfix
+USES=		gmake jpeg pkgconfig python:2,build shebangfix
 SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
 		src/emu/cpu/m6809/m6809make.py \
 		src/emu/cpu/mcs96/mcs96make.py \
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index af0b0c68f950..af7e737b63ae 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -152,7 +152,7 @@ LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 .if empty(PORT_OPTIONS:MJPEG)
 CONFIGURE_ARGS+=	--disable-vnc-jpeg
 .else
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+USES+=		jpeg
 .endif
 
 .if empty(PORT_OPTIONS:MPNG)
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 29964967e186..d7705c39983d 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -165,7 +165,7 @@ LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 .if empty(PORT_OPTIONS:MJPEG)
 CONFIGURE_ARGS+=	--disable-vnc-jpeg
 .else
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+USES+=		jpeg
 .endif
 
 .if empty(PORT_OPTIONS:MPNG)
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 3b49569a540c..7fe394dd0db0 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -96,10 +96,10 @@ V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender
+X11_USES=		jpeg
 X11_USE=		GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender
 X11_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 			libfreetype.so:${PORTSDIR}/print/freetype2 \
-			libjpeg.so:${PORTSDIR}/graphics/jpeg \
 			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 			libpng.so:${PORTSDIR}/graphics/png
 
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e3fede82eb59..2dfcd5b3a8f3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -95,10 +95,10 @@ V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
 
 X11_CONFIGURE_WITH=	x cms fontconfig freetype glu jpeg opengl png xinput2 xrandr xrender
+X11_USES=		jpeg
 X11_USE=		GL=glu XORG=xcomposite,xcursor,xi,xrandr,xrender
 X11_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 			libfreetype.so:${PORTSDIR}/print/freetype2 \
-			libjpeg.so:${PORTSDIR}/graphics/jpeg \
 			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 			libpng.so:${PORTSDIR}/graphics/png
 
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 73c618ec2f63..458627232500 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv2 # (or later)
 
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 OPTIONS_DEFINE=	ESOUND DOCS EXAMPLES
 OPTIONS_DEFINE_i386=	MMX
@@ -36,7 +35,7 @@ MMX_BUILD_DEPENDS=nasm:${PORTSDIR}/devel/nasm
 MMX_CONFIGURE_ENABLE=mmx
 
 EXTRACT_AFTER_ARGS=--exclude libltdl
-USES=		gettext gmake libtool shebangfix
+USES=		gettext gmake jpeg libtool shebangfix
 SHEBANG_FILES=	contrib/instgame
 USE_XORG=	x11 xext xxf86vm
 GNU_CONFIGURE=	yes