svn commit: r390310 - in head: Mk astro/astrometry astro/boinc-astropulse astro/boinc-setiathome-v7 astro/celestia astro/openuniverse astro/sunclock astro/xephem astro/xplanet audio/deadbeef audio/...

Antoine Brodin antoine at FreeBSD.org
Mon Jun 22 18:33:41 UTC 2015 

Author: antoine
Date: Mon Jun 22 18:33:20 2015
New Revision: 390310
URL: https://svnweb.freebsd.org/changeset/ports/390310

Log:
  Convert to USES=jpeg

Modified:
  head/Mk/bsd.gecko.mk
  head/astro/astrometry/Makefile
  head/astro/boinc-astropulse/Makefile
  head/astro/boinc-setiathome-v7/Makefile
  head/astro/celestia/Makefile
  head/astro/openuniverse/Makefile
  head/astro/sunclock/Makefile
  head/astro/xephem/Makefile
  head/astro/xplanet/Makefile
  head/audio/deadbeef/Makefile
  head/audio/enscribe/Makefile
  head/biology/protomol/Makefile
  head/cad/gmsh/Makefile
  head/cad/leocad/Makefile
  head/cad/netgen/Makefile
  head/cad/openvsp/Makefile
  head/comms/hylafax/Makefile
  head/comms/xastir/Makefile
  head/converters/wkhtmltopdf/Makefile
  head/databases/grass/Makefile
  head/deskutils/aspostit/Makefile
  head/deskutils/spice-gtk/Makefile
  head/deskutils/xfce4-tumbler/Makefile
  head/devel/allegro-devel/Makefile
  head/devel/clanlib/Makefile
  head/devel/clanlib1/Makefile
  head/devel/clanlib22/Makefile
  head/devel/dcmtk/Makefile
  head/devel/directfb/Makefile
  head/devel/efl/Makefile
  head/devel/kyra/Makefile
  head/devel/libclaw/Makefile
  head/devel/p5-SDL/Makefile
  head/devel/py-game_sdl2/Makefile
  head/devel/sfml/Makefile
  head/devel/sfml1/Makefile
  head/devel/simgear/Makefile
  head/devel/synfig/Makefile
  head/editors/abiword/Makefile
  head/editors/calligra/Makefile
  head/editors/emacs-devel/Makefile
  head/editors/emacs/Makefile
  head/editors/libreoffice/Makefile
  head/editors/openoffice-4/Makefile
  head/editors/openoffice-devel/Makefile
  head/emulators/generator-cbiere/Makefile
  head/emulators/generator/Makefile
  head/emulators/mame/Makefile
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-sbruno/Makefile
  head/emulators/wine-devel/Makefile
  head/emulators/wine/Makefile
  head/emulators/xsystem35/Makefile
  head/games/adgali/Makefile
  head/games/allacrost/Makefile
  head/games/armagetron/Makefile
  head/games/cake/Makefile
  head/games/crrcsim/Makefile
  head/games/darkplaces/Makefile
  head/games/diaspora/Makefile
  head/games/edge/Makefile
  head/games/egl/Makefile
  head/games/ezquake/Makefile
  head/games/flightgear/Makefile
  head/games/freedroid/Makefile
  head/games/freeminer/Makefile
  head/games/fteqw/Makefile
  head/games/gracer/Makefile
  head/games/jigzo/Makefile
  head/games/joequake/Makefile
  head/games/lugaru/Makefile
  head/games/macopix/Makefile
  head/games/megaglest/Makefile
  head/games/minetest/Makefile
  head/games/netradiant/Makefile
  head/games/neverball/Makefile
  head/games/nexuiz/Makefile
  head/games/openalchemist/Makefile
  head/games/openclonk/Makefile
  head/games/penguin-command/Makefile
  head/games/q2p/Makefile
  head/games/q2pro/Makefile
  head/games/quake2lnx/Makefile
  head/games/quake2max/Makefile
  head/games/qudos/Makefile
  head/games/r1q2/Makefile
  head/games/scorched3d/Makefile
  head/games/sdlquake2/Makefile
  head/games/supertuxkart/Makefile
  head/games/tuxpuck/Makefile
  head/games/ufoai/Makefile
  head/games/vavoom/Makefile
  head/games/warsow/Makefile
  head/games/xglk/Makefile
  head/games/xmoto/Makefile
  head/games/xonotic/Makefile
  head/games/xrick/Makefile
  head/graphics/GraphicsMagick/Makefile
  head/graphics/ImageMagick/Makefile
  head/graphics/aaphoto/Makefile
  head/graphics/argyllcms/Makefile
  head/graphics/autopano-sift-c/Makefile
  head/graphics/blender/Makefile
  head/graphics/bmeps/Makefile
  head/graphics/cimg/Makefile
  head/graphics/cinepaint/Makefile
  head/graphics/commons-utilities/Makefile
  head/graphics/cthumb/Makefile
  head/graphics/dataplot/Makefile
  head/graphics/dcraw-m/Makefile
  head/graphics/dcraw/Makefile
  head/graphics/devil/Makefile
  head/graphics/djvulibre/Makefile
  head/graphics/enblend/Makefile
  head/graphics/eom/Makefile
  head/graphics/epeg/Makefile
  head/graphics/exact-image/Makefile
  head/graphics/exiftran/Makefile
  head/graphics/exrtools/Makefile
  head/graphics/flam3/Makefile
  head/graphics/gd/Makefile
  head/graphics/gdal/Makefile
  head/graphics/gdchart/Makefile
  head/graphics/gdk-pixbuf/Makefile
  head/graphics/gdk-pixbuf2/Makefile
  head/graphics/gegl/Makefile
  head/graphics/gegl3/Makefile
  head/graphics/gimageview/Makefile
  head/graphics/gimp-app/Makefile
  head/graphics/gle-graphics/Makefile
  head/graphics/gnash/Makefile
  head/graphics/gnofract4d/Makefile
  head/graphics/grads/Makefile
  head/graphics/graphviz/Makefile
  head/graphics/grx/Makefile
  head/graphics/gstreamer-plugins-gl/Makefile
  head/graphics/gwenview-kde4/Makefile
  head/graphics/hugin-devel/Makefile
  head/graphics/hugin/Makefile
  head/graphics/iccexamin/Makefile
  head/graphics/icontact/Makefile
  head/graphics/ida/Makefile
  head/graphics/iiview/Makefile
  head/graphics/imageindex/Makefile
  head/graphics/imageworsener/Makefile
  head/graphics/imlib2/Makefile
  head/graphics/inventor/Makefile
  head/graphics/ipe/Makefile
  head/graphics/iulib/Makefile
  head/graphics/jasper/Makefile
  head/graphics/jhead/Makefile
  head/graphics/jp2a/Makefile
  head/graphics/jpeginfo/Makefile
  head/graphics/jpegoptim/Makefile
  head/graphics/jpgtn/Makefile
  head/graphics/jslice/Makefile
  head/graphics/kphotoalbum-kde4/Makefile
  head/graphics/lcms/Makefile
  head/graphics/lcms2/Makefile
  head/graphics/leptonica/Makefile
  head/graphics/libafterimage/Makefile
  head/graphics/libbpg/Makefile
  head/graphics/libgaiagraphics/Makefile
  head/graphics/libgeotiff/Makefile
  head/graphics/libgfx/Makefile
  head/graphics/libgphoto2/Makefile
  head/graphics/libgxps/Makefile
  head/graphics/libimg/Makefile
  head/graphics/libkdcraw-kde4/Makefile
  head/graphics/libmng/Makefile
  head/graphics/libopenraw/Makefile
  head/graphics/libpano13/Makefile
  head/graphics/librasterlite/Makefile
  head/graphics/librasterlite2/Makefile
  head/graphics/libraw/Makefile
  head/graphics/libreatlas/Makefile
  head/graphics/libsixel/Makefile
  head/graphics/libsvg-cairo/Makefile
  head/graphics/libsvg/Makefile
  head/graphics/libwmf/Makefile
  head/graphics/lprof-devel/Makefile
  head/graphics/luminance-qt5/Makefile
  head/graphics/luminance/Makefile
  head/graphics/mapnik/Makefile
  head/graphics/mapserver/Makefile
  head/graphics/megapov/Makefile
  head/graphics/metapixel/Makefile
  head/graphics/mtpaint/Makefile
  head/graphics/mupdf/Makefile
  head/graphics/netpbm/Makefile
  head/graphics/nvidia-texture-tools/Makefile
  head/graphics/ocaml-images/Makefile
  head/graphics/ocropus/Makefile
  head/graphics/okular/Makefile
  head/graphics/opencv/Makefile
  head/graphics/openrm/Makefile
  head/graphics/osg-devel/Makefile
  head/graphics/osg/Makefile
  head/graphics/p5-Image-Scale/Makefile
  head/graphics/p5-Imager/Makefile
  head/graphics/p5-Tk-JPEG-Lite/Makefile
  head/graphics/podofo/Makefile
  head/graphics/poppler/Makefile
  head/graphics/povray36/Makefile
  head/graphics/povray37/Makefile
  head/graphics/py-imaging/Makefile
  head/graphics/py-pillow/Makefile
  head/graphics/pyro/Makefile
  head/graphics/qt4-imageformats/Makefile
  head/graphics/rawstudio/Makefile
  head/graphics/rawtherapee/Makefile
  head/graphics/renrot/Makefile
  head/graphics/sam2p/Makefile
  head/graphics/scantailor/Makefile
  head/graphics/sdl2_image/Makefile
  head/graphics/sdl_image/Makefile
  head/graphics/sdump/Makefile
  head/graphics/seejpeg/Makefile
  head/graphics/simage/Makefile
  head/graphics/simpleviewer/Makefile
  head/graphics/sk1libs/Makefile
  head/graphics/sswf/Makefile
  head/graphics/stamp/Makefile
  head/graphics/swftools/Makefile
  head/graphics/tiff/Makefile
  head/graphics/tiffgt/Makefile
  head/graphics/tulip/Makefile
  head/graphics/ufraw/Makefile
  head/graphics/vigra/Makefile
  head/graphics/vips/Makefile
  head/graphics/webp/Makefile
  head/graphics/white_dune/Makefile
  head/graphics/xfig/Makefile
  head/graphics/xli/Makefile
  head/graphics/xpaint/Makefile
  head/graphics/xsane/Makefile
  head/graphics/xv/Makefile
  head/graphics/yafray/Makefile
  head/graphics/zbar/Makefile
  head/graphics/zgv/Makefile
  head/lang/io/Makefile.addons
  head/lang/ofc/Makefile
  head/lang/php5/Makefile.ext
  head/lang/php55/Makefile.ext
  head/lang/php56/Makefile.ext
  head/lang/pike78/Makefile
  head/lang/racket/Makefile
  head/lang/swi-pl/Makefile
  head/mail/spamprobe/Makefile
  head/math/R/Makefile
  head/math/giacxcas/Makefile
  head/math/grace/Makefile
  head/math/ploticus/Makefile
  head/math/reduce/Makefile
  head/math/sage/Makefile
  head/math/surf/Makefile
  head/math/vtk5/Makefile
  head/math/vtk6/Makefile
  head/misc/wmweather+/Makefile
  head/multimedia/camserv/Makefile
  head/multimedia/ffmpegthumbnailer/Makefile
  head/multimedia/gmerlin/Makefile
  head/multimedia/gpac-libgpac/Makefile
  head/multimedia/gstreamer-plugins/Makefile
  head/multimedia/gstreamer-plugins/Makefile.common
  head/multimedia/gstreamer1-plugins/Makefile
  head/multimedia/gstreamer1-plugins/Makefile.common
  head/multimedia/kissdx/Makefile
  head/multimedia/kodi/Makefile
  head/multimedia/libdv/Makefile
  head/multimedia/libmovtar/Makefile
  head/multimedia/libquicktime/Makefile
  head/multimedia/libv4l/Makefile
  head/multimedia/mjpegtools/Makefile
  head/multimedia/mjpg-streamer/Makefile
  head/multimedia/motion/Makefile
  head/multimedia/openquicktime/Makefile
  head/multimedia/plexhometheater/Makefile
  head/multimedia/pwcbsd/Makefile
  head/multimedia/pwcview/Makefile
  head/multimedia/spook/Makefile
  head/multimedia/transcode/Makefile
  head/multimedia/vdr/Makefile
  head/multimedia/xawtv/Makefile
  head/multimedia/xine/Makefile
  head/multimedia/zoneminder/Makefile
  head/net-im/kopete-kde4/Makefile
  head/net-mgmt/driftnet/Makefile
  head/net-mgmt/netams/Makefile
  head/net-p2p/dclib/Makefile
  head/net/boinc-client/Makefile
  head/net/krfb/Makefile
  head/net/libvncserver/Makefile
  head/net/minidlna/Makefile
  head/net/remmina-plugin-vnc/Makefile
  head/net/ssvnc/Makefile
  head/net/tigervnc/Makefile
  head/net/tightvnc/Makefile
  head/net/vncreflector/Makefile
  head/net/wizd/Makefile
  head/net/x11vnc/Makefile
  head/net/xrdp-devel/Makefile
  head/news/knews/Makefile
  head/print/cups-base/Makefile
  head/print/cups-filters/Makefile
  head/print/fontforge/Makefile
  head/print/ghostscript7/Makefile
  head/print/ghostscript8/Makefile
  head/print/ghostscript9-agpl/Makefile
  head/print/ghostscript9/Makefile
  head/print/hpijs/Makefile
  head/print/hplip/Makefile
  head/print/panda/Makefile
  head/print/photoprint/Makefile
  head/print/pslib/Makefile
  head/print/scribus/Makefile
  head/science/afni/Makefile
  head/science/hdf-java/Makefile
  head/science/hdf/Makefile
  head/science/paraview/Makefile
  head/sysutils/ascpu/Makefile
  head/sysutils/graffer/Makefile
  head/sysutils/logstalgia/Makefile
  head/sysutils/testdisk/Makefile
  head/textproc/htmldoc/Makefile
  head/www/analog/Makefile
  head/www/chromium/Makefile
  head/www/ilias/Makefile
  head/www/imgsizer/Makefile
  head/www/links-hacked/Makefile
  head/www/links/Makefile
  head/www/netsurf/Makefile
  head/www/swiggle/Makefile
  head/www/tengine/Makefile
  head/www/thumbnail_index/Makefile
  head/www/webkit-qt5/Makefile
  head/www/webkit2-gtk3/Makefile
  head/x11-fm/ezfm/Makefile
  head/x11-fm/thunar-vfs/Makefile
  head/x11-toolkits/blt/Makefile
  head/x11-toolkits/fltk-devel/Makefile
  head/x11-toolkits/fltk/Makefile
  head/x11-toolkits/fox14/Makefile
  head/x11-toolkits/fox16/Makefile
  head/x11-toolkits/fox17/Makefile
  head/x11-toolkits/gnustep-back/Makefile
  head/x11-toolkits/gnustep-gui/Makefile
  head/x11-toolkits/irrlicht/Makefile
  head/x11-toolkits/nucleo/Makefile
  head/x11-toolkits/open-motif/Makefile
  head/x11-toolkits/p5-Prima/Makefile
  head/x11-toolkits/p5-Tk/Makefile
  head/x11-toolkits/qt5-gui/Makefile
  head/x11-toolkits/wxgtk28/Makefile
  head/x11-toolkits/wxgtk30/Makefile
  head/x11-toolkits/xforms/Makefile
  head/x11-toolkits/xmhtml/Makefile
  head/x11-wm/afterstep-stable/Makefile
  head/x11-wm/ctwm/Makefile
  head/x11-wm/jwm/Makefile
  head/x11-wm/pekwm/Makefile
  head/x11/aterm/Makefile
  head/x11/dgs/Makefile
  head/x11/eaglemode/Makefile
  head/x11/kde4-runtime/Makefile
  head/x11/kde4-workspace/Makefile
  head/x11/kdelibs4/Makefile
  head/x11/mrxvt-devel/Makefile
  head/x11/mrxvt/Makefile
  head/x11/nxcomp/Makefile
  head/x11/slim/Makefile
  head/x11/xloadimage/Makefile
  head/x11/xscreensaver-gnome/Makefile
  head/x11/xscreensaver/Makefile

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/Mk/bsd.gecko.mk	Mon Jun 22 18:33:20 2015	(r390310)
@@ -163,7 +163,7 @@ icu_MOZ_OPTIONS=		--with-system-icu --wi
 -jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm
 # XXX depends on ports/180159 or package flavor support
 #jpeg_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/libjpeg-turbo
-jpeg_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+jpeg_USES=		jpeg
 jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
 
 nspr_LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
@@ -217,6 +217,7 @@ ${use:S/-/_WITHOUT_/}=	${TRUE}
 BUILD_DEPENDS+=	${${dep}_BUILD_DEPENDS}
 LIB_DEPENDS+=	${${dep}_LIB_DEPENDS}
 RUN_DEPENDS+=	${${dep}_RUN_DEPENDS}
+USES+=		${${dep}_USES}
 MOZ_OPTIONS+=	${${dep}_MOZ_OPTIONS}
 .else
 BUILD_DEPENDS+=	${-${dep}_BUILD_DEPENDS}

Modified: head/astro/astrometry/Makefile
==============================================================================
--- head/astro/astrometry/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/astrometry/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -16,12 +16,11 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libnetpbm.so:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake pkgconfig python tar:bzip2
+USES=		gmake jpeg pkgconfig python tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PORTNAME}/lib
 ALL_TARGET=	all extra
 MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}

Modified: head/astro/boinc-astropulse/Makefile
==============================================================================
--- head/astro/boinc-astropulse/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/boinc-astropulse/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -37,7 +37,7 @@ X11_DESC=	Build screensaver (requires ne
 OPTIONS_SUB=	yes
 
 X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
-X11_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics

Modified: head/astro/boinc-setiathome-v7/Makefile
==============================================================================
--- head/astro/boinc-setiathome-v7/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/boinc-setiathome-v7/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -40,7 +40,7 @@ X11_DESC=	Build screensaver (requires ne
 OPTIONS_SUB=	yes
 
 X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
-X11_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics

Modified: head/astro/celestia/Makefile
==============================================================================
--- head/astro/celestia/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/celestia/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -13,10 +13,9 @@ COMMENT=	Scriptable space flight simulat
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gettext gmake libtool lua pkgconfig
+USES=		gettext gmake jpeg libtool lua pkgconfig
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 EXTRA_PATCHES=	${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \

Modified: head/astro/openuniverse/Makefile
==============================================================================
--- head/astro/openuniverse/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/openuniverse/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -10,11 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	OpenGL Solar System simulator for X Window System
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 USE_GL=		glut
 
-USES=		gmake
+USES=		gmake jpeg
 USE_XORG=	sm ice xmu xi xext x11
 GNU_CONFIGURE=	yes
 

Modified: head/astro/sunclock/Makefile
==============================================================================
--- head/astro/sunclock/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/sunclock/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -13,11 +13,11 @@ COMMENT=	Shows which portion of the Eart
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		jpeg
 USE_XORG=	xpm
 
 CPPFLAGS+=	$$(libpng-config --I_opts) \

Modified: head/astro/xephem/Makefile
==============================================================================
--- head/astro/xephem/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/xephem/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -10,10 +10,9 @@ MASTER_SITES=	# http://www.clearskyinsti
 MAINTAINER=	jpaetzel at FreeBSD.org
 COMMENT=	Interactive astronomical ephemeris program
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gmake motif
+USES=		gmake jpeg motif
 LDFLAGS+=	-lfontconfig
 USE_XORG=	xp xt xext xmu x11 xft
 MAKE_JOBS_UNSAFE=	yes

Modified: head/astro/xplanet/Makefile
==============================================================================
--- head/astro/xplanet/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/astro/xplanet/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -27,7 +27,7 @@ PANGO_USE=	GNOME=pango
 GIF_CONFIGURE_WITH=	gif
 GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 JPEG_CONFIGURE_WITH=	jpeg
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_USES=		jpeg
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 PNM_CONFIGURE_WITH=	pnm

Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/audio/deadbeef/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -81,8 +81,8 @@ LASTFM_LIB_DEPENDS=	libcurl.so:${PORTSDI
 LASTFM_CONFIGURE_OFF=	--disable-lfm
 
 ART_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-			libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-			libjpeg.so:${PORTSDIR}/graphics/jpeg
+			libImlib2.so:${PORTSDIR}/graphics/imlib2
+ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
 
 EQ_CONFIGURE_OFF=	--disable-supereq

Modified: head/audio/enscribe/Makefile
==============================================================================
--- head/audio/enscribe/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/audio/enscribe/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,11 +12,10 @@ COMMENT=	Create digital audio watermark 
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libgd.so:${PORTSDIR}/graphics/gd \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		pkgconfig tar:tgz
+USES=		jpeg pkgconfig tar:tgz
 
 LICENSE=	GPLv2
 

Modified: head/biology/protomol/Makefile
==============================================================================
--- head/biology/protomol/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/biology/protomol/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,10 +12,10 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	OO, component based, framework for molecular dynamics (MD) simulations
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 GNU_CONFIGURE=	yes
+USES=		jpeg
 USE_XORG=	xmu xt sm ice xext x11 xi
 
 # Hack to cure a misbehavior of the configure script

Modified: head/cad/gmsh/Makefile
==============================================================================
--- head/cad/gmsh/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/cad/gmsh/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -15,7 +15,6 @@ MAINTAINER=	stephen at FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator
 
 LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		liblapack.so:${PORTSDIR}/math/lapack
 RUN_DEPENDS=	getdp:${PORTSDIR}/science/getdp
@@ -24,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 SLAVEDIRS=	cad/gmsh-occ
 
-USES=		cmake fortran gmake tar:tgz
+USES=		cmake fortran gmake jpeg tar:tgz
 USE_GL=		yes
 ALL_TARGET=	all
 

Modified: head/cad/leocad/Makefile
==============================================================================
--- head/cad/leocad/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/cad/leocad/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -15,12 +15,11 @@ COMMENT=	CAD program that uses bricks si
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		desktop-file-utils gmake pkgconfig qmake shared-mime-info
+USES=		desktop-file-utils gmake jpeg pkgconfig qmake shared-mime-info
 USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib gui network opengl
 USE_GL=		glut

Modified: head/cad/netgen/Makefile
==============================================================================
--- head/cad/netgen/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/cad/netgen/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -11,11 +11,10 @@ MAINTAINER=	stephen at FreeBSD.org
 COMMENT=	Automatic 3D tetrahedral mesh generator
 
 LIB_DEPENDS=	libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtogl.so:${PORTSDIR}/graphics/togl
 
 USE_LDCONFIG=	yes
-USES=		gmake libtool tk
+USES=		gmake jpeg libtool tk
 USE_GL=		yes
 USE_XORG=	xmu xi
 GNU_CONFIGURE=	yes

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/cad/openvsp/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -17,7 +17,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
 LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libdrm.so:${PORTSDIR}/graphics/libdrm \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -30,7 +29,7 @@ GH_PROJECT=	OpenVSP
 GH_ACCOUNT=	${GH_PROJECT}
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
-USES=		cmake:outsource dos2unix iconv
+USES=		cmake:outsource dos2unix iconv jpeg
 USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
 		xinerama xrender xxf86vm
 USE_GL=		glu

Modified: head/comms/hylafax/Makefile
==============================================================================
--- head/comms/hylafax/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/comms/hylafax/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,13 +12,12 @@ COMMENT=	Fax software
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
 MAKE_JOBS_UNSAFE=	yes
 USE_GHOSTSCRIPT=yes
 HAS_CONFIGURE=	yes
-USES=		fakeroot
+USES=		fakeroot jpeg
 
 CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg" \

Modified: head/comms/xastir/Makefile
==============================================================================
--- head/comms/xastir/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/comms/xastir/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,11 +12,10 @@ COMMENT=	X Amateur Station Tracking and 
 BUILD_DEPENDS=	xfontsel:${PORTSDIR}/x11-fonts/xfontsel
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake motif
+USES=		gettext gmake jpeg motif
 
 SUB_FILES=	pkg-message
 

Modified: head/converters/wkhtmltopdf/Makefile
==============================================================================
--- head/converters/wkhtmltopdf/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/converters/wkhtmltopdf/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -16,11 +16,10 @@ LICENSE_FILE_LGPL3=	${INSTALL_WRKSRC}/CO
 
 LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png
 
 
-USES=			pkgconfig gmake perl5 iconv tar:bzip2
+USES=			iconv jpeg gmake perl5 pkgconfig tar:bzip2
 USE_XORG=		x11 xext xrender
 USE_PERL5=		build
 USE_LDCONFIG=		yes

Modified: head/databases/grass/Makefile
==============================================================================
--- head/databases/grass/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/databases/grass/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -26,7 +26,6 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libproj.so:${PORTSDIR}/graphics/proj \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
@@ -34,7 +33,7 @@ LIB_DEPENDS=	libgdal.so:${PORTSDIR}/grap
 		libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USES=		fortran gettext gmake iconv perl5 pkgconfig python:2 readline \
+USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 readline \
 		shebangfix tk
 SHEBANG_FILES=	scripts/i.spectral/i.spectral \
 		scripts/r.tileset/r.tileset

Modified: head/deskutils/aspostit/Makefile
==============================================================================
--- head/deskutils/aspostit/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/deskutils/aspostit/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,10 +12,8 @@ COMMENT=	AfterStep dockable version of X
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 USE_XORG=	xpm xaw xext x11
-USES=		gmake
+USES=		gmake jpeg
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/aspostit man/man1/aspostit.1.gz

Modified: head/deskutils/spice-gtk/Makefile
==============================================================================
--- head/deskutils/spice-gtk/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/deskutils/spice-gtk/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -11,11 +11,9 @@ COMMENT?=	Gtk client and libraries for S
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 USE_XORG=	pixman
 USE_GNOME=	gnomeprefix gtk20 gtk30 intltool introspection:build
-USES=		cpe gmake libtool pkgconfig tar:bzip2 pathfix
+USES=		cpe gmake jpeg libtool pkgconfig tar:bzip2 pathfix
 CPE_VENDOR=	redhat
 
 .if defined(SPICE_SLAVE)

Modified: head/deskutils/xfce4-tumbler/Makefile
==============================================================================
--- head/deskutils/xfce4-tumbler/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/deskutils/xfce4-tumbler/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -39,8 +39,8 @@ NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FONTS_CONFIGURE_ENABLE=	font-thumbnailer
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg-thumbnailer
 FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg-thumbnailer

Modified: head/devel/allegro-devel/Makefile
==============================================================================
--- head/devel/allegro-devel/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/allegro-devel/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -19,12 +19,11 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libphysfs.so:${PORTSDIR}/devel/physfs
 
-USES=		gmake cmake openal:soft pkgconfig
+USES=		cmake gmake jpeg openal:soft pkgconfig
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
 USE_GL=		glu
 USE_GNOME=	gtk20

Modified: head/devel/clanlib/Makefile
==============================================================================
--- head/devel/clanlib/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/clanlib/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -14,14 +14,13 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libmikmod.so:${PORTSDIR}/audio/libmikmod \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-USES=		execinfo gmake libtool pathfix pkgconfig tar:tgz
+USES=		execinfo gmake jpeg libtool pathfix pkgconfig tar:tgz
 USE_GCC=	yes
 USE_XORG=	x11
 USE_LDCONFIG=	yes

Modified: head/devel/clanlib1/Makefile
==============================================================================
--- head/devel/clanlib1/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/clanlib1/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -14,12 +14,11 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libmikmod.so:${PORTSDIR}/audio/libmikmod \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USES=		gmake libtool pathfix pkgconfig tar:tgz
+USES=		gmake jpeg libtool pathfix pkgconfig tar:tgz
 USE_XORG=	x11 xi
 USE_LDCONFIG=	yes
 USE_SDL=	gfx

Modified: head/devel/clanlib22/Makefile
==============================================================================
--- head/devel/clanlib22/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/clanlib22/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -14,14 +14,13 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libmikmod.so:${PORTSDIR}/audio/libmikmod \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-USES=		gmake libtool pathfix pkgconfig tar:tgz
+USES=		gmake jpeg libtool pathfix pkgconfig tar:tgz
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_GL=		yes

Modified: head/devel/dcmtk/Makefile
==============================================================================
--- head/devel/dcmtk/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/dcmtk/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -11,13 +11,12 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Toolkit to work with DICOM objects
 
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-    		libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+    		libpng.so:${PORTSDIR}/graphics/png
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource jpeg
 CMAKE_ARGS+=	-DDCMTK_WITH_DOXYGEN:BOOL=OFF \
     		-DDCMTK_WITH_OPENSSL:BOOL=ON
 

Modified: head/devel/directfb/Makefile
==============================================================================
--- head/devel/directfb/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/directfb/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -13,8 +13,7 @@ COMMENT=	Graphic development lightweight
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 OPTIONS_DEFINE=	FREETYPE X11 SDL UNIQUE TEST DOCS
 UNIQUE_DESC=	Unique (WM Module)
@@ -25,7 +24,7 @@ OPTIONS_SUB=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		cpe gmake libtool ncurses pathfix perl5 pkgconfig
+USES=		cpe gmake jpeg libtool ncurses pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 PORTDOCS=	*

Modified: head/devel/efl/Makefile
==============================================================================
--- head/devel/efl/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/efl/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,8 +12,7 @@ COMMENT=	Enlightenment Foundation Librar
 LICENSE=	BSD2CLAUSE LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libgif.so:${PORTSDIR}/graphics/giflib \
+LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -23,7 +22,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
-USES=		autoreconf compiler:c++11-lib gettext-tools gmake libtool \
+USES=		autoreconf compiler:c++11-lib gettext-tools gmake jpeg libtool \
 		pathfix pkgconfig shared-mime-info tar:xz
 USE_XORG=	x11 xcursor xcomposite xdamage xext xinerama xp xrandr xtst xscrnsaver
 USE_LDCONFIG=	yes

Modified: head/devel/kyra/Makefile
==============================================================================
--- head/devel/kyra/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/kyra/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -13,13 +13,12 @@ COMMENT=	Simple Sprite engine written in
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		gmake zip
+USES=		gmake jpeg zip
 USE_GL=		gl
 USE_SDL=	image sdl
 MAKEFILE=	MakefileKyra

Modified: head/devel/libclaw/Makefile
==============================================================================
--- head/devel/libclaw/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/libclaw/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -10,11 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	C++ Library Absolutely Wonderful
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
 
-USES=		cmake gettext
+USES=		cmake gettext jpeg
 CMAKE_ARGS=	-DCLAW_CMAKE_MODULES_INSTALL_PATH="${DATADIR}/cmake"
 USE_LDCONFIG=	yes
 

Modified: head/devel/p5-SDL/Makefile
==============================================================================
--- head/devel/p5-SDL/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/p5-SDL/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -15,13 +15,12 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-Alien-SDL>=1.426:${PORTSDIR}/devel/p5-Alien-SDL
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 RUN_DEPENDS=	p5-Alien-SDL>=1.426:${PORTSDIR}/devel/p5-Alien-SDL \
 		p5-Tie-Simple>=0:${PORTSDIR}/devel/p5-Tie-Simple
 
-USES=		perl5
+USES=		jpeg perl5
 USE_GL=		glu
 USE_PERL5=	modbuild
 USE_SDL=	gfx image mixer pango sdl ttf

Modified: head/devel/py-game_sdl2/Makefile
==============================================================================
--- head/devel/py-game_sdl2/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/py-game_sdl2/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -15,13 +15,12 @@ LICENSE=	LGPL21 ZLIB
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 # Upstream tends to reroll distfiles before moving under /release/
 PORTSCOUT=	site:http://www.renpy.org/dl/release/
 
-USES=		python tar:bz2
+USES=		jpeg python tar:bz2
 USE_SDL=	image2 mixer2 ttf2
 USE_PYTHON=	autoplist distutils
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}

Modified: head/devel/sfml/Makefile
==============================================================================
--- head/devel/sfml/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/sfml/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -12,11 +12,10 @@ MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Simple and Fast Multimedia Library
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libGLEW.so:${PORTSDIR}/graphics/glew
 
-USES=		cmake zip:infozip openal:al dos2unix
+USES=		cmake dos2unix jpeg openal:al zip:infozip
 DOS2UNIX_FILES=	CMakeLists.txt
 USE_XORG=	x11 xrandr
 USE_GL=		gl

Modified: head/devel/sfml1/Makefile
==============================================================================
--- head/devel/sfml1/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/sfml1/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -16,11 +16,10 @@ LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		gmake openal:al pkgconfig dos2unix
+USES=		gmake jpeg openal:al pkgconfig dos2unix
 DOS2UNIX_GLOB=	Makefile ResourcePtr.inl
 USE_XORG=	x11 xrandr
 USE_GL=		gl glu

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/simgear/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -15,13 +15,12 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libosg.so:${PORTSDIR}/graphics/osg
 
 USE_XORG=	ice sm x11 xext xi xt xmu
 USE_GL=		gl glu glut
-USES=		cmake compiler cpe openal:al,alut tar:bzip2
+USES=		cmake compiler cpe jpeg openal:al,alut tar:bzip2
 
 .include <bsd.port.pre.mk>
 

Modified: head/devel/synfig/Makefile
==============================================================================
--- head/devel/synfig/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/devel/synfig/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -16,14 +16,13 @@ LIB_DEPENDS=	libboost_program_options.so
 		libltdl.so:${PORTSDIR}/devel/libltdl \
 		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libmng.so:${PORTSDIR}/graphics/libmng \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libdv.so:${PORTSDIR}/multimedia/libdv
 
-USES=		gettext iconv libtool pathfix pkgconfig
+USES=		gettext iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	cairo glibmm libxml++26
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}

Modified: head/editors/abiword/Makefile
==============================================================================
--- head/editors/abiword/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/abiword/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -18,12 +18,11 @@ LIB_DEPENDS=	libboost_system.so:${PORTSD
 		libpopt.so:${PORTSDIR}/devel/popt \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libwv.so:${PORTSDIR}/textproc/wv \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libfribidi.so:${PORTSDIR}/converters/fribidi \
 		libgoffice-0.10.so:${PORTSDIR}/devel/goffice010
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu
 
-USES=		desktop-file-utils gmake iconv libtool pathfix pkgconfig
+USES=		desktop-file-utils gmake iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	libxml2 gtk30 librsvg2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/editors/calligra/Makefile
==============================================================================
--- head/editors/calligra/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/calligra/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -22,7 +22,6 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graph
 		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
 		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libdcmdata.so:${PORTSDIR}/devel/dcmtk \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
@@ -43,7 +42,7 @@ USE_QT4=	corelib dbus designer_build gui
 		qt3support qtestlib_build script sql svg webkit xml xmlpatterns \
 		moc_build qmake_build rcc_build uic_build uic3_build
 USE_SQLITE=	3
-USES=		cmake:outsource cpe compiler:c++11-lang iconv perl5 pkgconfig tar:xz\
+USES=		cmake:outsource cpe compiler:c++11-lang iconv jpeg perl5 pkgconfig tar:xz\
 		shared-mime-info
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
 		-DPRODUCTSET:STRING="DESKTOP"

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/emacs-devel/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -123,7 +123,7 @@ SCROLLBARS_CONFIGURE_WITH=	toolkit-scrol
 
 SYNC_INPUT_CONFIGURE_WITH=	sync-input
 
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/emacs/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -127,7 +127,7 @@ MOTIF_CONFIGURE_ON+=	--with-x-toolkit=mo
 
 SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 
 TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/libreoffice/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -28,7 +28,6 @@ LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/dev
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libGLEW.so:${PORTSDIR}/graphics/glew \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01 \
 		libetonyek-0.1.so:${PORTSDIR}/graphics/libetonyek01 \
@@ -78,7 +77,7 @@ USE_OPENLDAP=	yes
 USE_PERL5=	build
 USE_QT4=	# empty but required
 USE_XORG=	xaw xrandr
-USES=		bison compiler:c++11-lang cpe gmake perl5 pkgconfig python shared-mime-info tar:xz
+USES=		bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig python shared-mime-info tar:xz
 WANT_GNOME=	yes
 
 DISTFILES+=	${PORTNAME}-${LOVERSION}${EXTRACT_SUFX}

Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/openoffice-4/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -48,7 +48,6 @@ LIB_DEPENDS=								\
 		libapr-1.so:${PORTSDIR}/devel/apr1			\
 		libcurl.so:${PORTSDIR}/ftp/curl				\
 		libcairo.so:${PORTSDIR}/graphics/cairo			\
-		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
 		libpng.so:${PORTSDIR}/graphics/png			\
 		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
 		libCoinMP.so:${PORTSDIR}/math/coinmp			\
@@ -101,7 +100,7 @@ USE_PERL5=	build
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USES=		autoreconf:autoconf bison compiler cpe desktop-file-utils \
-		gmake perl5 pkgconfig python tar:bzip2
+		gmake jpeg perl5 pkgconfig python tar:bzip2
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 CPE_PRODUCT=	${PORTNAME:S|apache-||}

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/editors/openoffice-devel/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -50,7 +50,6 @@ LIB_DEPENDS=								\
 		libapr-1.so:${PORTSDIR}/devel/apr1			\
 		libcurl.so:${PORTSDIR}/ftp/curl				\
 		libcairo.so:${PORTSDIR}/graphics/cairo			\
-		libjpeg.so:${PORTSDIR}/graphics/jpeg			\
 		libpng.so:${PORTSDIR}/graphics/png			\
 		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib	\
 		libgraphite.so:${PORTSDIR}/graphics/silgraphite		\
@@ -113,7 +112,7 @@ USE_PERL5=	build
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USES=		autoreconf:autoconf bison compiler cpe desktop-file-utils \
-		gmake perl5 pkgconfig python tar:${TARTYPE}
+		gmake jpeg perl5 pkgconfig python tar:${TARTYPE}
 WITHOUT_CPU_CFLAGS=	true
 MAKE_JOBS_SAFE=	yes
 CPE_PRODUCT=	${PORTNAME:S|apache-||}

Modified: head/emulators/generator-cbiere/Makefile
==============================================================================
--- head/emulators/generator-cbiere/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/generator-cbiere/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -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

Modified: head/emulators/generator/Makefile
==============================================================================
--- head/emulators/generator/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/generator/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -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

Modified: head/emulators/mame/Makefile
==============================================================================
--- head/emulators/mame/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/mame/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -10,7 +10,6 @@ MAINTAINER=	ports at 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 \

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/qemu-devel/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -152,7 +152,7 @@ LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/se
 .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)

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/qemu-sbruno/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -165,7 +165,7 @@ LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/se
 .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)

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/wine-devel/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -96,10 +96,10 @@ V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/
 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
 

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/wine/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -95,10 +95,10 @@ V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/
 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
 

Modified: head/emulators/xsystem35/Makefile
==============================================================================
--- head/emulators/xsystem35/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/emulators/xsystem35/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -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
 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

Modified: head/games/adgali/Makefile
==============================================================================
--- head/games/adgali/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/adgali/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -13,12 +13,11 @@ COMMENT=	Open source game library useful
 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

Modified: head/games/allacrost/Makefile
==============================================================================
--- head/games/allacrost/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/allacrost/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}_demo_source_${PORT
 MAINTAINER=	amdmi3 at 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}/grap
 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

Modified: head/games/armagetron/Makefile
==============================================================================
--- head/games/armagetron/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/armagetron/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -14,14 +14,13 @@ COMMENT=	Multiplayer networked Tron clon
 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

Modified: head/games/cake/Makefile
==============================================================================
--- head/games/cake/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/cake/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -13,9 +13,7 @@ COMMENT=	Quake3 map viewer (and powerful
 
 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
 

Modified: head/games/crrcsim/Makefile
==============================================================================
--- head/games/crrcsim/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/crrcsim/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -11,11 +11,10 @@ MAINTAINER=	amdmi3 at 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
 

Modified: head/games/darkplaces/Makefile
==============================================================================
--- head/games/darkplaces/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/darkplaces/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -11,10 +11,9 @@ MAINTAINER=	makc at 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}

Modified: head/games/diaspora/Makefile
==============================================================================
--- head/games/diaspora/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/diaspora/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -25,13 +25,12 @@ LICENSE_PERMS_CCBYNCSAv3=	dist-mirror no
 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

Modified: head/games/edge/Makefile
==============================================================================
--- head/games/edge/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/edge/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -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

Modified: head/games/egl/Makefile
==============================================================================
--- head/games/egl/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/egl/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -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

Modified: head/games/ezquake/Makefile
==============================================================================
--- head/games/ezquake/Makefile	Mon Jun 22 18:31:05 2015	(r390309)
+++ head/games/ezquake/Makefile	Mon Jun 22 18:33:20 2015	(r390310)
@@ -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
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list