7 files changed, 7 insertions, 12 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index c0d16ff7faaf..6fb03bc08b07 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -18,12 +18,11 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		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
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 6e82b3ba127f..b13d3eb6151c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -22,7 +22,6 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		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 opengl phonon porting_build \
 		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"
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 4d4f3a9d92ed..a9aa49c14e19 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -123,7 +123,7 @@ SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 
 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
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index b7b2af541979..12484de7495f 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -127,7 +127,7 @@ MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
 
 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
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 992c18f5faa7..0b58a36d67dd 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -28,7 +28,6 @@ LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
 		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}
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 4fa0d8a908da..760b97cd06ff 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -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-||}
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 7af79d4f9337..e9f8437df457 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -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-||}