diff options
374 files changed, 551 insertions, 838 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 3b19aff273ce..a811462eac0e 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -163,7 +163,7 @@ icu_MOZ_OPTIONS= --with-system-icu --with-intl-api -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} diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile index 288484c46eb6..1dd89f2744e6 100644 --- a/astro/astrometry/Makefile +++ b/astro/astrometry/Makefile @@ -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} diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 90582446716d..830c34b298cd 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -37,7 +37,7 @@ X11_DESC= Build screensaver (requires net/boinc-client with X11) 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 diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v7/Makefile index 892905baa051..54182fb4da35 100644 --- a/astro/boinc-setiathome-v7/Makefile +++ b/astro/boinc-setiathome-v7/Makefile @@ -40,7 +40,7 @@ X11_DESC= Build screensaver (requires net/boinc-client with X11) 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 diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index d03e120509a4..16153975ad5c 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -13,10 +13,9 @@ COMMENT= Scriptable space flight simulator for X11 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 \ diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index b2f2741cc2e9..e1a1328fb1a9 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -10,11 +10,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.0beta3 MAINTAINER= ports@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 diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile index 0c31592d61e5..248fd83ea5c7 100644 --- a/astro/sunclock/Makefile +++ b/astro/sunclock/Makefile @@ -13,11 +13,11 @@ COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun 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) \ diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index 2f125fbb35a2..6fb0e53f9099 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -10,10 +10,9 @@ MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ MAINTAINER= jpaetzel@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 diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index e44c75c0d732..72be1540b0c3 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -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 diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index 65fcc878bd92..238f3d20d28d 100644 --- a/audio/deadbeef/Makefile +++ b/audio/deadbeef/Makefile @@ -81,8 +81,8 @@ LASTFM_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl 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 diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile index 6c8ca7a7fe16..9bdd4f0b720f 100644 --- a/audio/enscribe/Makefile +++ b/audio/enscribe/Makefile @@ -12,11 +12,10 @@ COMMENT= Create digital audio watermark images from photographic images 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 diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile index e8c7d8af8846..253fb8aa85bc 100644 --- a/biology/protomol/Makefile +++ b/biology/protomol/Makefile @@ -12,10 +12,10 @@ MAINTAINER= ports@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 diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 0ef8657d43af..782ba1bbcc0a 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -15,7 +15,6 @@ MAINTAINER= stephen@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}-${PORTVERSION}-source SLAVEDIRS= cad/gmsh-occ -USES= cmake fortran gmake tar:tgz +USES= cmake fortran gmake jpeg tar:tgz USE_GL= yes ALL_TARGET= all diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index b84a443ef599..ec04b083fb8f 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -15,12 +15,11 @@ COMMENT= CAD program that uses bricks similar to those found in many toys 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 diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index c82f9a896e42..ce40258af5a7 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -11,11 +11,10 @@ MAINTAINER= stephen@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 diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 25e1c2ee939e..8dd766d22c15 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -17,7 +17,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept 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 diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index e998def702eb..2865e4d65559 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -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" \ diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 4c0ae2bf0775..fb27ee903698 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -12,11 +12,10 @@ COMMENT= X Amateur Station Tracking and Information Reporting 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 diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile index 52ebbd53f6f9..ea91d2f77963 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -16,11 +16,10 @@ LICENSE_FILE_LGPL3= ${INSTALL_WRKSRC}/COPYING 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 diff --git a/databases/grass/Makefile b/databases/grass/Makefile index ad29bf34feec..337e1330779a 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -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}/graphics/gdal \ 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 diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile index 5d8979dd79d6..1e32ce505ddf 100644 --- a/deskutils/aspostit/Makefile +++ b/deskutils/aspostit/Makefile @@ -12,10 +12,8 @@ COMMENT= AfterStep dockable version of XPostIt 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 diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile index cfb38175b9ea..63c3f71b5c67 100644 --- a/deskutils/spice-gtk/Makefile +++ b/deskutils/spice-gtk/Makefile @@ -11,11 +11,9 @@ COMMENT?= Gtk client and libraries for SPICE remote desktop servers 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) diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 4a48543327f7..0674776f09ec 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -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 diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile index 4ccecc9ed6ea..f4acb6073ddb 100644 --- a/devel/allegro-devel/Makefile +++ b/devel/allegro-devel/Makefile @@ -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 diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index 66038443e554..c6311016dc98 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -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 diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile index bfd4f5838458..f6ff00307a49 100644 --- a/devel/clanlib1/Makefile +++ b/devel/clanlib1/Makefile @@ -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 diff --git a/devel/clanlib22/Makefile b/devel/clanlib22/Makefile index 95159cdffc45..2cb4882a07a9 100644 --- a/devel/clanlib22/Makefile +++ b/devel/clanlib22/Makefile @@ -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 diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile index 4902f68b7b7b..de84388a4638 100644 --- a/devel/dcmtk/Makefile +++ b/devel/dcmtk/Makefile @@ -11,13 +11,12 @@ MAINTAINER= ports@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 diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index a30fb36c574a..74b9b6f74914 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -13,8 +13,7 @@ COMMENT= Graphic development lightweight API 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= * diff --git a/devel/efl/Makefile b/devel/efl/Makefile index b685a09bd870..ce14dfedeeac 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -12,8 +12,7 @@ COMMENT= Enlightenment Foundation Libraries 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}/graphics/jpeg \ 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 diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index fb210882e1ee..673b942f52e4 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -13,13 +13,12 @@ COMMENT= Simple Sprite engine written in C++ 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 diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile index 813bbf359374..60b5f58144f4 100644 --- a/devel/libclaw/Makefile +++ b/devel/libclaw/Makefile @@ -10,11 +10,10 @@ MASTER_SITES= SF MAINTAINER= amdmi3@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 diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index bf223e455102..05e7db9f21c7 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -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 diff --git a/devel/py-game_sdl2/Makefile b/devel/py-game_sdl2/Makefile index 98f26bce8355..6b2c2ac83255 100644 --- a/devel/py-game_sdl2/Makefile +++ b/devel/py-game_sdl2/Makefile @@ -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/_/-/} diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile index afc7cd25edfb..8d63ea5a66bd 100644 --- a/devel/sfml/Makefile +++ b/devel/sfml/Makefile @@ -12,11 +12,10 @@ MAINTAINER= amdmi3@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 diff --git a/devel/sfml1/Makefile b/devel/sfml1/Makefile index bbcc39ddf70e..4f6726162364 100644 --- a/devel/sfml1/Makefile +++ b/devel/sfml1/Makefile @@ -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 diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 865d8bf1b48c..7fb3cce0c57f 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -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> diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index 6857951c4b0d..6cc1070cdb0c 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -16,14 +16,13 @@ LIB_DEPENDS= libboost_program_options.so:${PORTSDIR}/devel/boost-libs \ 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} 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-||} 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 diff --git a/games/adgali/Makefile b/games/adgali/Makefile index 0072cde1c412..2000235632bb 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 dd5d3d1a8f9f..dcfde29f34eb 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 5413dd621cc6..1634cbd2fbc6 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 605ad5733b2b..9af1a633e649 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 1177eea68bd0..b03e182705d9 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 721725a4b826..7ea20b0b94e6 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 df235a815fa2..380f1d4707e3 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 bb361b46c423..16d1d1d87a37 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 074851992ace..fafdfc625985 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 829869c90ad1..dc3bab15f539 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 f55130d8381e..988539b37e5b 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 341c4ef78687..675f8d2aee39 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 07eef20a210c..e20609230722 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 5aace20f5206..6e42a3c887c5 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 04c23bb30517..88af704e80d6 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 5effc047238b..f82869efd23d 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 a907cfae4519..3030e069c2d9 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 dc4e3aa7b142..4455b82a7ff4 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 592904de1cb4..7c8d03b687dd 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 969811bd192f..4d6fc3792fc1 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 771cf11909b7..e03b6058146f 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 ee0a4c6906c9..239e95465dbb 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 ced985654e15..4c7604e12bc7 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 41d3c28a33f7..5aff4de42ef6 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 799babc6d66d..9ac33d463ac0 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 de06e606bab6..c99f6e609773 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 0d36ed9a4795..2f8e01154aec 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 2aa8ff8b4b11..4800735b7b37 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 540de6a75794..322d7723f6cf 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 f6bb472a2dfe..6ce9329a902b 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 c474297edd5c..8937bcdc6fc4 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 e56704f4fdd2..54531244453f 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 56bca97c04f5..71857e2dd68b 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 46d77fbd85b7..2f61895f18f4 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 ad1576409479..19e2cf90425c 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 9260b04ea3d8..8500ab94b4e8 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 abe020ab3a06..a4832b011ef1 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 de4f4574ce75..9bf0955cdfa7 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 0ab7b7d7c7d3..9c7f4f5631cc 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 bb4abfcb0ab4..0205abb0ad15 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 fc04fa21400f..9630fcd3d18b 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 ff0a1104791e..f9b3c372423a 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 dab94a7d9182..0e876eb8aeab 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 7d4c0a4b9df3..751583a8efd5 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 diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 07c78e987c02..a1119f145718 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -14,7 +14,6 @@ COMMENT= Fast image processing tools based on ImageMagick LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \ libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ @@ -22,7 +21,7 @@ LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \ PORTSCOUT= limit:^1\.3\. -USES= iconv libtool tar:bzip2 +USES= iconv jpeg libtool tar:bzip2 USE_GNOME= libxml2 USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 414a7aa74dac..076082e5d3fe 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -194,7 +194,7 @@ PLIST_SUB+= DJVU="@comment " .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+= --without-jpeg diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile index 2f9a775d0f8a..86573d5c1ad9 100644 --- a/graphics/aaphoto/Makefile +++ b/graphics/aaphoto/Makefile @@ -13,14 +13,13 @@ COMMENT= Auto Adjust Photo, automatic color correction of photos LICENSE= GPLv3 LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png USE_GITHUB= yes GH_ACCOUNT= log69 GNU_CONFIGURE= yes -USES= compiler:openmp +USES= compiler:openmp jpeg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/argyllcms/Makefile b/graphics/argyllcms/Makefile index 229ce2b2eb28..469cce5fc8c6 100644 --- a/graphics/argyllcms/Makefile +++ b/graphics/argyllcms/Makefile @@ -13,12 +13,11 @@ COMMENT= ICC compatible color management system LICENSE= AGPLv3 BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff WRKSRC= ${WRKDIR}/Argyll_V${PORTVERSION} -USES= cpe zip +USES= cpe jpeg zip USE_XORG= x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm post-patch: diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile index 13a756889167..8b36b89aeb06 100644 --- a/graphics/autopano-sift-c/Makefile +++ b/graphics/autopano-sift-c/Makefile @@ -11,7 +11,6 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Automatic panorama control point generation tool, C port LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libpano13.so:${PORTSDIR}/graphics/libpano13 @@ -20,7 +19,7 @@ RESTRICTED= May be covered by patents CONFLICTS= autopano-sift-[0-9]* USE_GNOME= libxml2 -USES= cmake +USES= cmake jpeg PORTDOCS= * diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index d2e35f634012..3190a69e79dc 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -13,13 +13,12 @@ COMMENT= 3D modeling/rendering/animation/gaming package LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 USE_XORG= x11 xext xmu USE_GL= glew -USES= cmake:outsource compiler:features python:3.4 shebangfix +USES= cmake:outsource compiler:features jpeg python:3.4 shebangfix INSTALLS_ICONS= yes CMAKE_ARGS= -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF \ diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile index 778fafe5e507..137e0b35d522 100644 --- a/graphics/bmeps/Makefile +++ b/graphics/bmeps/Makefile @@ -13,8 +13,7 @@ COMMENT= Convert PNG/JPEG/TIFF to PDF/EPS LICENSE= BSD3CLAUSE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes @@ -27,7 +26,7 @@ CONFIGURE_ENV= ac_cv_header_sys_termios_h=no ALL_TARGET= bmpp MAKEFILE= GNUmakefile -USES= gmake +USES= gmake jpeg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 680e06a6fc5d..e539d523166d 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -53,7 +53,6 @@ LIB_DEPENDS+= libboard.so:${PORTSDIR}/graphics/libboard . if !defined(WITH_DEBUG) LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \ @@ -61,6 +60,7 @@ LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libopencv_core.so:${PORTSDIR}/graphics/opencv-core\ libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick +USES+= jpeg ALL_TARGET= Mlinux . else ALL_TARGET= dlinux diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index 253c453fd15c..24e06fe74cf6 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -15,7 +15,6 @@ LICENSE_COMB= multi LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libftgl.so:${PORTSDIR}/graphics/ftgl \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms.so:${PORTSDIR}/graphics/lcms \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ @@ -26,7 +25,7 @@ OYRANOS_DESC= ICC profile support via Oyranos PRINT_DESC= Gutenprint (gimp-print) plugin GNU_CONFIGURE= yes -USES= autoreconf desktop-file-utils gettext gmake libtool \ +USES= autoreconf desktop-file-utils gettext gmake jpeg libtool \ pkgconfig python USE_XORG= xmu USE_GNOME= gtk20 diff --git a/graphics/commons-utilities/Makefile b/graphics/commons-utilities/Makefile index 0bdd02e007c6..4039b288fe73 100644 --- a/graphics/commons-utilities/Makefile +++ b/graphics/commons-utilities/Makefile @@ -12,7 +12,6 @@ COMMENT= Wikimedia Commons (MediaWiki) utilities for bulk image uploading LICENSE= GPLv3 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \ p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \ @@ -20,7 +19,7 @@ RUN_DEPENDS= p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2:${PORTSDIR}/www/py-mechanize \ exiv2:${PORTSDIR}/graphics/exiv2 -USES= perl5 python +USES= jpeg perl5 python USE_PERL5= run NO_BUILD= yes diff --git a/graphics/cthumb/Makefile b/graphics/cthumb/Makefile index c41f56d8974b..52bf5e893731 100644 --- a/graphics/cthumb/Makefile +++ b/graphics/cthumb/Makefile @@ -11,12 +11,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Themeable web picture album generator RUN_DEPENDS= ${LOCALBASE}/bin/pnmscale:${PORTSDIR}/graphics/netpbm \ - ${LOCALBASE}/bin/djpeg:${PORTSDIR}/graphics/jpeg \ ${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead \ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \ p5-URI>=0:${PORTSDIR}/net/p5-URI -USES= perl5 +USES= jpeg:run perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-themedir=${DATADIR} CONFIGURE_ENV= perl_path=${PERL} diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 2b3131b204a6..9e562740b7f4 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -17,13 +17,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Free software system for statistical visualization LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= DOCS DOCS_DISTFILES= dpsnapsh.pdf:doc -USES= fortran +USES= fortran jpeg USE_XORG= x11 xi NO_WRKSUBDIR= yes MAXOBV?= 400000 # Change if you need more observations/variable diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile index 0d1798de202f..619327cd3fea 100644 --- a/graphics/dcraw-m/Makefile +++ b/graphics/dcraw-m/Makefile @@ -12,7 +12,6 @@ COMMENT= Modified Decoder for RAW files from digital cameras LICENSE= GPLv2 LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick @@ -20,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= waitman GH_TAGNAME= 1392579 -USES= pkgconfig +USES= jpeg pkgconfig CFLAGS += -Wall -I${LOCALBASE}/include \ `MagickWand-config --cflags --cppflags` \ diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index b58e2e1f3bee..00fbe8c0408c 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -10,12 +10,11 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Decoder for RAW files from digital cameras LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/jasper LDFLAGS+= -L${LOCALBASE}/lib -lm -ljasper -ljpeg -llcms2 -USES= tar:xz +USES= jpeg tar:xz PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index 95b66b01e25b..dff629a2e200 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -46,7 +46,7 @@ SQUISH_DESC= Enable DXT compression via libsquish NVTT_DESC= Enable NVidia texture tools support SIMD_DESC= Enable SIMD autodetection (AltiVec, SSE3,...) -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper JASPER_CONFIGURE_ENABLE=jp2 diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index c23030355b3c..ad774caf41c7 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -13,8 +13,7 @@ COMMENT= DjVu base libraries and utilities LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ @@ -22,7 +21,7 @@ CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ TIFF_CFLAGS="-I${LOCALBASE}/include" \ TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -USES= cpe iconv libtool pathfix +USES= cpe iconv jpeg libtool pathfix CPE_VENDOR= djvulibre_project USE_LDCONFIG= yes CONFLICTS= djvulibre-nox11-3* diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index ce8b98616301..a437db154489 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -13,8 +13,7 @@ COMMENT= Tool for image blending with multiresolution splines BUILD_DEPENDS= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \ OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - liblcms2.so:${PORTSDIR}/graphics/lcms2 \ +LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libxmi.so:${PORTSDIR}/graphics/plotutils \ libtiff.so:${PORTSDIR}/graphics/tiff \ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \ @@ -23,7 +22,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ RUN_DEPENDS= OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR USE_AUTOTOOLS= automake:env autoconf:env -USES= gmake compiler:features makeinfo +USES= compiler:features gmake jpeg makeinfo # We need a newer version of makeinfo for this. # Remove this line when we remove texinfo from the base system. CONFIGURE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" diff --git a/graphics/eom/Makefile b/graphics/eom/Makefile index 1cf802fea9f5..ec494b63d032 100644 --- a/graphics/eom/Makefile +++ b/graphics/eom/Makefile @@ -11,11 +11,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Eye of MATE image viewer BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg PORTSCOUT= limitw:1,even -USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ +USES= desktop-file-utils gettext gmake jpeg libtool pathfix pkgconfig \ tar:xz USE_MATE= desktop icontheme USE_XORG= x11 diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile index e5f11205f47e..ec0933e5eba6 100644 --- a/graphics/epeg/Makefile +++ b/graphics/epeg/Makefile @@ -12,10 +12,8 @@ MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ MAINTAINER= bf@FreeBSD.org COMMENT= Immensely fast JPEG thumbnailing library -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - GNU_CONFIGURE= yes -USES= libtool pathfix tar:bzip2 +USES= jpeg libtool pathfix tar:bzip2 USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile index 5df4bee6387c..bfb426c66e0c 100644 --- a/graphics/exact-image/Makefile +++ b/graphics/exact-image/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libagg.so:${PORTSDIR}/graphics/agg \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ libgif.so:${PORTSDIR}/graphics/giflib \ @@ -27,7 +26,7 @@ LIB_DEPENDS= libagg.so:${PORTSDIR}/graphics/agg \ #hack to get custom exactcode configure script to enable tiff support with #broken headers on c++ in base system: CPPFLAGS+= -fpermissive -I${LOCALBASE}/include -USES= gmake perl5 pkgconfig python tar:bzip2 +USES= gmake jpeg perl5 pkgconfig python tar:bzip2 USE_XORG= x11 HAS_CONFIGURE= yes INSTALL_WRKSRC= ${WRKSRC}/objdir diff --git a/graphics/exiftran/Makefile b/graphics/exiftran/Makefile index 21bd1b2bb56b..aa413f9822f5 100644 --- a/graphics/exiftran/Makefile +++ b/graphics/exiftran/Makefile @@ -11,13 +11,12 @@ MASTER_SITES= http://www.kraxel.org/releases/fbida/ MAINTAINER= mm@FreeBSD.org COMMENT= Command line utility to transform jpeg files -LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= uidfix +USES= jpeg uidfix MAKE_ARGS+= WRKSRC=${WRKSRC} BINDIR=${PREFIX}/bin MANDIR=${MANPREFIX}/man PLIST_FILES= bin/exiftran bin/thumbnail.cgi \ diff --git a/graphics/exrtools/Makefile b/graphics/exrtools/Makefile index 8d9f83be0bef..e1f351a312d1 100644 --- a/graphics/exrtools/Makefile +++ b/graphics/exrtools/Makefile @@ -14,11 +14,10 @@ COMMENT= Utilities for manipulating with HDR images in OpenEXR format LICENSE= GPLv2 LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes -USES= pkgconfig gmake +USES= gmake jpeg pkgconfig CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile index 52bbeb913923..64b04dfb7fc6 100644 --- a/graphics/flam3/Makefile +++ b/graphics/flam3/Makefile @@ -12,11 +12,10 @@ MAINTAINER= john.c.prather@gmail.com COMMENT= Flame Renderer LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libxml2.so:${PORTSDIR}/textproc/libxml2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libxml2.so:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig +USES= gmake jpeg libtool pathfix pkgconfig CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 6f212d1833f5..07b3374881eb 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -12,14 +12,13 @@ MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/ \ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= Graphics library for fast creation of images -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 CONFLICTS= bazaar-1.* -USES= tar:xz pkgconfig pathfix libtool:keepla shebangfix +USES= jpeg libtool:keepla pathfix pkgconfig shebangfix tar:xz SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 4462979d7bb1..6418b6488d49 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -16,7 +16,6 @@ LICENSE= MIT LIB_DEPENDS= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \ libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjson-c.so:${PORTSDIR}/devel/json-c \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff @@ -46,7 +45,7 @@ GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes -USES= gmake tar:xz +USES= gmake jpeg tar:xz PLIST_SUB= PORTVERSION=${PORTVERSION} PORTDATA= * diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile index 9f4ec74f5933..7402f9d1ad40 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -13,10 +13,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Easy to use fast C API for creating charts and graphs LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libfreetype.so:${PORTSDIR}/print/freetype2 -USES= uidfix +USES= jpeg uidfix MAKEFILE= ${FILESDIR}/Makefile MAKE_ARGS= PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" USE_LDCONFIG= yes diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 5cbb27286042..30c20c46bda3 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -17,10 +17,9 @@ LICENSE= LGPL20 # or later LICENSE_FILE= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libtiff.so:${PORTSDIR}/graphics/tiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libtiff.so:${PORTSDIR}/graphics/tiff -USES= cpe gmake libtool pathfix tar:bzip2 +USES= cpe gmake jpeg libtool pathfix tar:bzip2 CPE_VENDOR= gnome USE_XORG= xt xi x11 USE_GNOME= gtk12 diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index a5d9d1626890..05e4f6d0dc00 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -32,8 +32,8 @@ OPTIONS_DEFINE= JASPER JPEG PNG TIFF OPTIONS_DEFAULT=JASPER JPEG PNG TIFF JASPER_CONFIGURE_WITH= libjasper JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper -JPEG_CONFIGURE_WITPNGH= libjpeg -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_CONFIGURE_WITH= libjpeg +JPEG_USES= jpeg PNG_CONFIGURE_WITH= libpng PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png TIFF_CONFIGURE_WITH= libtiff diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 37faf2561677..bdaa472149a7 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -106,7 +106,7 @@ PLIST_SUB+= JP2="@comment " .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+=--without-libjpeg diff --git a/graphics/gegl3/Makefile b/graphics/gegl3/Makefile index 0de4e9826cfb..0e1ac85e8d9b 100644 --- a/graphics/gegl3/Makefile +++ b/graphics/gegl3/Makefile @@ -68,7 +68,7 @@ GRAPHVIZ_CONFIGURE_WITH= graphviz JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper JASPER_CONFIGURE_WITH= jasper -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_WITH= libjpeg LCMS2_LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 77290d990eba..1d7cbb2a1206 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -13,10 +13,9 @@ COMMENT= Yet another GTK+ based image viewer 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 -USES= gmake libtool pkgconfig +USES= gmake jpeg libtool pkgconfig GNU_CONFIGURE= yes USE_GNOME= gtk20 USE_XORG= xinerama ice diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index f3c98d2f3870..4d37fae6f571 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -17,7 +17,6 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libgegl-0.2.so:${PORTSDIR}/graphics/gegl \ @@ -25,7 +24,7 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes GNU_CONFIGURE= yes -USES+= cpe desktop-file-utils gettext gmake libtool pathfix \ +USES+= cpe desktop-file-utils gettext gmake jpeg libtool pathfix \ pkgconfig tar:bzip2 USE_XORG= xpm xmu xext USE_GNOME+= intlhack gtk20 diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile index a058cb724423..526b6b701707 100644 --- a/graphics/gle-graphics/Makefile +++ b/graphics/gle-graphics/Makefile @@ -18,9 +18,9 @@ BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4 BITMAP_IMAGES_CONFIGURE_WITH= jpeg=${LOCALBASE} tiff=${LOCALBASE} png=${LOCALBASE} BITMAP_IMAGES_DESC= Support for including bitmap images -BITMAP_IMAGES_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +BITMAP_IMAGES_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiffxx.so:${PORTSDIR}/graphics/tiff +BITMAP_IMAGES_USES= jpeg CONFIGURE_ARGS= --with-extrafonts=yes diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 7dee98752148..75fb44820dfc 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -12,7 +12,6 @@ COMMENT= GNU Flash movie player LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libltdl.so:${PORTSDIR}/devel/libltdl \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libcurl.so:${PORTSDIR}/ftp/curl \ libgif.so:${PORTSDIR}/graphics/giflib \ libspeex.so:${PORTSDIR}/audio/speex \ @@ -20,7 +19,7 @@ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ CONFLICTS= gnash-devel-[0-9]* -USES= cpe tar:bzip2 pkgconfig gmake libtool +USES= cpe gmake jpeg libtool pkgconfig tar:bzip2 GNU_CONFIGURE= yes WANT_SDL= yes USE_GCC= any diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile index 10d9dc6ae58e..fcb58abb4433 100644 --- a/graphics/gnofract4d/Makefile +++ b/graphics/gnofract4d/Makefile @@ -12,10 +12,9 @@ COMMENT= Weird GNOME fractal generator LICENSE= BSD3CLAUSE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= desktop-file-utils pathfix pkgconfig python shared-mime-info +USES= desktop-file-utils jpeg pathfix pkgconfig python shared-mime-info USE_GNOME= gnomeprefix intlhack libgnomeui pygtk2 USE_PYTHON= distutils autoplist USE_GCC= yes diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 4098faa4d970..3b5805d0382a 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -19,9 +19,9 @@ COMMENT= The Grid Analysis and Display System BUILD_DEPENDS= ${LOCALBASE}/lib/libudunits2.a:${PORTSDIR}/science/udunits \ ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png +USES= jpeg GNU_CONFIGURE= yes CONFIGURE_ENV+= SUPPLIBS="${LOCALBASE}" CONFIGURE_ARGS+= --enable-dyn-supplibs \ diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 8bad9be268ab..deeba50bed2d 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -11,14 +11,13 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Graph Visualization Software from AT&T and Bell Labs LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libgd.so:${PORTSDIR}/${GD_PORT} -USES= cpe gmake bison libtool:keepla pkgconfig pathfix shebangfix +USES= bison cpe gmake jpeg libtool:keepla pkgconfig pathfix shebangfix GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index 1e7e72664970..d60f9c76e438 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -38,7 +38,7 @@ BGI_DESC= BGI image format support BGI_CONFIGURE_ENABLE= bgi BMP_DESC= BMP image format support BMP_CONFIGURE_ENABLE= bmp -JPEG_LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile index 88c292ebf21c..9d6111045c67 100644 --- a/graphics/gstreamer-plugins-gl/Makefile +++ b/graphics/gstreamer-plugins-gl/Makefile @@ -11,10 +11,9 @@ DISTNAME= ${PORTNAME:S/gstreamer/gst/}-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer OpenGL video plugin -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 +USES= gettext gmake jpeg libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GSTREAMER= yes USE_XORG= ice x11 diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index 769bf9d5e20f..9170d4036635 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -9,13 +9,12 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Image viewer and browser for KDE 4 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libexiv2.so:${PORTSDIR}/graphics/exiv2 \ +LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libpng.so:${PORTSDIR}/graphics/png USE_KDE4= kactivities kdelibs kdeprefix baloo kfilemetadata \ libkdcraw libkipi libkonq automoc4 soprano -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource jpeg pkgconfig tar:xz USE_QT4= corelib gui opengl qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes diff --git a/graphics/hugin-devel/Makefile b/graphics/hugin-devel/Makefile index 8aa91f6f360a..7d32a6c45c17 100644 --- a/graphics/hugin-devel/Makefile +++ b/graphics/hugin-devel/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libImath.so:${PORTSDIR}/graphics/ilmbase \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblensfun.so:${PORTSDIR}/graphics/lensfun \ libpano13.so:${PORTSDIR}/graphics/libpano13 \ libpng.so:${PORTSDIR}/graphics/png \ @@ -39,7 +38,7 @@ OPTIONS_DEFAULT= PANOMATIC AUTOPANOSIFTC PANOMATIC_DESC= Install graphics/panomatic AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c -USES= cmake gettext pkgconfig tar:bzip2 +USES= cmake gettext jpeg pkgconfig tar:bzip2 CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index b9f34eb69afc..bb5733c5357e 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -14,7 +14,6 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libImath.so:${PORTSDIR}/graphics/ilmbase \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblensfun.so:${PORTSDIR}/graphics/lensfun \ libpano13.so:${PORTSDIR}/graphics/libpano13 \ libpng.so:${PORTSDIR}/graphics/png \ @@ -31,7 +30,7 @@ OPTIONS_DEFAULT= PANOMATIC AUTOPANOSIFTC PANOMATIC_DESC= Install graphics/panomatic AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c -USES= cmake gettext pkgconfig tar:bzip2 desktop-file-utils python \ +USES= cmake gettext jpeg pkgconfig tar:bzip2 desktop-file-utils python \ shared-mime-info compiler:features CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} diff --git a/graphics/iccexamin/Makefile b/graphics/iccexamin/Makefile index eb07909c1db2..c07aea0c6d4a 100644 --- a/graphics/iccexamin/Makefile +++ b/graphics/iccexamin/Makefile @@ -17,11 +17,10 @@ LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ liblcms.so:${PORTSDIR}/graphics/lcms \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liboyranos.so:${PORTSDIR}/graphics/oyranos MAKE_JOBS_UNSAFE= yes -USES= desktop-file-utils gettext iconv pkgconfig tar:bzip2 +USES= desktop-file-utils gettext iconv jpeg pkgconfig tar:bzip2 HAS_CONFIGURE= yes INSTALLS_ICONS= yes USE_XORG= # diff --git a/graphics/icontact/Makefile b/graphics/icontact/Makefile index 74b92c083b78..32d20b77d52e 100644 --- a/graphics/icontact/Makefile +++ b/graphics/icontact/Makefile @@ -10,10 +10,9 @@ MASTER_SITES= http://www.panix.com/~mbh/icontact/ MAINTAINER= ports@FreeBSD.org COMMENT= Combines multiples images to create a single customisable image -RUN_DEPENDS= ${LOCALBASE}/bin/ppmmake:${PORTSDIR}/graphics/netpbm \ - ${LOCALBASE}/bin/cjpeg:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS= ${LOCALBASE}/bin/ppmmake:${PORTSDIR}/graphics/netpbm -USES= shebangfix +USES= jpeg:run shebangfix SHEBANG_FILES= icontact post-patch: diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile index eec45b5d93eb..90a7eb38fc8b 100644 --- a/graphics/ida/Makefile +++ b/graphics/ida/Makefile @@ -13,8 +13,7 @@ COMMENT= Small and fast motif-based image viewer and editor LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libexif.so:${PORTSDIR}/graphics/libexif +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif OPTIONS_DEFINE= GIF PCF PNG SANE TIFF WEBP DOCS OPTIONS_DEFAULT= GIF PNG TIFF @@ -22,7 +21,7 @@ PCD_DESC= Enable PhotoCD support SANE_DESC= Enable SANE support USE_PERL5= build -USES= desktop-file-utils iconv gmake motif perl5 +USES= desktop-file-utils gmake iconv jpeg motif perl5 MAKEFILE= GNUmakefile MAKE_ARGS= JPEG_VER=80 verbose=yes diff --git a/graphics/iiview/Makefile b/graphics/iiview/Makefile index ef6979682f6c..57aaf3f76543 100644 --- a/graphics/iiview/Makefile +++ b/graphics/iiview/Makefile @@ -12,9 +12,9 @@ COMMENT= Thumb viewer application LICENSE= BSD2CLAUSE BUILD_DEPENDS= ${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png \ - ${LOCALBASE}/lib/libtiff.a:${PORTSDIR}/graphics/tiff \ - ${LOCALBASE}/lib/libjpeg.a:${PORTSDIR}/graphics/jpeg + ${LOCALBASE}/lib/libtiff.a:${PORTSDIR}/graphics/tiff +USES= jpeg:build USE_XORG= xpm x11 USE_GITHUB= yes diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile index ed3c0972b44d..361bfc41ba80 100644 --- a/graphics/imageindex/Makefile +++ b/graphics/imageindex/Makefile @@ -10,12 +10,11 @@ MASTER_SITES= http://www.edwinh.org/imageindex/release/ \ MAINTAINER= johnjen@reynoldsnet.org COMMENT= Digital photo gallery tool -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ mplayer:${PORTSDIR}/multimedia/mplayer \ p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info -USES= perl5 +USES= jpeg perl5 USE_PERL5= run MAKE_ARGS+= PERLPATH=${PERL} PREFIX=${STAGEDIR}${PREFIX} diff --git a/graphics/imageworsener/Makefile b/graphics/imageworsener/Makefile index 0735a4845a8f..d7af1107d17b 100644 --- a/graphics/imageworsener/Makefile +++ b/graphics/imageworsener/Makefile @@ -25,7 +25,7 @@ USES= libtool JPEG_CONFIGURE_OFF= --without-jpeg JPEG_CONFIGURE_ON= --with-jpeg-include-dir=${LOCALBASE}/include --with-jpeg-lib-dir=${LOCALBASE}/lib -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg PNG_CONFIGURE_OFF= --without-png PNG_CONFIGURE_ON= --with-png-include-dir=${LOCALBASE}/include --with-png-lib-dir=${LOCALBASE}/lib PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index d20ba1c6b00b..52aaa2f12c12 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -54,7 +54,7 @@ PLIST_SUB= X11="" .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+= --without-jpeg diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index 0c029d486b5b..9314af209fc7 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -14,14 +14,13 @@ COMMENT= SGI's Open Inventor (TM) LICENSE= LGPL21 -LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 CONFLICTS= Coin-[0-9]* SoXt-[0-9]* USE_XORG= x11 xext xi xp xt USE_GL= glu glw -USES= iconv gmake motif +USES= gmake iconv jpeg motif USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index 597505136d82..92a2838f03e6 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -12,12 +12,11 @@ COMMENT= Extensible vector graphics editor with LaTeX support LICENSE= GPLv3 # (or later) -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= dos2unix gmake iconv lua:52 pkgconfig +USES= dos2unix gmake iconv jpeg lua:52 pkgconfig DOS2UNIX_FILES= ipelib/Makefile USE_GNOME= cairo USE_QT4= gui moc_build qmake_build rcc_build uic_build diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile index e0816e1ad223..50bb81c3bf0c 100644 --- a/graphics/iulib/Makefile +++ b/graphics/iulib/Makefile @@ -13,14 +13,13 @@ COMMENT= Library of image understanding-related algorithms LICENSE= APACHE20 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff OPTIONS_DEFINE= SDL VIDIO SDL_DESC= Enable SDL for graphical debugging VIDIO_DESC= Enable Video Input/Output (using ffmpeg) -USES= autoreconf libtool python:build tar:tgz +USES= autoreconf jpeg libtool python:build tar:tgz GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index d49b586415c5..071540d186c3 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -11,11 +11,9 @@ MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \ MAINTAINER= dinoex@FreeBSD.org COMMENT= Implementation of the codec specified in the JPEG-2000 standard -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - LICENSE= MIT -USES= zip libtool:keepla +USES= jpeg libtool:keepla zip GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/jhead/Makefile b/graphics/jhead/Makefile index af67af8d44a6..bc41366fb383 100644 --- a/graphics/jhead/Makefile +++ b/graphics/jhead/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.sentex.net/~mwandel/${PORTNAME}/ \ MAINTAINER= sunpoet@FreeBSD.org COMMENT= EXIF JPEG header manipulation tool -RUN_DEPENDS= ${LOCALBASE}/bin/jpegtran:${PORTSDIR}/graphics/jpeg +USES= jpeg:run OPTIONS_DEFINE= DOCS diff --git a/graphics/jp2a/Makefile b/graphics/jp2a/Makefile index 04e4f38fff9f..fa69c027e55f 100644 --- a/graphics/jp2a/Makefile +++ b/graphics/jp2a/Makefile @@ -10,10 +10,9 @@ MASTER_SITES= SF MAINTAINER= ehaupt@FreeBSD.org COMMENT= Converts JPG images to ASCII -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libcurl.so:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -USES= tar:bzip2 +USES= jpeg tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-jpeg-prefix=${LOCALBASE} \ diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile index 2fa2fb4216e5..9c90cfc2d3c8 100644 --- a/graphics/jpeginfo/Makefile +++ b/graphics/jpeginfo/Makefile @@ -12,8 +12,7 @@ COMMENT= Generate listing and MD5, check jpegs for error, delete broken ones LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile index b55116c8a70b..4c3eece4ce3c 100644 --- a/graphics/jpegoptim/Makefile +++ b/graphics/jpegoptim/Makefile @@ -13,8 +13,7 @@ COMMENT= Utility to optimize jpeg files LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libjpeg=${LOCALBASE} diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile index c6af00e63482..97bb2d90ac11 100644 --- a/graphics/jpgtn/Makefile +++ b/graphics/jpgtn/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= SUNSITE/apps/graphics/misc MAINTAINER= ports@FreeBSD.org COMMENT= Creates thumbnails of JPEG images -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libjpeg=${LOCALBASE} diff --git a/graphics/jslice/Makefile b/graphics/jslice/Makefile index dc2a4633cf6f..351bfde73a19 100644 --- a/graphics/jslice/Makefile +++ b/graphics/jslice/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.pldaniels.com/jslice/ MAINTAINER= ports@FreeBSD.org COMMENT= Graphics tool to split up a JPEG image and provide HTML for the slices -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES= jpeg PLIST_FILES= bin/jslice diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index 0fa7366ce1e9..e6f8eb9555c7 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -11,10 +11,9 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Image viewer and organizer for KDE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libexiv2.so:${PORTSDIR}/graphics/exiv2 +LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 -USES= cmake:outsource pkgconfig shebangfix tar:bzip2 +USES= cmake:outsource jpeg pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= script/open-raw.pl script/kpa-backup.sh USE_KDE4= kdelibs kdeprefix libkdcraw libkipi automoc4 USE_QT4= phonon sql \ diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index b0d6872db298..3b286e3b2c2e 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -31,7 +31,7 @@ PORTDOCS= * JPEGICC_CONFIGURE_OFF= --without-jpeg JPEGICC_CONFIGURE_ON= --with-jpeg=${LOCALBASE} -JPEGICC_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEGICC_USES= jpeg TIFFICC_CONFIGURE_OFF= --without-tiff TIFFICC_CONFIGURE_ON= --with-tiff=${LOCALBASE} TIFFICC_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff diff --git a/graphics/lcms2/Makefile b/graphics/lcms2/Makefile index da093ac3c7a6..4a0444b1c1fd 100644 --- a/graphics/lcms2/Makefile +++ b/graphics/lcms2/Makefile @@ -28,7 +28,7 @@ PORTDOCS= * JPEGICC_CONFIGURE_OFF= --without-jpeg JPEGICC_CONFIGURE_ON= --with-jpeg=${LOCALBASE} -JPEGICC_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEGICC_USES= jpeg TIFFICC_CONFIGURE_OFF= --without-tiff TIFFICC_CONFIGURE_ON= --with-tiff=${LOCALBASE} TIFFICC_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 19239706cef4..92e1f339899b 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -11,14 +11,13 @@ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= C library for efficient image processing and image analysis operations LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libwebp.so:${PORTSDIR}/graphics/webp CONFLICTS= leptonlib-[0-9]* -USES= libtool +USES= jpeg libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile index fdbecc662255..0d5fea859689 100644 --- a/graphics/libafterimage/Makefile +++ b/graphics/libafterimage/Makefile @@ -14,12 +14,11 @@ COMMENT= Generic imaging library originally designed for AfterStep LICENSE= LGPL21 # or later LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfreetype.so:${PORTSDIR}/print/freetype2 -USES= pkgconfig tar:bzip2 +USES= jpeg pkgconfig tar:bzip2 USE_XORG= xext USE_GNOME= librsvg2 GNU_CONFIGURE= yes diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile index 0d423d7c6b3e..5b9c441c0848 100644 --- a/graphics/libbpg/Makefile +++ b/graphics/libbpg/Makefile @@ -13,8 +13,7 @@ COMMENT= BPG (Better Portable Graphics) is a new image format LICENSE= BSD2CLAUSE LGPL21 LICENSE_COMB= multi -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= SDL JCTVC X265 OPTIONS_DEFAULT=SDL JCTVC @@ -24,14 +23,14 @@ USE_LDCONFIG= yes SDL_USE= SDL=image X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 -.include <bsd.port.options.mk> - JCTVC_DESC= Enable JCTVC (best quality but slow) for the encoder JCTVCHI_DESC= Use bit depths > 12 with JCTVC (experimental) -USES= gmake compiler:c++11-lib +USES= compiler:c++11-lib gmake jpeg CFLAGS+= -fPIC -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.include <bsd.port.options.mk> + do-configure: .if ! ${PORT_OPTIONS:MSDL} ${REINPLACE_CMD} -e 's/^USE_BPGVIEW=y$$/#USE_BPGVIEW=/' ${WRKSRC}/Makefile diff --git a/graphics/libgaiagraphics/Makefile b/graphics/libgaiagraphics/Makefile index adc2bf9d455f..1d6fbf2b7fec 100644 --- a/graphics/libgaiagraphics/Makefile +++ b/graphics/libgaiagraphics/Makefile @@ -13,10 +13,9 @@ COMMENT= Library supporting common-utility raster handling methods LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libcairo.so:${PORTSDIR}/graphics/cairo -USES= gmake iconv pathfix pkgconfig libtool +USES= gmake iconv jpeg pathfix pkgconfig libtool USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile index 392aaed4b63c..fc540eeb55aa 100644 --- a/graphics/libgeotiff/Makefile +++ b/graphics/libgeotiff/Makefile @@ -15,11 +15,10 @@ COMMENT= Library for reading and writing GeoTIFF information tags LICENSE= MIT LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libproj.so:${PORTSDIR}/graphics/proj \ libtiff.so:${PORTSDIR}/graphics/tiff -USES= libtool +USES= jpeg libtool CONFIGURE_ARGS= --datadir=${DATADIR} \ --disable-doxygen-doc \ --disable-doxygen-dot \ diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile index 2a0fc988b3e5..9daa1141c196 100644 --- a/graphics/libgfx/Makefile +++ b/graphics/libgfx/Makefile @@ -15,12 +15,11 @@ LICENSE= MIT LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ - libgzstream.so:${PORTSDIR}/devel/gzstream \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libgzstream.so:${PORTSDIR}/devel/gzstream BUILD_WRKSRC= ${WRKSRC}/src -USES= gmake +USES= gmake jpeg USE_GL= glu USE_XORG= x11 xext xft xinerama GNU_CONFIGURE= yes diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 09c9532c26b4..a80c23d0947a 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -37,7 +37,7 @@ OPTIONS_SUB= yes GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd GD_CONFIGURE_WITH= gd -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg LIBEXIF_LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif LIBEXIF_CONFIGURE_OFF= --with-libexif=no diff --git a/graphics/libgxps/Makefile b/graphics/libgxps/Makefile index 38d6cb63a1a0..754f2edc446e 100644 --- a/graphics/libgxps/Makefile +++ b/graphics/libgxps/Makefile @@ -13,11 +13,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GObject based library for rendering XPS documents LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ liblcms2.so:${PORTSDIR}/graphics/lcms2 -USES= gettext gmake libtool pathfix pkgconfig tar:xz +USES= gettext gmake jpeg libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes USE_GNOME= cairo gnomeprefix glib20 intlhack GNU_CONFIGURE= yes diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index 9387f3a7dee3..49920603c4c8 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -13,14 +13,13 @@ COMMENT= Library of image format handlers for Tk4.1 and later BUILD_DEPENDS= dtplite:${PORTSDIR}/devel/tcllib LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff PLIST_SUB+= SHLIB_NAME="${SHLIB_NAME}" \ SHLIB_LINK="${SHLIB_LINK}" WRKSRC= ${WRKDIR}/tkimg${PORTVERSION:R} -USES= tk tar:bzip2 +USES= jpeg tk tar:bzip2 # We don't need the bundled libraries: EXTRACT_AFTER_ARGS= --exclude '*/libz/*' --exclude zlib \ diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile index bf11f184a109..8629a0746a9c 100644 --- a/graphics/libkdcraw-kde4/Makefile +++ b/graphics/libkdcraw-kde4/Makefile @@ -12,7 +12,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= LibRaw interface for KDE LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms.so:${PORTSDIR}/graphics/lcms \ libxml2.so:${PORTSDIR}/textproc/libxml2 \ libraw.so:${PORTSDIR}/graphics/libraw @@ -21,7 +20,7 @@ CMAKE_ARGS+= -DWITH_OpenMP:BOOL=False \ -DENABLE_RAWSPEED=True USE_KDE4= automoc4 kdeprefix kdelibs -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource jpeg pkgconfig tar:xz USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile index 8e0ec4794964..8d9fa5d22357 100644 --- a/graphics/libmng/Makefile +++ b/graphics/libmng/Makefile @@ -11,8 +11,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION} \ MAINTAINER= mi@aldan.algebra.com COMMENT= Multiple-image Network Graphics (MNG) reference library -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - liblcms.so:${PORTSDIR}/graphics/lcms +LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms OPTIONS_DEFINE= MNG_OPTIMIZE MNG_OPTIMIZE_DESC= Use vendor's new optimization flags @@ -20,7 +19,7 @@ MNG_OPTIMIZE_DESC= Use vendor's new optimization flags MAKEFILE= ${FILESDIR}/Makefile.bsd #USE_BZIP2= yes # Please, uncomment on next upgrade -USES= uidfix +USES= jpeg uidfix USE_LDCONFIG= yes MNG_OPTIMIZE_MAKE_ARGS= WITH_MNG_OPTIMIZE=true diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile index de0159836ed9..0e751a72a24d 100644 --- a/graphics/libopenraw/Makefile +++ b/graphics/libopenraw/Makefile @@ -13,10 +13,9 @@ COMMENT= Library for camera RAW files decoding LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs -USES= compiler:c++11-lang libtool pkgconfig tar:bzip2 +USES= compiler:c++11-lang jpeg libtool pkgconfig tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 3089768d7346..cc8b76a8e9ff 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -13,13 +13,12 @@ COMMENT= Cross-platform library behind Panorama Tools and other photo stitchers 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 USE_GNOME= gtk20 glib20 pango atk -USES= autoreconf libtool +USES= autoreconf jpeg libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include/gtk-2.0 \ -I${LOCALBASE}/include/glib-2.0 \ diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile index 92f6cad8e321..f3cc5510a79a 100644 --- a/graphics/librasterlite/Makefile +++ b/graphics/librasterlite/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libspatialite.so:${PORTSDIR}/databases/spatialite \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libgeos.so:${PORTSDIR}/graphics/geos \ libproj.so:${PORTSDIR}/graphics/proj \ @@ -25,7 +24,7 @@ LIB_DEPENDS= libspatialite.so:${PORTSDIR}/databases/spatialite \ libfreexl.so:${PORTSDIR}/textproc/freexl GNU_CONFIGURE= yes -USES= gmake iconv libtool pathfix pkgconfig +USES= gmake iconv jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile index ffd45430e6a3..e452faaab83f 100644 --- a/graphics/librasterlite2/Makefile +++ b/graphics/librasterlite2/Makefile @@ -18,7 +18,6 @@ LIB_DEPENDS= libspatialite.so:${PORTSDIR}/databases/spatialite \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libgif.so:${PORTSDIR}/graphics/giflib \ libgeos.so:${PORTSDIR}/graphics/geos \ @@ -30,7 +29,7 @@ LIB_DEPENDS= libspatialite.so:${PORTSDIR}/databases/spatialite \ libcurl.so:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes -USES= gmake iconv libtool pathfix pkgconfig +USES= gmake iconv jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index 763909fc47ba..3660663ae51d 100644 --- a/graphics/libraw/Makefile +++ b/graphics/libraw/Makefile @@ -15,10 +15,8 @@ COMMENT= Library for manipulating raw images LICENSE= LGPL21 CDDL LICENSE_COMB= dual -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - USE_LDCONFIG= yes -USES= cpe pathfix pkgconfig libtool +USES= cpe libtool jpeg pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-examples --disable-jasper CFLAGS+= -fPIC diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile index 19e833386fa6..ea4ddbffb74c 100644 --- a/graphics/libreatlas/Makefile +++ b/graphics/libreatlas/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= libmspack.so:${PORTSDIR}/archivers/libmspack \ libcairo.so:${PORTSDIR}/graphics/cairo \ libgeos.so:${PORTSDIR}/graphics/geos \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \ librasterlite.so:${PORTSDIR}/graphics/librasterlite \ libpng.so:${PORTSDIR}/graphics/png \ @@ -32,7 +31,7 @@ LIB_DEPENDS= libmspack.so:${PORTSDIR}/archivers/libmspack \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes -USES= pkgconfig gettext gmake iconv +USES= gettext gmake iconv jpeg pkgconfig USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango diff --git a/graphics/libsixel/Makefile b/graphics/libsixel/Makefile index e9c2498ffaee..d540c81213e8 100644 --- a/graphics/libsixel/Makefile +++ b/graphics/libsixel/Makefile @@ -35,7 +35,7 @@ CURL_CONFIGURE_WITH= libcurl GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd GD_CONFIGURE_WITH= gd -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg JPEG_CPPFLAGS= -I${LOCALBASE}/include JPEG_LDFLAGS= -L${LOCALBASE}/lib diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile index 7066dd4c2025..1f108b07f04f 100644 --- a/graphics/libsvg-cairo/Makefile +++ b/graphics/libsvg-cairo/Makefile @@ -11,12 +11,11 @@ MASTER_SITES= http://cairographics.org/snapshots/ MAINTAINER= gnome@FreeBSD.org COMMENT= SVG rendering library -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libsvg.so:${PORTSDIR}/graphics/libsvg \ +LIB_DEPENDS= libsvg.so:${PORTSDIR}/graphics/libsvg \ libcairo.so:${PORTSDIR}/graphics/cairo GNU_CONFIGURE= yes -USES= libtool pathfix pkgconfig +USES= jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes PLIST_FILES= include/svg-cairo.h \ lib/libsvg-cairo.a \ diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile index ea1f67e9d37f..536f38a046aa 100644 --- a/graphics/libsvg/Makefile +++ b/graphics/libsvg/Makefile @@ -12,12 +12,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Parser for SVG content in files or buffers LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes USE_GNOME= libxml2 -USES= iconv libtool pathfix pkgconfig +USES= iconv jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 0edd5704f343..6eee70dce710 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -13,8 +13,7 @@ COMMENT= Tools and library for converting Microsoft WMF (windows metafile) 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 \ libfreetype.so:${PORTSDIR}/print/freetype2 CONFLICTS?= libwmf-nox11-[0-9]* @@ -24,7 +23,7 @@ CONFIGURE_ARGS= --with-sys-gd=no \ --with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \ --with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts INSTALL_TARGET= install-strip -USES= libtool +USES= jpeg libtool USE_GNOME= libxml2 USE_LDCONFIG= yes diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile index 897d1ee1e2f8..e124c4b7315b 100644 --- a/graphics/lprof-devel/Makefile +++ b/graphics/lprof-devel/Makefile @@ -13,11 +13,10 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open source color profiler LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libvigraimpex.so:${PORTSDIR}/graphics/vigra -USES= cmake desktop-file-utils tar:bzip2 +USES= cmake desktop-file-utils jpeg tar:bzip2 USE_XORG= x11 xext sm ice xxf86vm USE_QT4= corelib gui qt3support svg assistantclient \ linguisttools_build qmake_build moc_build uic_build rcc_build diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile index 51e084ec3e7f..cfb00952e320 100644 --- a/graphics/luminance-qt5/Makefile +++ b/graphics/luminance-qt5/Makefile @@ -16,14 +16,13 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libtiff.so:${PORTSDIR}/graphics/tiff \ libgsl.so:${PORTSDIR}/math/gsl \ libraw_r.so:${PORTSDIR}/graphics/libraw \ libboost_system.so:${PORTSDIR}/devel/boost-libs -USES= cmake:outsource pkgconfig tar:bzip2 +USES= cmake:outsource jpeg pkgconfig tar:bzip2 USE_QT5= concurrent declarative gui printsupport sql webkit xml \ buildtools_build linguist_build qmake_build \ imageformats_run diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile index 70b13cf41136..12807aab84a9 100644 --- a/graphics/luminance/Makefile +++ b/graphics/luminance/Makefile @@ -15,14 +15,13 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libtiff.so:${PORTSDIR}/graphics/tiff \ libgsl.so:${PORTSDIR}/math/gsl \ libraw_r.so:${PORTSDIR}/graphics/libraw \ libboost_system.so:${PORTSDIR}/devel/boost-libs -USES= cmake tar:bzip2 +USES= cmake jpeg tar:bzip2 USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build imageformats_run INSTALLS_ICONS= yes diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index ca06f7fbd2ec..639a985cf05e 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -91,7 +91,7 @@ BUILD_DEPENDS+= sqlite3>=3.7.12:${PORTSDIR}/databases/sqlite3 .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .else MAKE_ARGS+= JPEG=False .endif diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 137dec48cd39..0660302f9baf 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -15,10 +15,9 @@ LICENSE= MIT LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ libproj.so:${PORTSDIR}/graphics/proj \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libgif.so:${PORTSDIR}/graphics/giflib -USES= cpe cmake:outsource +USES= cpe cmake:outsource jpeg CPE_VENDOR= umn USE_GNOME= libxml2 LDFLAGS+= -L${LOCALBASE} -pthread diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index 72119375e9cf..7182e0d54381 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -11,14 +11,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Unofficial extensions of POV-Ray LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff #RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} INSTALL_WRKSRC= ${WRKSRC}/unix -USES= gmake tar:bzip2 +USES= gmake jpeg tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= COMPILED_BY="ports@FreeBSD.org" diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile index 4e42f8bca242..14ac0bcf1edf 100644 --- a/graphics/metapixel/Makefile +++ b/graphics/metapixel/Makefile @@ -14,12 +14,11 @@ COMMENT= Photomosaic generator LICENSE= GPLv2 LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png CPPFLAGS+= $$(libpng-config --I_opts) -I${LOCALBASE}/include -I. LDFLAGS+= $$(libpng-config --L_opts) -L${LOCALBASE}/lib -USES= gmake shebangfix +USES= gmake jpeg shebangfix SHEBANG_FILES= metapixel-prepare metapixel-sizesort PLIST_FILES= bin/metapixel \ diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile index eb1db1145c1b..0330ab94f6f6 100644 --- a/graphics/mtpaint/Makefile +++ b/graphics/mtpaint/Makefile @@ -13,14 +13,13 @@ COMMENT= Simple painting program LICENSE= GPLv3 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 \ libgif.so:${PORTSDIR}/graphics/giflib \ libfreetype.so:${PORTSDIR}/print/freetype2 USE_GNOME= gtk20 -USES= desktop-file-utils gmake iconv pkgconfig tar:bzip2 +USES= desktop-file-utils gmake iconv jpeg pkgconfig tar:bzip2 HAS_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \ diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index 06db33341d34..44a3a57ffefa 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -15,13 +15,12 @@ LICENSE= AGPLv3 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libfreetype.so:${PORTSDIR}/print/freetype2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ libopenjp2.so:${PORTSDIR}/graphics/openjpeg LIBS+= -L${LOCALBASE}/lib MAKE_ARGS= build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes -USES= cpe compiler:c++11-lang pkgconfig gmake +USES= cpe compiler:c++11-lang gmake jpeg pkgconfig USE_XORG= x11 xext CPE_VENDOR= artifex diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 4f2d3d1413c6..08e4f913f450 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -12,13 +12,12 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Toolkit for conversion of images between different formats LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ libjasper.so:${PORTSDIR}/graphics/jasper \ libxml2.so:${PORTSDIR}/textproc/libxml2 -USES= tar:tgz gmake perl5 shebangfix +USES= gmake jpeg perl5 shebangfix tar:tgz CFLAGS+= -DPNG_DEPSTRUCT= -Iutil MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}" MAKEFILE= GNUmakefile diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile index 6bee4f1799cd..79268b0fde4e 100644 --- a/graphics/nvidia-texture-tools/Makefile +++ b/graphics/nvidia-texture-tools/Makefile @@ -12,11 +12,10 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Texture Tools with support for DirectX 10 texture formats LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR -USES= alias cmake +USES= alias cmake jpeg CMAKE_ARGS= -DNVTT_SHARED=TRUE CFLAGS+= -fPIC diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 2f8066301532..ffad2a05a787 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -43,7 +43,7 @@ PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png JPEG_CONFIGURE_WITH= jpeg -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg TIFF_CONFIGURE_WITH= tiff TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile index e51e4c99d177..fe0469ea6a6d 100644 --- a/graphics/ocropus/Makefile +++ b/graphics/ocropus/Makefile @@ -11,7 +11,6 @@ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= The OCRopus(tm) open source document analysis and OCR system LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libiulib.so:${PORTSDIR}/graphics/iulib \ libgsl.so:${PORTSDIR}/math/gsl @@ -23,7 +22,7 @@ SDL_DESC= Enable SDL for graphical debugging LEPTONICA_DESC= Enable Leptonica image analysis MAKE_JOBS_UNSAFE= yes -USES= autoreconf gmake python:build +USES= autoreconf gmake jpeg python:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-fst --without-tesseract --with-iulib=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index e377887e1055..38c5aa01ef87 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -10,7 +10,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 universal document viewer LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libkscreen.so:${PORTSDIR}/graphics/libkscreen \ libqca.so:${PORTSDIR}/devel/qca \ libtiff.so:${PORTSDIR}/graphics/tiff \ @@ -25,7 +24,7 @@ USE_KDE4= kdelibs kdeprefix automoc4 qimageblitz kactivities \ libkexiv2 USE_QT4= corelib declarative gui opengl xml \ qmake_build moc_build uic_build rcc_build -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource jpeg pkgconfig tar:xz USE_LDCONFIG= yes OPTIONS_DEFINE= DVI diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 8fc901b25c24..ed691a08fe28 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -119,7 +119,7 @@ CMAKE_ARGS+= -DWITH_JASPER:BOOL=Off .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg CMAKE_ARGS+= -DWITH_JPEG:BOOL=On .else CMAKE_ARGS+= -DWITH_JPEG:BOOL=Off diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile index 07f108a2f58c..ff92e2678f5b 100644 --- a/graphics/openrm/Makefile +++ b/graphics/openrm/Makefile @@ -13,9 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DEMO_DISTFILE:S/$/:demo/} MAINTAINER= ports@FreeBSD.org COMMENT= Development environment used to build 2D/3D/stereo graphics -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - -USES= shebangfix perl5 +USES= jpeg perl5 shebangfix SHEBANG_FILES= doc/*.pl USE_GL= glu USE_XORG= xmu diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index d51b92905a4a..c49f062957c5 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -17,13 +17,12 @@ LICENSE_NAME= OpenSceneGraph Public License LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff CONFLICTS= osg-[0-9]* -USES= alias cmake:outsource pkgconfig zip +USES= alias cmake:outsource jpeg pkgconfig zip USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index ed74f44ff30b..377bdcefb9a2 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -17,13 +17,12 @@ LICENSE_NAME= OpenSceneGraph Public License LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff CONFLICTS= osg-devel-[0-9]* -USES= alias cmake:outsource pkgconfig zip +USES= alias cmake:outsource jpeg pkgconfig zip USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes diff --git a/graphics/p5-Image-Scale/Makefile b/graphics/p5-Image-Scale/Makefile index dc8d68e31f5c..385e0639010b 100644 --- a/graphics/p5-Image-Scale/Makefile +++ b/graphics/p5-Image-Scale/Makefile @@ -13,11 +13,10 @@ COMMENT= Perl module for fast, high-quality fixed-point image resizing LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png TEST_DEPENDS= p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings -USES= perl5 +USES= jpeg perl5 USE_PERL5= configure .include <bsd.port.mk> diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile index fe3be78fc73f..11577b3234fe 100644 --- a/graphics/p5-Imager/Makefile +++ b/graphics/p5-Imager/Makefile @@ -16,14 +16,13 @@ LICENSE_COMB= dual BUILD_DEPENDS= p5-Devel-CheckLib>=0:${PORTSDIR}/devel/p5-Devel-CheckLib LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libt1.so:${PORTSDIR}/devel/t1lib \ libtiff.so:${PORTSDIR}/graphics/tiff TEST_DEPENDS= p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \ p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C -USES= perl5 +USES= jpeg perl5 USE_PERL5= configure CONFIGURE_ENV= IM_CFLAGS="${CFLAGS}" \ IM_INCPATH=${LOCALBASE}/include \ diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile index 12e85e02e3b3..19bb7f25fef8 100644 --- a/graphics/p5-Tk-JPEG-Lite/Makefile +++ b/graphics/p5-Tk-JPEG-Lite/Makefile @@ -13,10 +13,9 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Very simplistic image viewer that loads JPEG images BUILD_DEPENDS= p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= perl5 +USES= jpeg perl5 USE_PERL5= configure post-patch: diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index a3d77c95ddc6..5b0f95c66a2a 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -35,7 +35,7 @@ IMPOSE_CXXFLAGS= -I${LUA_INCDIR} IMPOSE_LDFLAGS= -L${LUA_LIBDIR} JPEG_CMAKE_ON= -DWANT_LIBJPEG:BOOL=TRUE -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg PNG_CMAKE_ON= -DWANT_PNG:BOOL=TRUE PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 06a92594b3eb..bd61776ca15e 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -14,15 +14,14 @@ COMMENT?= PDF rendering library 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 \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data -USES= cpe gmake libtool pathfix pkgconfig tar:xz +USES= cpe gmake jpeg libtool pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= libxml2 GNU_CONFIGURE= yes diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index be7fbd9f3e61..099f2c9d4573 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -15,11 +15,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Persistence of Vision Ray Tracer LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libtiff.so:${PORTSDIR}/graphics/tiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libtiff.so:${PORTSDIR}/graphics/tiff USE_XORG= x11 -USES= gmake tar:bzip2 +USES= gmake jpeg tar:bzip2 GNU_CONFIGURE= yes OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 70daaea9f7f2..17dfefa34231 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -66,9 +66,9 @@ CONFIGURE_ARGS+=--without-libpng .if ${PORT_OPTIONS:MJPEG} .if ${PORT_OPTIONS:MSTATIC} -BUILD_DEPENDS+= jpeg>=6b:${PORTSDIR}/graphics/jpeg +USES+= jpeg:build .else -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .endif .else CONFIGURE_ARGS+=--without-libjpeg diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index 0945bba3f41a..e4dfed9e4aad 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -13,13 +13,12 @@ DISTNAME= Imaging-${PORTVERSION} MAINTAINER= mainland@apeiron.net COMMENT= The Python Imaging Library -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - liblcms.so:${PORTSDIR}/graphics/lcms \ +LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ libfreetype.so:${PORTSDIR}/print/freetype2 UNIQUENAME= py-${PORTNAME} -USES= python +USES= jpeg python DIST_SUBDIR= python USE_PYTHON= distutils autoplist concurrent diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile index f691afd94fba..7d09e0182350 100644 --- a/graphics/py-pillow/Makefile +++ b/graphics/py-pillow/Makefile @@ -22,7 +22,7 @@ LCMS_DESC= Little Color Management System TKINTER_DESC= Tkinter (Tcl/Tk) BitmapImage & PhotoImage support FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg LCMS_LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TKINTER_USES= tk:build diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile index becc6b6a4bc2..3e5f9678a7a2 100644 --- a/graphics/pyro/Makefile +++ b/graphics/pyro/Makefile @@ -13,8 +13,7 @@ COMMENT= Simple OpenGL-based firework simulator BROKEN= No public distfiles -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg USE_GL= gl glut USE_XORG= xi xmu xext diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index 5220fd13c381..14ace010f3fc 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -10,12 +10,11 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt plugins for several image formats -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libmng.so:${PORTSDIR}/graphics/libmng \ +LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff -USES= pkgconfig +USES= jpeg pkgconfig USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml QT_DIST= yes diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile index 4f6d822c94de..85ab353c18d2 100644 --- a/graphics/rawstudio/Makefile +++ b/graphics/rawstudio/Makefile @@ -12,8 +12,7 @@ COMMENT= Open-source program to read and manipulate RAW photo images LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ liblcms.so:${PORTSDIR}/graphics/lcms \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -23,7 +22,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 -USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig +USES= desktop-file-utils gettext gmake jpeg libtool pathfix pkgconfig GNU_CONFIGURE= yes USE_GNOME= gtk20 libxml2 gconf2 USE_SQLITE= 3 diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 0596064c4272..76db7b2d761c 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv3 LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ libiptcdata.so:${PORTSDIR}/graphics/libiptcdata \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ @@ -23,7 +22,7 @@ LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 -USES= cmake:outsource pkgconfig compiler:features desktop-file-utils dos2unix tar:xz +USES= cmake:outsource compiler:features desktop-file-utils dos2unix jpeg pkgconfig tar:xz DOS2UNIX_REGEX= .*\.(cc|h) USE_GNOME= gtk20 glib20 USE_LDCONFIG= yes diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile index 48346cd49adf..228133d5294d 100644 --- a/graphics/renrot/Makefile +++ b/graphics/renrot/Makefile @@ -13,9 +13,9 @@ COMMENT= Program to rename and rotate image files according to EXIF tags LICENSE= ART20 BUILD_DEPENDS= p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool -RUN_DEPENDS:= ${BUILD_DEPENDS} jpegtran:${PORTSDIR}/graphics/jpeg +RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= perl5 +USES= perl5 jpeg:run USE_PERL5= configure PORTDOCS= AUTHORS README README.russian ChangeLog NEWS TODO diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile index bdcb3ba3f748..ff4635f62874 100644 --- a/graphics/sam2p/Makefile +++ b/graphics/sam2p/Makefile @@ -13,12 +13,11 @@ COMMENT= Converts raster (bitmap) image formats into PS or PDF files LICENSE= GPLv2 RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - cjpeg:${PORTSDIR}/graphics/jpeg \ tif22pnm:${PORTSDIR}/graphics/tif22pnm OPTIONS_DEFINE= DOCS EXAMPLES -USES= gmake perl5 +USES= gmake jpeg:run perl5 USE_PERL5= build USE_GCC= any USE_GHOSTSCRIPT_RUN= yes diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile index f67ec49cd5c5..e91c7da1b46e 100644 --- a/graphics/scantailor/Makefile +++ b/graphics/scantailor/Makefile @@ -12,13 +12,12 @@ COMMENT= Interactive post-processing tool for scanned pages LICENSE= GPLv3 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ libpng.so:${PORTSDIR}/graphics/png BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= cmake gettext iconv +USES= cmake gettext iconv jpeg USE_GCC= yes USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ linguist_build diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile index b98dfcbab865..0d432766fcd2 100644 --- a/graphics/sdl2_image/Makefile +++ b/graphics/sdl2_image/Makefile @@ -22,7 +22,7 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= JPEG PNG TIFF WEBP OPTIONS_DEFAULT=JPEG PNG TIFF WEBP -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpg PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 91f340543b43..24b7f31502e2 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -23,7 +23,7 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= JPEG PNG TIFF WEBP OPTIONS_DEFAULT=JPEG PNG TIFF WEBP -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpg PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png diff --git a/graphics/sdump/Makefile b/graphics/sdump/Makefile index 4bc97f11e870..212da4cf739a 100644 --- a/graphics/sdump/Makefile +++ b/graphics/sdump/Makefile @@ -11,8 +11,7 @@ COMMENT= Sixel image dumper LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libsixel.so:${PORTSDIR}/graphics/libsixel USE_GITHUB= yes @@ -21,6 +20,7 @@ GH_TAGNAME= c5fb55b PLIST_FILES= bin/sdump libexec/w3m/yaimg-sixel +USES= jpeg MAKEFILE= makefile #CFLAGS += -I${LOCALBASE}/include -Wall -Wextra -std=c99 -pedantic -O3 -pipe -s diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile index 54af290b56bd..627ba6386b12 100644 --- a/graphics/seejpeg/Makefile +++ b/graphics/seejpeg/Makefile @@ -10,10 +10,9 @@ MASTER_SITES= SUNSITE/apps/graphics/viewers/svga MAINTAINER= ports@FreeBSD.org COMMENT= Console graphics viewer using the svga console graphics library -LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib -USES= gmake tar:tgz +USES= gmake jpeg tar:tgz ALL_TARGET= seejpeg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 7eec7bb37b36..83b0bc161717 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -19,11 +19,10 @@ LICENSE_PERMS_unknown= no-dist-sell no-pkg-sell LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \ libvorbis.so:${PORTSDIR}/audio/libvorbis \ libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libgif.so:${PORTSDIR}/graphics/giflib \ libpng.so:${PORTSDIR}/graphics/png -USES= pathfix libtool +USES= jpeg libtool pathfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mpeg2enc INSTALL_TARGET= install-strip diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile index f73bd7c22bd4..6e465ee8e3e4 100644 --- a/graphics/simpleviewer/Makefile +++ b/graphics/simpleviewer/Makefile @@ -13,12 +13,11 @@ COMMENT= Small and simple OpenGL image viewer with transparency support LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libgif.so:${PORTSDIR}/graphics/giflib \ libImlib2.so:${PORTSDIR}/graphics/imlib2 -USES= tar:bzip2 +USES= jpeg tar:bzip2 USE_GL= glut WRKSRC= ${WRKDIR}/sviewgl-src MAKE_ARGS= CC="${CXX}" diff --git a/graphics/sk1libs/Makefile b/graphics/sk1libs/Makefile index 48620bda7ed3..58b5c39365e5 100644 --- a/graphics/sk1libs/Makefile +++ b/graphics/sk1libs/Makefile @@ -12,12 +12,11 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Set of python libraries for sK1 Project LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ - libfreetype.so:${PORTSDIR}/print/freetype2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libfreetype.so:${PORTSDIR}/print/freetype2 PROJECTHOST= uniconvertor -USES= python +USES= jpeg python USE_PYTHON= distutils PYDISTUTILS_BUILD_TARGET=build_ext PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib \ diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile index ed7c8f8e3092..56eee2a74e5a 100644 --- a/graphics/sswf/Makefile +++ b/graphics/sswf/Makefile @@ -11,12 +11,11 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Library and script language tool to create Flash movies -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libfreetype.so:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= bison iconv libtool pkgconfig +USES= bison iconv jpeg libtool pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile index bea7a91b34a9..347d660460a4 100644 --- a/graphics/stamp/Makefile +++ b/graphics/stamp/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Adds a graphical, configurable timestamp to a grayscale image -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile index 388f3dd5b5e1..1c7122957a21 100644 --- a/graphics/swftools/Makefile +++ b/graphics/swftools/Makefile @@ -14,13 +14,12 @@ COMMENT= SWF manipulation and generation utilities LICENSE= GPLv2 LIB_DEPENDS= libt1.so:${PORTSDIR}/devel/t1lib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libgif.so:${PORTSDIR}/graphics/giflib \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -USES= gmake pkgconfig +USES= gmake jpeg pkgconfig USE_GL= glut GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_lib_zzip_zzip_file_open=no diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index ba45f6787fa7..da6c5ae5b0c4 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -14,10 +14,9 @@ COMMENT= Tools and library routines for working with TIFF images LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libjbig.so:${PORTSDIR}/graphics/jbigkit +LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit -USES= cpe libtool +USES= cpe jpeg libtool CPE_PRODUCT= libtiff CPE_VERSION= ${DISTVERSION:C/[a-z]+//} CPE_UPDATE= ${DISTVERSION:C/[0-9.]+//} diff --git a/graphics/tiffgt/Makefile b/graphics/tiffgt/Makefile index 870b962180d6..af958c478a6d 100644 --- a/graphics/tiffgt/Makefile +++ b/graphics/tiffgt/Makefile @@ -13,11 +13,10 @@ COMMENT= X11 Tools for working with TIFF images LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libjbig.so:${PORTSDIR}/graphics/jbigkit \ +LIB_DEPENDS= libjbig.so:${PORTSDIR}/graphics/jbigkit \ libtiff.so:${PORTSDIR}/graphics/tiff -USES= cpe libtool +USES= cpe jpeg libtool CPE_PRODUCT= libtiff CPE_VERSION= ${DISTVERSION:C/[a-z]+//} CPE_UPDATE= ${DISTVERSION:C/[0-9.]+//} diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 52607baaf3d1..73a569b3064d 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -13,14 +13,13 @@ COMMENT= System dedicated to the visualization of huge graphs LICENSE= LGPL3 LIB_DEPENDS= libquazip.so:${PORTSDIR}/archivers/quazip \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libOGDF.so:${PORTSDIR}/math/ogdf \ libfreetype.so:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} -USES= cmake:outsource compiler:c++11-lib dos2unix execinfo python \ +USES= cmake:outsource compiler:c++11-lib dos2unix execinfo jpeg python \ shebangfix SHEBANG_FILES= tulip-config.in DOS2UNIX_FILES= software/tulip/src/main.cpp diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 0f14e45cacb2..f7f0f3079955 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -11,14 +11,13 @@ COMMENT= Read and manipulate raw images from various digital cameras LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ liblcms2.so:${PORTSDIR}/graphics/lcms2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-extras -USES= gettext pkgconfig gmake desktop-file-utils +USES= desktop-file-utils gettext gmake jpeg pkgconfig CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 1ba70fdf3751..0ae0c62d1cc6 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -57,8 +57,6 @@ CMAKE_ARGS+= -DWITH_VIGRANUMPY=0 PLIST_SUB+= PYTHON="@comment " .endif -.include <bsd.port.pre.mk> - # Vigra's CMakeLists.txt does not support disabling those so we hook them # as dependencies here unconditionally (without OPTIONS=) even though if # they are not present then Vigra/CMake will do without them (they are not @@ -75,7 +73,7 @@ LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff .endif .if !defined(WITHOUT_VIGRA_JPEG) -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .endif .if !defined(WITHOUT_VIGRA_PNG) @@ -100,4 +98,4 @@ post-patch: # FIXME: This is ugly @${RM} ${WRKSRC}/include/vigra/*.orig -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 6792a6b3b429..ae4d9b595bc5 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -16,7 +16,6 @@ LIB_DEPENDS= libcfitsio.so:${PORTSDIR}/astro/cfitsio \ liborc-0.4.so:${PORTSDIR}/devel/orc \ libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libexif.so:${PORTSDIR}/graphics/libexif \ libpng.so:${PORTSDIR}/graphics/png \ @@ -27,7 +26,7 @@ LIB_DEPENDS= libcfitsio.so:${PORTSDIR}/astro/cfitsio \ libgirepository-1.0.so:${PORTSDIR}/devel/gobject-introspection RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USES= cpe gettext gmake libtool pathfix pkgconfig shebangfix +USES= cpe gettext gmake jpeg libtool pathfix pkgconfig shebangfix SHEBANG_FILES= tools/vips-${PORTVERSION:R} tools/vipsprofile USE_GNOME= glib20 libgsf libxml2 pango GNU_CONFIGURE= yes diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile index 7f954c642ead..163597e16612 100644 --- a/graphics/webp/Makefile +++ b/graphics/webp/Makefile @@ -13,7 +13,6 @@ COMMENT= Google WebP image format conversion tool LICENSE= BSD3CLAUSE LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff @@ -31,7 +30,7 @@ CONFIGURE_ARGS= --enable-libwebpdecoder \ --enable-libwebpmux \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig USE_LDCONFIG= yes -USES= compiler:c11 libtool +USES= compiler:c11 jpeg libtool X11_CONFIGURE_OFF= build_vwebp=no X11_CONFIGURE_ON= build_vwebp=yes diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index d26e89aa4832..794234f03841 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -12,12 +12,11 @@ MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ MAINTAINER= devel@stasyan.com COMMENT= Graphical VRML97 editor and animation tool -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png LICENSE= GPLv2 -USES= motif +USES= jpeg motif USE_XORG= xft USE_GL= gl glu glut USE_SDL= sdl diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 08f87368c44e..3a93a9f553f7 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -11,8 +11,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= mjl@luckie.org.nz COMMENT= Drawing program for X11 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig @@ -20,7 +19,7 @@ CONFLICTS= xfig-[12].* xfig-3.1* xfig-3.2.[1234]* WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} -USES= imake +USES= imake jpeg USE_XORG= ice sm x11 xaw xext xi xmu xpm xt USE_CSTD= gnu89 CFLAGS+= -Wno-return-type diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index bf3026c9e395..91444c22dfef 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -11,12 +11,11 @@ DISTNAME= xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig MAINTAINER= lichray@gmail.com COMMENT= Utilities to display images in X11 -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png CONFLICTS_INSTALL= xloadimage-* -USES= imake +USES= imake jpeg USE_XORG= xi WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER} diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 3e3ae0f2a31e..f458436412d0 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -12,7 +12,6 @@ COMMENT= Simple paint program LICENSE= GPLv3 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfreetype.so:${PORTSDIR}/print/freetype2 \ @@ -24,7 +23,7 @@ RUN_DEPENDS= psselect:${PORTSDIR}/print/psutils \ USE_XORG= xft xmu xpm USE_GHOSTSCRIPT_RUN=yes GNU_CONFIGURE= yes -USES= libtool:build shebangfix tar:bzip2 +USES= jpeg libtool:build shebangfix tar:bzip2 SHEBANG_FILES= share/bin/imgmerge share/bin/xpaint_ocr CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 6ea1e7f449ca..e137612e9391 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -12,15 +12,14 @@ COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy) 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 \ libfreetype.so:${PORTSDIR}/print/freetype2 \ liblcms.so:${PORTSDIR}/graphics/lcms BUILD_DEPENDS= scanimage:${PORTSDIR}/graphics/sane-backends RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= gmake pkgconfig +USES= gmake jpeg pkgconfig USE_GNOME= gtk20 gdkpixbuf2 GNU_CONFIGURE= yes diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index d1b8bac4ba86..34edde51fffe 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -18,12 +18,11 @@ PATCHFILES= xv-3.10a-enhancements.20070520-20081216.diff MAINTAINER?= dinoex@FreeBSD.org COMMENT?= X11 program that displays images of various formats -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ libjasper.so:${PORTSDIR}/graphics/jasper -USES= imake +USES= imake jpeg USE_XORG= xext x11 xt OPTIONS_DEFINE= M17N DOCS diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile index 48d4d2564933..23afdb1ace18 100644 --- a/graphics/yafray/Makefile +++ b/graphics/yafray/Makefile @@ -11,9 +11,7 @@ MASTER_SITES= http://freebsd.nsu.ru/distfiles/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Fast XML based raytracer -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - -USES= scons +USES= jpeg scons USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index 5f4359ab8852..03375c587993 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -12,11 +12,9 @@ COMMENT= ZBar barcode reader LICENSE= LGPL21 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= iconv libtool gmake pkgconfig +USES= iconv jpeg libtool gmake pkgconfig INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-jpeg=yes diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile index 4684a559ba1c..a66eae499862 100644 --- a/graphics/zgv/Makefile +++ b/graphics/zgv/Makefile @@ -12,13 +12,12 @@ COMMENT= Graphics viewer for SVGAlib LICENSE= GPLv2 # (or later) -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff OPTIONS_DEFINE= SDL DOCS -USES= gmake makeinfo +USES= gmake jpeg makeinfo ALL_TARGET= zgv info INFO= zgvrc diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons index 112f8e6d5e04..73c6d62bcc3b 100644 --- a/lang/io/Makefile.addons +++ b/lang/io/Makefile.addons @@ -127,9 +127,9 @@ LIB_DEPENDS+= libglfw.so.0:${PORTSDIR}/graphics/glfw2 # Image # .if ${PORT_OPTIONS:MImage} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff +USES+= jpeg .endif # diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile index 9fa17a6732a1..c3889caa3560 100644 --- a/lang/ofc/Makefile +++ b/lang/ofc/Makefile @@ -12,12 +12,11 @@ COMMENT= The Objective-C Foundation Classes library LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libfreetype.so:${PORTSDIR}/print/freetype2 PROJECTHOST= ${PORTNAME} USE_SDL= sdl -USES= libtool objc pathfix +USES= jpeg libtool objc pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 8335c5c05e79..660c47d1e0fd 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -87,8 +87,8 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "gd" LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png +USES+= jpeg CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext index 4535f2b7f32b..ebccd09874c5 100644 --- a/lang/php55/Makefile.ext +++ b/lang/php55/Makefile.ext @@ -87,8 +87,8 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "gd" LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png +USES+= jpeg CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index edacc0e78e18..8991791cdb18 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -87,8 +87,8 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "gd" LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png +USES+= jpeg CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile index 08d227307cf0..75d92bc1be3e 100644 --- a/lang/pike78/Makefile +++ b/lang/pike78/Makefile @@ -13,8 +13,7 @@ DISTNAME= Pike-v${PORTVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Dynamic programming language with a syntax similar to C++ -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libgdbm.so:${PORTSDIR}/databases/gdbm \ libpcre.so:${PORTSDIR}/devel/pcre \ libgmp.so:${PORTSDIR}/math/gmp \ @@ -79,7 +78,7 @@ CONFIGURE_ARGS+= --without-debug \ --without-sybase \ --prefix=${PREFIX} -USES= bison gettext gmake perl5 +USES= bison gettext gmake jpeg perl5 PLIST_FILES= bin/pike bin/pike78 bin/hilfe \ man/man1/pike.1.gz diff --git a/lang/racket/Makefile b/lang/racket/Makefile index 5406d0883fac..83982e64e833 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -18,7 +18,6 @@ COMMENT= Interactive, integrated, graphical Scheme programming environment LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi \ libcairo.so:${PORTSDIR}/graphics/cairo \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png MAKE_JOBS_UNSAFE=yes @@ -36,7 +35,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/racket-${PORTVERSION}/src -USES= iconv libtool tar:tgz +USES= iconv jpeg libtool tar:tgz USE_LDCONFIG= yes USE_GNOME= pango USE_SQLITE= 3 diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 8a83c5a6e2e8..c9396ee3981f 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -11,7 +11,6 @@ MAINTAINER= johans@FreeBSD.org COMMENT= Edinburgh-style Prolog compiler LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libodbc.so:${PORTSDIR}/databases/unixODBC CFLAGS+= -I${LOCALBASE}/include @@ -21,7 +20,7 @@ SWIPLDIR= ${PORTNAME:C/-//}-${PORTVERSION} NOPRECIOUSMAKEVARS= yes USE_XORG= xft xpm xt -USES= pkgconfig pathfix gmake shebangfix +USES= gmake jpeg pathfix pkgconfig shebangfix MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ARCH=${ARCH}-${OPSYS:tl} diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile index 3a040e7e6e29..1ecd4ba4a8ad 100644 --- a/mail/spamprobe/Makefile +++ b/mail/spamprobe/Makefile @@ -46,7 +46,7 @@ PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png # JPEG support JPEG_CONFIGURE_WITH=jpeg -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg .include <bsd.port.options.mk> diff --git a/math/R/Makefile b/math/R/Makefile index 011d299e801d..6aef58114e5d 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -200,7 +200,7 @@ USE_GHOSTSCRIPT_RUN= yes .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg CONFIGURE_ARGS+= --with-jpeglib .else CONFIGURE_ARGS+= --without-jpeglib diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile index 2f25292d4eab..fef1f4d2ee8a 100644 --- a/math/giacxcas/Makefile +++ b/math/giacxcas/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpari.so:${PORTSDIR}/math/pari \ libmpfr.so:${PORTSDIR}/math/mpfr \ libgsl.so:${PORTSDIR}/math/gsl \ @@ -29,7 +28,7 @@ LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ NO_CDROM= French documentation is for non-commercial use only GNU_CONFIGURE= yes -USES= desktop-file-utils gettext gmake libtool shebangfix +USES= desktop-file-utils gettext gmake jpeg libtool shebangfix USE_GL= gl USE_XORG= x11 xcursor xft xi USE_TEX= latex:build dvipsk:build diff --git a/math/grace/Makefile b/math/grace/Makefile index 07d9fe4ea705..d51749057d41 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -16,12 +16,11 @@ COMMENT= Powerful 2D plotting tool (successor of xmgr) LICENSE= GPLv2 LIB_DEPENDS= libt1.so:${PORTSDIR}/devel/t1lib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libXbae.so:${PORTSDIR}/x11-toolkits/xbae RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils -USES= gmake motif +USES= gmake jpeg motif GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-grace-home=${DATADIR} \ --with-extra-incpath=${LOCALBASE}/include \ diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile index 4c24e0cdd928..c8d77da0b5c0 100644 --- a/math/ploticus/Makefile +++ b/math/ploticus/Makefile @@ -12,11 +12,11 @@ MAINTAINER?= linimon@FreeBSD.org COMMENT?= Generates plots and graphs from data LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libming.so:${PORTSDIR}/graphics/ming \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 +USES= jpeg BUILD_WRKSRC= ${WRKSRC}/src FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config diff --git a/math/reduce/Makefile b/math/reduce/Makefile index 0ff3a6fa35b6..4d15dd02cc09 100644 --- a/math/reduce/Makefile +++ b/math/reduce/Makefile @@ -38,9 +38,9 @@ OPTIONS_SUB= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCSL} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff +USES+= jpeg CPPFLAGS+= `freetype-config --cflags` LDFLAGS+= `freetype-config --libs` .else diff --git a/math/sage/Makefile b/math/sage/Makefile index 064b518916a4..c8ebd2d3a84f 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -23,8 +23,7 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ automake:${PORTSDIR}/devel/automake \ autoconf:${PORTSDIR}/devel/autoconf LIB_DEPENDS= libatlas.so:${PORTSDIR}/math/atlas \ - liblapack.so:${PORTSDIR}/math/lapack \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + liblapack.so:${PORTSDIR}/math/lapack RUN_DEPENDS= bash:${PORTSDIR}/shells/bash pre-extract: @@ -37,7 +36,7 @@ pre-extract: PLIST_FILES= bin/sage USE_TEX= latex:build -USES= gmake iconv tk perl5 +USES= gmake iconv jpeg tk perl5 MAKE_JOBS_SAFE= yes # Optimization flags will be defined by the source diff --git a/math/surf/Makefile b/math/surf/Makefile index 050bf3dabab2..2cb6a24770e8 100644 --- a/math/surf/Makefile +++ b/math/surf/Makefile @@ -12,10 +12,10 @@ COMMENT= Visualize some real algebraic geometry LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libgmp.so:${PORTSDIR}/math/gmp +USES= jpeg USE_XORG= x11 xmu USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 7ccd78e91ce1..44ec24d3d0c8 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff @@ -26,7 +25,7 @@ CONFLICTS= vtk-4* SUB_FILES= vtk.3 -USES= cmake:outsource +USES= cmake:outsource jpeg USE_XORG= xt USE_LDCONFIG= ${PREFIX}/lib/vtk-${PORTVERSION:R} CXXFLAGS+= -DUSE_INTERP_ERRORLINE diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index dce565dc5c83..d55d8fb0f0ff 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libexpat.so:${PORTSDIR}/textproc/expat2 @@ -29,7 +28,7 @@ UNIQUENAME= ${PKGBASE} CONFLICTS= vtk-4* USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} USE_XORG= xt -USES= cmake:outsource +USES= cmake:outsource jpeg CXXFLAGS+= -I${LOCALBASE}/include VTK_SHORT_VER= ${PORTVERSION:R} diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile index b2c39d853d8a..817fbd469459 100644 --- a/misc/wmweather+/Makefile +++ b/misc/wmweather+/Makefile @@ -21,12 +21,11 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libtiff.so:${PORTSDIR}/graphics/tiff \ libHermes.so:${PORTSDIR}/graphics/Hermes \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libgif.so:${PORTSDIR}/graphics/giflib WRKSRC= ${WRKDIR}/wmweather+-${PORTVERSION} -USES= iconv +USES= iconv jpeg USE_XORG= xpm GNU_CONFIGURE= yes LDFLAGS+= -lm diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index e7c7f2319296..a020e8b11718 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -13,10 +13,9 @@ COMMENT= Free program to do streaming video via the web LICENSE= GPLv2 # (or later) -LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl -USES= libtool +USES= jpeg libtool USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 9202c5a50530..c38719855a56 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -14,8 +14,7 @@ LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libswscale.so:${PORTSDIR}/multimedia/ffmpeg CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib @@ -23,7 +22,7 @@ CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig --enable-gio GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= compiler:c++11-lib libtool pathfix pkgconfig +USES= compiler:c++11-lib jpeg libtool pathfix pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile index 4f6fdba330ac..74ee3ac8a63c 100644 --- a/multimedia/gmerlin/Makefile +++ b/multimedia/gmerlin/Makefile @@ -51,7 +51,7 @@ ESOUND_USE= gnome=esound ESOUND_CONFIGURE_OFF= --disable-esd JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF= --disable-jack -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --disable-libjpeg LIBVISUAL_LIB_DEPENDS= libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04 LIBVISUAL_CONFIGURE_OFF=--disable-libvisual diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile index 64d2136e5da1..07993915d1a0 100644 --- a/multimedia/gpac-libgpac/Makefile +++ b/multimedia/gpac-libgpac/Makefile @@ -43,7 +43,7 @@ OPENGL_CONFIGURE_ENABLE=3d XVIDEO_LIB_DEPENDS= libXv.so:${PORTSDIR}/x11/libXv XVIDEO_CONFIGURE_OFF= --disable-x11-xv --disable-x11-shm IPV6_CONFIGURE_ENABLE= ipv6 -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ON= --use-jpeg=local JPEG_CONFIGURE_OFF= --use-jpeg=no PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index cd8675ced941..a2e4794d63b6 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -57,7 +57,8 @@ CFLAGS+= -I${LOCALBASE}/include DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc -.include <bsd.port.pre.mk> +# Include bsd.port.options.mk and not bsd.port.pre.mk to be able to use USES +.include <bsd.port.options.mk> .if ${ARCH}=="i386" PLIST_SUB+= I386="" @@ -166,4 +167,4 @@ USE_GCC= any .endif .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index e78c4c48189a..078617f6733d 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -343,7 +343,7 @@ gst_jack_PLIST_FILES= ${GST_LIB_DIR}/libgstjack.la \ gst_jack_DIST= good # jpeg -gst_jpeg_LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +gst_jpeg_USES= jpeg gst_jpeg_PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.la \ ${GST_LIB_DIR}/libgstjpeg.so @@ -613,6 +613,7 @@ DIST= ${gst_${GST_PLUGIN}_DIST} gst_${GST_PLUGIN}_BUILD_DEPENDS?= gst_${GST_PLUGIN}_LIB_DEPENDS?= gst_${GST_PLUGIN}_RUN_DEPENDS?= +gst_${GST_PLUGIN}_USES?= gst_${GST_PLUGIN}_PLIST_FILES?=${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so \ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.a \ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.la @@ -631,6 +632,7 @@ gst_${GST_PLUGIN}_USE_GSTREAMER?= BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS} LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS} RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS} +USES+= ${gst_${GST_PLUGIN}_USES} PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES} PLIST_DIRS= ${gst_${GST_PLUGIN}_PLIST_DIRS} PLIST_DIRSTRY= ${gst_${GST_PLUGIN}_PLIST_DIRSTRY} diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index cc546fa332d3..a73b927070a7 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -65,7 +65,8 @@ SOVERSION= 0.405.0 PLIST_SUB+= VERSION="${VERSION}" \ SOVERSION="${SOVERSION}" -.include <bsd.port.pre.mk> +# Include bsd.port.options.mk and not bsd.port.pre.mk to be able to use USES +.include <bsd.port.options.mk> .if ${GST_PLUGIN} == "base" DIST= base @@ -171,4 +172,4 @@ USE_GCC= any pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index f997f60643ad..6ac0d280847c 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -271,7 +271,7 @@ gst_gsm_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm gst_jack_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack # jpeg -gst_jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +gst_jpeg_USES= jpeg # kate gst_kate_LIB_DEPENDS= libkate.so:${PORTSDIR}/multimedia/libkate @@ -428,6 +428,7 @@ gst_zbar_LIB_DEPENDS= libzbar.so:${PORTSDIR}/graphics/zbar gst_${GST_PLUGIN}_BUILD_DEPENDS?= gst_${GST_PLUGIN}_LIB_DEPENDS?= gst_${GST_PLUGIN}_RUN_DEPENDS?= +gst_${GST_PLUGIN}_USES?= gst_${GST_PLUGIN}_USE_XORG?= gst_${GST_PLUGIN}_PLIST_FILES?= \ ${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so @@ -445,6 +446,7 @@ gst_${GST_PLUGIN}_USE_GSTREAMER1?= BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS} LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS} RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS} +USES+= ${gst_${GST_PLUGIN}_USES} PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES} EXTRA_LIBS+= ${gst_${GST_PLUGIN}_EXTRA_LIBS} USE_XORG+= ${gst_${GST_PLUGIN}_USE_XORG} diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index d24620386ca1..4d08b92d115f 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -13,10 +13,9 @@ COMMENT= Multimedia streaming server for KiSS/Linksys player LICENSE= GPLv2 LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libdvdread.so:${PORTSDIR}/multimedia/libdvdread -USES= compiler:nestedfct dos2unix iconv +USES= compiler:nestedfct dos2unix iconv jpeg MAKE_ENV= FreeBSD=defined USE_RC_SUBR= kissdx diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index 0ddc4f61726a..dcede8f2eb4c 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -39,7 +39,6 @@ LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass \ libgnutls.so:${PORTSDIR}/security/gnutls \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libltdl.so:${PORTSDIR}/devel/libltdl \ libmodplug.so:${PORTSDIR}/audio/libmodplug \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ @@ -62,7 +61,7 @@ GH_ACCOUNT= xbmc GH_PROJECT= ffmpeg GH_TAGNAME= 2.4.6-Helix -USES= autoreconf:build gettext gmake iconv:wchar_t libtool \ +USES= autoreconf:build gettext gmake iconv:wchar_t jpeg libtool \ pkgconfig python:2 GNU_CONFIGURE= yes USE_XORG= xt xmu xtst xrandr diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index e0822ebb7230..fb4b190a9d16 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -12,15 +12,14 @@ COMMENT= Quasar DV codec (libdv): software codec for DV video encoding format LICENSE= LGPL21 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpopt.so:${PORTSDIR}/devel/popt +LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -USES= libtool pathfix pkgconfig +USES= jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes DOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \ diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile index e87f27009e69..a88615f5e6c6 100644 --- a/multimedia/libmovtar/Makefile +++ b/multimedia/libmovtar/Makefile @@ -10,11 +10,9 @@ MASTER_SITES= SF/mjpeg/OldFiles MAINTAINER= ports@FreeBSD.org COMMENT= Supports reading/writing of MJPEG video in YUV 4:2:2 JPEG -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - USE_SDL= sdl USE_GNOME= glib12 -USES= gmake +USES= gmake jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-m4data-prefix=${PREFIX}/share diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 98d22388f559..68e6bc57795c 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --without-libdv .endif .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg CONFIGURE_ARGS+= --with-libjpeg .else CONFIGURE_ARGS+= --without-libjpeg diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile index 788cb0eb0369..27465bea8749 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -24,13 +24,12 @@ WRKSRC= ${WRKDIR}/v4l-utils-${PORTVERSION} .if ${LIBV4L_SLAVE} != compat BUILD_DEPENDS+= v4l_compat>=${PORTVERSION}:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libargp.so:${PORTSDIR}/devel/argp-standalone +LIB_DEPENDS+= libargp.so:${PORTSDIR}/devel/argp-standalone GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES+= gmake iconv libtool pathfix pkgconfig +USES+= gmake iconv jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-libdvbv5 \ --disable-qv4l2 \ diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index f3bd8bf38db0..e0b585d21391 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -13,11 +13,10 @@ COMMENT= Set of tools to record/playback/edit videos in MPEG format LICENSE= GPLv2 # (or later) BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg CONFLICTS= mplex-[0-9]* -USES= gmake libtool pathfix pkgconfig +USES= gmake jpeg libtool pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index a322145b833f..683d8fada70a 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -41,7 +41,7 @@ MJPEG_STREAMER_PLUGINS+= input_testpicture.so .if ${PORT_OPTIONS:MUVC} MJPEG_STREAMER_PLUGINS+= input_uvc.so -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .endif .if ${PORT_OPTIONS:MHTTP} diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 40156e1a8d08..abbbc1520f56 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -13,8 +13,6 @@ COMMENT= Motion detection application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - OPTIONS_DEFINE= FFMPEG MYSQL PGSQL DOCS EXAMPLES OPTIONS_SINGLE= VIDEO OPTIONS_SINGLE_VIDEO= BKTR PWCBSD @@ -23,7 +21,7 @@ VIDEO_DESC= Video capture driver. Choose one of BKTR or PWCBSD BKTR_DESC= BKTR based TV capture cards PWCBSD_DESC= PWCBSD based Webcams -USES= autoreconf gmake +USES= autoreconf gmake jpeg GNU_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile index 8e56dd43b2a4..47bc9b317f60 100644 --- a/multimedia/openquicktime/Makefile +++ b/multimedia/openquicktime/Makefile @@ -14,11 +14,9 @@ COMMENT= Portable library for handling Apple's QuickTime(TM) files LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - GNU_CONFIGURE= yes USE_GNOME= gtk12 -USES= gmake tar:tgz +USES= gmake jpeg tar:tgz USE_LDCONFIG= yes PKGDEINSTALL= ${PKGINSTALL} diff --git a/multimedia/plexhometheater/Makefile b/multimedia/plexhometheater/Makefile index 63248fa6ab1c..3973827c8904 100644 --- a/multimedia/plexhometheater/Makefile +++ b/multimedia/plexhometheater/Makefile @@ -37,7 +37,6 @@ LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass \ libGLEW.so:${PORTSDIR}/graphics/glew \ libhal.so:${PORTSDIR}/sysutils/hal \ libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libmad.so:${PORTSDIR}/audio/libmad \ libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd \ @@ -69,7 +68,7 @@ GH_ACCOUNT= plexinc GH_PROJECT= plex-home-theater-public BUNDLE_LIBS= yes -USES= cmake:outsource execinfo gmake iconv:wchar_t pkgconfig python:2 +USES= cmake:outsource execinfo gmake iconv:wchar_t jpeg pkgconfig python:2 CMAKE_ARGS+= -DENABLE_AUTOUPDATE:BOOL=false CMAKE_ARGS+= -DENABLE_DUMP_SYMBOLS:BOOL=false CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=false diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile index b2825171a8bd..c42da32be992 100644 --- a/multimedia/pwcbsd/Makefile +++ b/multimedia/pwcbsd/Makefile @@ -47,7 +47,7 @@ ALL_TARGET= all .if ${PORT_OPTIONS:MPROGRAMS} ALL_TARGET+= pwcview PROGRAMS= pwcview -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg USE_SDL= sdl PLIST_SUB+= PROGRAMS="" .else diff --git a/multimedia/pwcview/Makefile b/multimedia/pwcview/Makefile index c04ecc7ef95e..6a3d933a701a 100644 --- a/multimedia/pwcview/Makefile +++ b/multimedia/pwcview/Makefile @@ -13,11 +13,11 @@ MAINTAINER= hselasky@FreeBSD.org COMMENT= The Video4Linux PWC webcam viewer BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libv4l1.so:${PORTSDIR}/multimedia/libv4l +LIB_DEPENDS= libv4l1.so:${PORTSDIR}/multimedia/libv4l CONFLICTS= pwcbsd-[0-9]* +USES= jpeg USE_SDL= sdl WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile index 096af4b85f1b..b798d6544e68 100644 --- a/multimedia/spook/Makefile +++ b/multimedia/spook/Makefile @@ -34,7 +34,7 @@ PORTDOCS= * .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg CONFIGURE_ARGS+= --enable-encoder-jpeg .endif diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 9b699e149360..7673309de50f 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -104,7 +104,7 @@ IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick-prefix=${LOCALBASE} -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= libjpeg JPEG_CONFIGURE_ON= --with-libjpeg-prefix=${LOCALBASE} diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile index 3edeb83eafd1..9239d2795b19 100644 --- a/multimedia/vdr/Makefile +++ b/multimedia/vdr/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig \ xorg-fonts-truetype>=0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype @@ -26,7 +25,7 @@ DVBPATCH_DESC= DVB audio patch for some countries STB0899_SIGNAL_DESC= STB0899 signal strength patch OPTIONS_DEFAULT= IPTVPATCH TTXPATCH -USES= cpe pkgconfig gettext iconv:wchar_t gmake shebangfix tar:bzip2 +USES= cpe gettext gmake iconv:wchar_t jpeg pkgconfig shebangfix tar:bzip2 CPE_VENDOR= tvdr SHEBANG_FILES= svdrpsend DIST_SUBDIR= vdr diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 165845768f22..82e3957a9140 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -12,15 +12,14 @@ COMMENT= TV viewing application and a few TV utilities BUILD_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts RUN_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= AALIB DV QUICKTIME ZVBI OPTIONS_DEFINE_i386= MMX OPTIONS_DEFAULT= AALIB ZVBI_DESC= Enable libzvbi support -USES= gmake iconv motif perl5 tar:bzip2 +USES= gmake iconv jpeg motif perl5 tar:bzip2 GNU_CONFIGURE= yes USE_XORG= x11 xaw CPPFLAGS+= -I${WRKSRC}/common diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index 696a301dbd36..6eec9df53942 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -12,11 +12,10 @@ COMMENT= X11 multimedia player LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libxine.so:${PORTSDIR}/multimedia/libxine -USES= desktop-file-utils execinfo gmake iconv pkgconfig readline \ +USES= desktop-file-utils execinfo gmake iconv jpeg pkgconfig readline \ shared-mime-info tar:xz USE_XORG= x11 xext xinerama xscrnsaver xtst xv xxf86vm GNU_CONFIGURE= yes diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 2916f3e6c8ce..808dca148c6f 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -15,8 +15,7 @@ COMMENT= Complete security camera solution, fully web based with image analysis LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libnetpbm.so:${PORTSDIR}/graphics/netpbm \ +LIB_DEPENDS= libnetpbm.so:${PORTSDIR}/graphics/netpbm \ libpcre.so:${PORTSDIR}/devel/pcre \ libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0 BUILD_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ @@ -29,7 +28,7 @@ BUILD_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \ ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -USES= perl5 shebangfix +USES= jpeg perl5 shebangfix GNU_CONFIGURE= yes USE_PHP= json mysql session USE_MYSQL= yes diff --git a/net-im/kopete-kde4/Makefile b/net-im/kopete-kde4/Makefile index 022fddc9f96b..080a2df694e2 100644 --- a/net-im/kopete-kde4/Makefile +++ b/net-im/kopete-kde4/Makefile @@ -17,11 +17,10 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ libkleo.so:${PORTSDIR}/deskutils/kdepim4 \ libmeanwhile.so:${PORTSDIR}/net-im/meanwhile \ libv4l2.so:${PORTSDIR}/multimedia/libv4l \ - libjasper.so:${PORTSDIR}/graphics/jasper \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libjasper.so:${PORTSDIR}/graphics/jasper BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -USES= cmake:outsource pkgconfig shebangfix tar:xz webplugin:native +USES= cmake:outsource jpeg pkgconfig shebangfix tar:xz webplugin:native USE_GNOME= libxml2 libxslt USE_KDE4= kdelibs kdeprefix pimlibs \ automoc4 qimageblitz diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile index 0ed4c5fe39c5..cd43cda8aa12 100644 --- a/net-mgmt/driftnet/Makefile +++ b/net-mgmt/driftnet/Makefile @@ -14,12 +14,11 @@ COMMENT= Tool to grab images out of (your) TCP connections LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_GNOME= gtk12 -USES= gmake +USES= gmake jpeg ALL_TARGET= default PLIST_FILES= bin/driftnet man/man1/driftnet.1.gz diff --git a/net-mgmt/netams/Makefile b/net-mgmt/netams/Makefile index 5f63320fb3f0..337a3deebeb2 100644 --- a/net-mgmt/netams/Makefile +++ b/net-mgmt/netams/Makefile @@ -73,8 +73,8 @@ RUN_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \ p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ p5-Crypt-GeneratePassword>=0:${PORTSDIR}/security/p5-Crypt-GeneratePassword -LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd +USES+= jpeg . if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile index 37a34ad356b3..6fc625535b5b 100644 --- a/net-p2p/dclib/Makefile +++ b/net-p2p/dclib/Makefile @@ -10,13 +10,11 @@ MASTER_SITES= SF/wxdcgui/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Direct connect interface library for valknut -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - WRKSRC= ${WRKDIR}/${DISTNAME} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= libtool pathfix tar:bzip2 +USES= jpeg libtool pathfix tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index c69caceec1f5..c1d1c4d260c7 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -66,7 +66,7 @@ CLIENT_USE= RC_SUBR=boinc-client LINUX_CONFIGURE_ON= --with-boinc-alt-platform=i686-pc-linux-gnu LINUX_USE= LINUX=yes -X11_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +X11_USES= jpeg X11_USE= GL=glut XORG=xmu,xi X11_CONFIGURE_OFF= ax_cv_check_glut_libglut=no diff --git a/net/krfb/Makefile b/net/krfb/Makefile index be3fef33db42..037b1faf6ebf 100644 --- a/net/krfb/Makefile +++ b/net/krfb/Makefile @@ -9,10 +9,9 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= VNC server for KDE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 +LIB_DEPENDS= libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4 -USES= alias cmake:outsource tar:xz +USES= alias cmake:outsource jpeg tar:xz USE_KDE4= kdelibs kdeprefix automoc4 USE_QT4= corelib gui network \ moc_build qmake_build rcc_build uic_build diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index d8c99ea219b2..b389bf1088e7 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -13,10 +13,9 @@ COMMENT= Provide an easy API to a custom vnc server LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= libtool pathfix +USES= jpeg libtool pathfix USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile index 2ed7e0b020b7..49ab4f48bda6 100644 --- a/net/minidlna/Makefile +++ b/net/minidlna/Makefile @@ -12,7 +12,6 @@ MAINTAINER= wg@FreeBSD.org COMMENT= Media-server compatible with "Digital Life Network Alliance" LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libexif.so:${PORTSDIR}/graphics/libexif \ libid3tag.so:${PORTSDIR}/audio/libid3tag \ libogg.so:${PORTSDIR}/audio/libogg \ @@ -25,7 +24,7 @@ CONFIGURE_ARGS= --with-db-path=/var/db/minidlna \ --with-os-url="http://www.FreeBSD.org" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -USES= autoreconf gettext-tools iconv +USES= autoreconf gettext-tools iconv jpeg PKGMESSAGE= ${WRKSRC}/pkg-message SUB_FILES+= pkg-message diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile index bf85a263deef..3839787ce8d5 100644 --- a/net/remmina-plugin-vnc/Makefile +++ b/net/remmina-plugin-vnc/Makefile @@ -6,11 +6,12 @@ PKGNAMESUFFIX= -vnc COMMENT= Remmina plugin for VNC protocol -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libgnutls.so:${PORTSDIR}/security/gnutls \ +LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libvncserver.so:${PORTSDIR}/net/libvncserver +USES= jpeg + MASTERDIR= ${.CURDIR}/../remmina-plugins PLIST_SUB+= ICONS="" SSH="" diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index da55cbe65e20..c465338aad9f 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -14,14 +14,13 @@ COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel \ xterm:${PORTSDIR}/x11/xterm OPTIONS_DEFINE= DOCS ULTRAFTP ULTRAFTP_DESC= UltraVNC File Transfer support (Java required) -USES= imake:env gmake perl5 tk:wrapper +USES= gmake imake:env jpeg perl5 tk:wrapper USE_OPENSSL= yes USE_PERL5= run USE_XORG= xi xmu xt xaw ice xpm xext sm diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index f5d4a608a2c7..c4d316448c55 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -92,7 +92,7 @@ PLIST_SUB+= VIEWER="@comment " .if ${PORT_OPTIONS:MHPJPG} LIB_DEPENDS+= libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo .else -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .endif MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 040fb642c9dd..9f67c5acd4de 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -14,7 +14,6 @@ COMMENT= Enhanced version of VNC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENCE.TXT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= showrgb:${PORTSDIR}/x11/rgb \ xauth:${PORTSDIR}/x11/xauth \ xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts @@ -22,7 +21,7 @@ RUN_DEPENDS= showrgb:${PORTSDIR}/x11/rgb \ MAKE_JOBS_UNSAFE= yes CONFLICTS= tridiavnc-[0-9]* vnc-[0-9]* WRKSRC= ${WRKDIR}/vnc_unixsrc -USES= cpe imake shebangfix perl5 tar:bzip2 +USES= cpe imake jpeg shebangfix perl5 tar:bzip2 SHEBANG_FILES= vncserver CFLAGS+= -Wno-return-type USE_XORG= xaw diff --git a/net/vncreflector/Makefile b/net/vncreflector/Makefile index 7e8416f88697..470ae6ca2142 100644 --- a/net/vncreflector/Makefile +++ b/net/vncreflector/Makefile @@ -10,8 +10,7 @@ DISTNAME= vnc_reflector-${PORTVERSION} MAINTAINER= paul@it.ca COMMENT= Multi-client VNC proxy server -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg USE_RC_SUBR= vncreflector ALL_TARGET= default diff --git a/net/wizd/Makefile b/net/wizd/Makefile index 4d6f552c51e4..7ec57a7c16d7 100644 --- a/net/wizd/Makefile +++ b/net/wizd/Makefile @@ -11,14 +11,13 @@ DISTFILES= wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip MAINTAINER= kikuchan@uranus.dti.ne.jp COMMENT= Open-source media server for Syabas-based media players -LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread RUN_DEPENDS= nkf:${PORTSDIR}/japanese/nkf DOS2UNIX_FILES= Makefile nkfwrap/Makefile nkfwrap/nkfwrap_test.c \ wizd_http.c wizd_menu.c USE_RC_SUBR= wizd -USES= dos2unix zip +USES= dos2unix jpeg zip EXTRACT_AFTER_ARGS= -d ${WRKSRC} post-patch: diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 5f1c5e2ec6b5..668e8c4d0d19 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -12,8 +12,7 @@ COMMENT= VNC server for use with real X displays LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libdbus-1.so:${PORTSDIR}/devel/dbus \ +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs USE_XORG= x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \ @@ -21,7 +20,7 @@ USE_XORG= x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \ # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS LDFLAGS+= -L${LOCALBASE}/lib USE_OPENSSL= yes -USES= iconv pkgconfig +USES= iconv jpeg pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile index b7fa079b2e66..032bec3855be 100644 --- a/net/xrdp-devel/Makefile +++ b/net/xrdp-devel/Makefile @@ -13,7 +13,7 @@ COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 -USES= autoreconf:build libtool pkgconfig +USES= autoreconf:build jpeg libtool pkgconfig USE_XORG= x11 xfixes GNU_CONFIGURE= yes USE_RC_SUBR= xrdp @@ -27,7 +27,6 @@ CONFIGURE_ARGS= --localstatedir=/var \ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFLICTS= xrdp-[0-9]* -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg # xrdp v0.7 is not compatible with current net/freerdp (1.0.2) #BUILD_DEPENDS+= freerdp>=1.0.2:${PORTSDIR}/net/freerdp #CONFIGURE_ARGS+= --enable-freerdp1 diff --git a/news/knews/Makefile b/news/knews/Makefile index cc2bc82f8118..8100703e7d17 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -10,14 +10,13 @@ MASTER_SITES= LOCAL/dinoex MAINTAINER= dinoex@FreeBSD.org COMMENT= Threaded nntp newsreader for X -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libcompface.so:${PORTSDIR}/mail/faces RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter LICENSE= GPLv2 -USES= imake +USES= imake jpeg USE_XORG= xmu xpm xt sm ice xext x11 MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 CC="${CC}" \ XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 0fa56711c6b0..6f8ec53bdcb8 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -96,11 +96,11 @@ PKGMESSAGE= ${NONEXISTENT} DESCR= ${MASTERDIR}/pkg-descr.client .elif defined(CUPS_IMAGE) LIB_DEPENDS+= libcups.so:${PORTSDIR}/${PKGCATEGORY}/cups-client \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff # force build if old cups is installed. BUILD_DEPENDS+= cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client +USES+= jpeg COMMENT2= Library cupsimage INSTALL_WRKSRC= ${WRKSRC}/filter PLIST= ${MASTERDIR}/pkg-plist.image diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 081be392edeb..f74cc173c3a8 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -10,8 +10,7 @@ COMMENT= Backends, filters and other software (was part of the core CUPS) BUILD_DEPENDS= pdftops:${PORTSDIR}/graphics/poppler-utils RUN_DEPENDS= pdftops:${PORTSDIR}/graphics/poppler-utils -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ libijs.so:${PORTSDIR}/print/libijs \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ @@ -24,7 +23,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpoppler.so:${PORTSDIR}/graphics/poppler MAKE_JOBS_UNSAFE=YES -USES= compiler:c++11-lib cpe libtool pathfix pkgconfig shebangfix tar:xz +USES= compiler:c++11-lib cpe jpeg libtool pathfix pkgconfig shebangfix tar:xz CPE_VENDOR= linuxfoundation SHEBANG_FILES= filter/textonly USE_GNOME= glib20 diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index 03c1860ef591..e953202896ea 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -16,7 +16,6 @@ BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:${PORTSDIR}/devel/uthash \ ${LOCALBASE}/bin/gnulib-tool:${PORTSDIR}/devel/gnulib LIB_DEPENDS= libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \ libtiff.so:${PORTSDIR}/graphics/tiff \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libgif.so:${PORTSDIR}/graphics/giflib \ libspiro.so:${PORTSDIR}/graphics/libspiro \ @@ -26,7 +25,7 @@ LIB_DEPENDS= libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \ USE_GITHUB= yes USES= autoreconf:build desktop-file-utils execinfo gettext gmake iconv \ - libtool pkgconfig python shared-mime-info + jpeg libtool pkgconfig python shared-mime-info USE_XORG= x11 xi ice xkbui USE_GNOME= glib20 gtk20 libxml2 pango diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 4faa29c3c65f..9d137c325d4b 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -18,8 +18,7 @@ COMMENT= Ghostscript 7.x PostScript interpreter LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts CONFLICTS_INSTALL= \ @@ -29,7 +28,7 @@ CONFLICTS_INSTALL= \ ghostscript9-agpl-[0-9]* \ ghostscript9-agpl-nox11-[0-9]* -USES= tar:bzip2 gmake shebangfix +USES= gmake jpeg shebangfix tar:bzip2 USE_LDCONFIG= yes SHEBANG_FILES= lib/fixmswrd.pl WANT_GNOME= yes diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index f7b79758ac6a..4554f87c07f0 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -23,7 +23,6 @@ LICENSE= GPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libjasper.so:${PORTSDIR}/graphics/jasper \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libpaper.so:${PORTSDIR}/print/libpaper \ libtiff.so:${PORTSDIR}/graphics/tiff @@ -36,7 +35,7 @@ CONFLICTS_INSTALL= \ ghostscript9-agpl-[0-9]* \ ghostscript9-agpl-nox11-[0-9]* -USES= gmake pkgconfig tar:xz shebangfix +USES= gmake jpeg pkgconfig tar:xz shebangfix SHEBANG_FILES= ${WRKSRC}/lib/fixmswrd.pl WANT_GNOME= yes USE_LDCONFIG= yes diff --git a/print/ghostscript9-agpl/Makefile b/print/ghostscript9-agpl/Makefile index 31cd9df0b04e..de2b4d31a709 100644 --- a/print/ghostscript9-agpl/Makefile +++ b/print/ghostscript9-agpl/Makefile @@ -22,7 +22,6 @@ LICENSE= AGPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libidn.so:${PORTSDIR}/dns/libidn \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ @@ -34,7 +33,7 @@ CONFLICTS_INSTALL= \ ghostscript[789]-[0-9]* \ ghostscript[789]-nox11-[0-9]* -USES= gmake pkgconfig:build tar:bzip2 +USES= gmake jpeg pkgconfig:build tar:bzip2 WANT_GNOME= yes USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile index a051395bd726..88d4db4b6113 100644 --- a/print/ghostscript9/Makefile +++ b/print/ghostscript9/Makefile @@ -22,7 +22,6 @@ LICENSE= GPLv3 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libidn.so:${PORTSDIR}/dns/libidn \ libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ @@ -36,7 +35,7 @@ CONFLICTS_INSTALL= \ ghostscript9-agpl-[0-9]* \ ghostscript9-agpl-nox11-[0-9]* -USES= gmake pkgconfig:build tar:bzip2 +USES= gmake jpeg pkgconfig:build tar:bzip2 WANT_GNOME= yes USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index f5f0ad4df9ff..eed870e93813 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -9,12 +9,11 @@ MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Drivers and support resources for HP Inkjet Printers -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - CONFLICTS= hplip-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking +USES= jpeg USE_GHOSTSCRIPT_RUN= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 31e2940d7224..80efd33160bc 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -9,8 +9,7 @@ MASTER_SITES= SF MAINTAINER= makc@FreeBSD.org COMMENT= Drivers and utilities for HP Printers and All-in-One devices -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libcupsmime.so:${PORTSDIR}/print/cups-base \ +LIB_DEPENDS= libcupsmime.so:${PORTSDIR}/print/cups-base \ libcups.so:${PORTSDIR}/print/cups-client \ libcupsimage.so:${PORTSDIR}/print/cups-image \ libdbus-1.so:${PORTSDIR}/devel/dbus @@ -22,7 +21,7 @@ RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster \ CONFLICTS_INSTALL= hpijs-[0-9]* INSTALL_TARGET= install-strip -USES= dos2unix libtool pkgconfig python shebangfix +USES= dos2unix jpeg libtool pkgconfig python shebangfix USE_GHOSTSCRIPT_RUN= yes USE_GNOME= pygobject USE_LDCONFIG= yes diff --git a/print/panda/Makefile b/print/panda/Makefile index a334faad967a..fd078b2b35df 100644 --- a/print/panda/Makefile +++ b/print/panda/Makefile @@ -15,8 +15,7 @@ COMMENT= PDF generation library LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes @@ -24,7 +23,7 @@ CONFIGURE_ARGS= --enable-berkeley-db CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include LIBS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -USES= autoreconf gmake libtool pathfix pkgconfig tar:bzip2 +USES= autoreconf gmake jpeg libtool pathfix pkgconfig tar:bzip2 PATHFIX_MAKEFILEIN= Makefile.am USE_BDB= yes USE_LDCONFIG= yes diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile index addd8e740681..c4126f2a258d 100644 --- a/print/photoprint/Makefile +++ b/print/photoprint/Makefile @@ -13,14 +13,13 @@ LICENSE= GPLv2 LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \ libgutenprint.so:${PORTSDIR}/print/gutenprint-base \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms.so:${PORTSDIR}/graphics/lcms \ libnetpbm.so:${PORTSDIR}/graphics/netpbm \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes -USES= desktop-file-utils gettext libtool pkgconfig +USES= desktop-file-utils gettext jpeg libtool pkgconfig USE_GNOME= gdkpixbuf2 gtk20 USE_XORG= x11 INSTALLS_ICONS= yes diff --git a/print/pslib/Makefile b/print/pslib/Makefile index 7354410443f9..6e81a1c26781 100644 --- a/print/pslib/Makefile +++ b/print/pslib/Makefile @@ -12,11 +12,10 @@ COMMENT= C-library for generating multi page PostScript documents 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 -USES= gettext gmake libtool pathfix pkgconfig +USES= gettext gmake jpeg libtool pathfix pkgconfig USE_GNOME= intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 389951a8232f..c910b96c8264 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= SF \ MAINTAINER= bsam@FreeBSD.org COMMENT= Comprehensive desktop publishing program -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - liblcms.so:${PORTSDIR}/graphics/lcms \ +LIB_DEPENDS= liblcms.so:${PORTSDIR}/graphics/lcms \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libcups.so:${PORTSDIR}/print/cups-client \ @@ -29,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinte USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network USE_GNOME= libartlgpl2 libxml2 USE_GHOSTSCRIPT_RUN= yes -USES= cmake desktop-file-utils pkgconfig python shared-mime-info tar:xz +USES= cmake desktop-file-utils jpeg pkgconfig python shared-mime-info tar:xz USE_LDCONFIG= yes CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit diff --git a/science/afni/Makefile b/science/afni/Makefile index 8816b4e26f5a..a4cbb5f663af 100644 --- a/science/afni/Makefile +++ b/science/afni/Makefile @@ -29,8 +29,7 @@ LIB_DEPENDS= libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ libR.so:${PORTSDIR}/math/R \ libgsl.so:${PORTSDIR}/math/gsl \ libnetcdff.so:${PORTSDIR}/science/netcdf-fortran -RUN_DEPENDS= cjpeg:${PORTSDIR}/graphics/jpeg \ - mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \ +RUN_DEPENDS= mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \ whirlgif:${PORTSDIR}/graphics/whirlgif \ ppmtogif:${PORTSDIR}/graphics/netpbm \ endian:${PORTSDIR}/sysutils/endian \ @@ -40,7 +39,7 @@ CONFLICTS= im-[0-9]* \ nifticlib-[0-9]* \ open-usp-tukubai-[0-9]* -USES= gettext iconv gmake motif perl5 shebangfix +USES= gettext iconv jpeg:run gmake motif perl5 shebangfix SHEBANG_FILES= suma_change_spec 3dPAR2AFNI.pl # Some prereqs use gcc anyway diff --git a/science/hdf-java/Makefile b/science/hdf-java/Makefile index f28883188606..9b8677cf5934 100644 --- a/science/hdf-java/Makefile +++ b/science/hdf-java/Makefile @@ -13,15 +13,14 @@ COMMENT= Java interface to HDF5 BROKEN= Fails to configure, HDF5 library needs SZIP, SZIP not defined -LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 USE_JAVA= yes JAVA_VERSION= 1.6 1.7 JAVA_BUILD= yes JAVA_RUN= yes -USES= dos2unix gmake +USES= dos2unix gmake jpeg DOS2UNIX_REGEX= .*/examples/.*Makefile.in GNU_CONFIGURE= yes diff --git a/science/hdf/Makefile b/science/hdf/Makefile index 209e7fad6595..8a00ca8f2475 100644 --- a/science/hdf/Makefile +++ b/science/hdf/Makefile @@ -11,8 +11,7 @@ MASTER_SITES= http://www.hdfgroup.org/ftp/HDF/releases/HDF${PORTVERSION}/src/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Hierarchical Data Format library (from NCSA) -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libsz.so:${PORTSDIR}/science/szip +LIB_DEPENDS= libsz.so:${PORTSDIR}/science/szip CONFLICTS_INSTALL= netcdf-4.[0-9]* @@ -22,7 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --with-jpeg=${LOCALBASE} --with-szlib=${LOCALBASE} INSTALL_TARGET= install-strip USE_LDCONFIG= yes -USES= fortran libtool tar:bzip2 +USES= fortran jpeg libtool tar:bzip2 PORTDATA= * PORTEXAMPLES= * diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 353d020b9187..2ed717afe55c 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -19,7 +19,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libexpat.so:${PORTSDIR}/textproc/expat2 \ @@ -43,7 +42,7 @@ USE_GL= yes USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm USE_LDCONFIG= yes USE_GSTREAMER= yes -USES= alias desktop-file-utils cmake:outsource execinfo gmake python shebangfix +USES= alias desktop-file-utils cmake:outsource execinfo gmake jpeg python shebangfix INSTALLS_ICONS= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \ diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile index 885b71e159db..3f707bcec5bd 100644 --- a/sysutils/ascpu/Makefile +++ b/sysutils/ascpu/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://www.tigr.net/afterstep/download/ascpu/ MAINTAINER= demon@FreeBSD.org COMMENT= CPU statistics monitor utility for XFree86 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - +USES= jpeg USE_XORG= xpm GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib diff --git a/sysutils/graffer/Makefile b/sysutils/graffer/Makefile index 6f26eabba7e7..19d79b5576b7 100644 --- a/sysutils/graffer/Makefile +++ b/sysutils/graffer/Makefile @@ -11,10 +11,11 @@ MASTER_SITES= http://chaosophia.net/downloads/graffer/ \ MAINTAINER= koue@chaosophia.net COMMENT= Utility to render graphical statistics -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 +USES= jpeg + PLIST_FILES= bin/graffer \ etc/graffer/graffer.conf.example \ man/man8/graffer.8.gz diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile index b8c0ddffd925..21bbbab1c34a 100644 --- a/sysutils/logstalgia/Makefile +++ b/sysutils/logstalgia/Makefile @@ -14,11 +14,10 @@ LICENSE= GPLv3 LIB_DEPENDS= libftgl.so:${PORTSDIR}/graphics/ftgl \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpcre.so:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes -USES= pkgconfig +USES= jpeg pkgconfig USE_SDL= sdl image CFLAGS+= -L${LOCALBASE}/lib diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile index aa5a2768abbd..c1739e085803 100644 --- a/sysutils/testdisk/Makefile +++ b/sysutils/testdisk/Makefile @@ -9,9 +9,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= flz@FreeBSD.org COMMENT= Tool to check and undelete partitions -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - -USES= tar:bzip2 +USES= jpeg tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index 286dcd191e41..1ada4e6c60b5 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -14,13 +14,12 @@ COMMENT= Converts HTML to PDF and/or PostScript LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png OPTIONS_DEFINE= HTMLDOCGUI HTMLDOCGUI_DESC= Build GUI front-end -USES= tar:bzip2 +USES= jpeg tar:bzip2 USE_OPENSSL= yes GNU_CONFIGURE= yes diff --git a/www/analog/Makefile b/www/analog/Makefile index df5d250db7d0..c62c9cf13701 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -18,9 +18,9 @@ COMMENT= Fast program for analysing WWW logfiles LICENSE= GPLv2 LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png +USES= jpeg BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= ${PORTNAME} diff --git a/www/chromium/Makefile b/www/chromium/Makefile index ce1379ffe17d..a8fccb304c3e 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -40,7 +40,6 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libpci.so:${PORTSDIR}/devel/libpci \ libdrm.so:${PORTSDIR}/graphics/libdrm \ libicuuc.so:${PORTSDIR}/devel/icu \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ libnspr4.so:${PORTSDIR}/devel/nspr \ libpng.so:${PORTSDIR}/graphics/png \ @@ -56,7 +55,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/a xdg-open:${PORTSDIR}/devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 -USES= bison compiler:c++11-lib cpe desktop-file-utils pkgconfig \ +USES= bison compiler:c++11-lib cpe desktop-file-utils jpeg pkgconfig \ perl5 shebangfix ninja tar:xz python:2,build execinfo CPE_VENDOR= google CPE_PRODUCT= chrome diff --git a/www/ilias/Makefile b/www/ilias/Makefile index 3d6abf838ff3..db544fd996a2 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -22,10 +22,9 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/share/pear/Auth/Auth.php:${PORTSDIR}/security/pear-Auth \ ${LOCALBASE}/share/pear/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \ ${LOCALBASE}/share/pear/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= cpe +USES= cpe jpeg NO_BUILD= yes PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message diff --git a/www/imgsizer/Makefile b/www/imgsizer/Makefile index 0020ead36076..c06b53fffb56 100644 --- a/www/imgsizer/Makefile +++ b/www/imgsizer/Makefile @@ -12,10 +12,9 @@ COMMENT= Tool to autogenerate WIDTH and HEIGHT for IMG HTML tags LICENSE= BSD4CLAUSE -RUN_DEPENDS= rdjpgcom:${PORTSDIR}/graphics/jpeg \ - identify:${PORTSDIR}/graphics/ImageMagick +RUN_DEPENDS= identify:${PORTSDIR}/graphics/ImageMagick -USES= python +USES= jpeg:run python NO_BUILD= yes PLIST_FILES= bin/${PORTNAME} man/man1/imgsizer.1.gz diff --git a/www/links-hacked/Makefile b/www/links-hacked/Makefile index e1696c5cae59..3eed5abebfa0 100644 --- a/www/links-hacked/Makefile +++ b/www/links-hacked/Makefile @@ -49,9 +49,9 @@ X11_CONFIGURE_WITH= x .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff +USES+= jpeg CONFIGURE_ARGS+= --enable-graphics .else CONFIGURE_ARGS+= --disable-graphics --without-libjpeg --without-libtiff diff --git a/www/links/Makefile b/www/links/Makefile index acca3e3b28c6..e613aeb92d46 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -64,8 +64,8 @@ CIPHERSTRING?= HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff +USES+= jpeg CONFIGURE_ARGS+= --enable-graphics .else CONFIGURE_ARGS+= --disable-graphics --without-libjpeg --without-libtiff diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index 867f6aa0a9b1..68f8fef6e640 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -16,7 +16,6 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png ALL_TARGET= #empty @@ -24,7 +23,7 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lssl -lcrypto -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ARGS= HOST_CC="${CC}" CC="${CC}" CCOPT="" HOST="${OPSYS}" \ WARNFLAGS="" Q="" OPTCFLAGS="${CFLAGS}" -USES= bison gmake gperf pkgconfig iconv +USES= bison gmake gperf iconv jpeg pkgconfig USE_GNOME= gtk20 librsvg2 NSFB_VERSION= 0.1.0 diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile index ea07dc44941a..310b0d01d890 100644 --- a/www/swiggle/Makefile +++ b/www/swiggle/Makefile @@ -13,8 +13,9 @@ COMMENT= Swiggle is a commandline web image gallery generator LICENSE= BSD4CLAUSE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libexif.so:${PORTSDIR}/graphics/libexif +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif + +USES= jpeg OPTIONS_DEFINE= DOCS diff --git a/www/tengine/Makefile b/www/tengine/Makefile index fb7899f0f596..3aa4074fd450 100644 --- a/www/tengine/Makefile +++ b/www/tengine/Makefile @@ -454,12 +454,12 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR .endif .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ +LIB_DEPENDS+= libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libavutil.so:${PORTSDIR}/multimedia/ffmpeg \ libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick +USES+= jpeg NGINX_VIDEO_THUMBEXTRACTOR_VERSION= 0.2.0 GH_ACCOUNT+= wandenberg:videothumbextractor GH_PROJECT+= nginx-video-thumbextractor-module:videothumbextractor diff --git a/www/thumbnail_index/Makefile b/www/thumbnail_index/Makefile index 85567c28c62c..5ec7fc01cf3e 100644 --- a/www/thumbnail_index/Makefile +++ b/www/thumbnail_index/Makefile @@ -11,9 +11,9 @@ DISTNAME= ${PORTNAME}_10aug1998 MAINTAINER= dinoex@FreeBSD.org COMMENT= Make an HTML index file for a bunch of images -RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \ - pnmscale:${PORTSDIR}/graphics/netpbm +RUN_DEPENDS= pnmscale:${PORTSDIR}/graphics/netpbm +USES= jpeg:run NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile index a5affe2e8c0e..e0223ed2edf9 100644 --- a/www/webkit-qt5/Makefile +++ b/www/webkit-qt5/Makefile @@ -11,7 +11,6 @@ COMMENT= Qt WebKit implementation LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libicui18n.so:${PORTSDIR}/devel/icu \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libwebp.so:${PORTSDIR}/graphics/webp BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex @@ -26,7 +25,7 @@ USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes USE_SQLITE= 3 USE_XORG= x11 xcomposite xrender -USES= bison gmake gperf perl5 pkgconfig python:build qmake:outsource +USES= bison gmake gperf jpeg perl5 pkgconfig python:build qmake:outsource # Use flex(1) from ports. MAKE_ENV= PATH="${LOCALBASE}/bin:${PATH}" # "all" builds many more targets. The default one is called "first" in diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index edaeb49cccac..91ffebb273b5 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= geoclue>=0:${PORTSDIR}/net/geoclue LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libwebp.so:${PORTSDIR}/graphics/webp \ libpng.so:${PORTSDIR}/graphics/png \ libsecret-1.so:${PORTSDIR}/security/libsecret \ @@ -29,7 +28,7 @@ PORTSCOUT= ^${PORTVERSION:R:S|.|\.|}\.*$$ USE_GSTREAMER1= yes USE_XORG= x11 xext ice # when it USES=cmake safe -USES= bison compiler:c++11-lib gettext gmake gperf perl5 \ +USES= bison compiler:c++11-lib gettext gmake gperf jpeg perl5 \ pkgconfig python:2 tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile index 59908f8cdb46..c887a2ab7367 100644 --- a/x11-fm/ezfm/Makefile +++ b/x11-fm/ezfm/Makefile @@ -13,10 +13,9 @@ COMMENT= EZWGL-based file manager for X Window System LICENSE= GPLv2 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libEZ.so:${PORTSDIR}/graphics/EZWGL +LIB_DEPENDS= libEZ.so:${PORTSDIR}/graphics/EZWGL -USES= gmake tar:tgz +USES= gmake jpeg tar:tgz WRKSRC= ${WRKDIR}/EZFM-${PORTVERSION} diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile index 0e8ad8988118..9449adb2b1de 100644 --- a/x11-fm/thunar-vfs/Makefile +++ b/x11-fm/thunar-vfs/Makefile @@ -15,7 +15,6 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libgamin-1.so:${PORTSDIR}/devel/gamin @@ -23,8 +22,8 @@ GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 gdkpixbuf2 intltool intlhack USE_XFCE= libexo USE_XORG= x11 -USES= gmake pathfix perl5 pkgconfig libtool desktop-file-utils \ - gettext-tools xfce tar:bzip2 +USES= desktop-file-utils gettext-tools gmake jpeg libtool pathfix perl5 pkgconfig \ + xfce tar:bzip2 CONFIGURE_ARGS= --disable-debug --without-html-dir diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile index 33264d6b105b..7cf9a3753b28 100644 --- a/x11-toolkits/blt/Makefile +++ b/x11-toolkits/blt/Makefile @@ -13,11 +13,9 @@ COMMENT= Extension to the Tk toolkit LICENSE= MIT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} -USES= gmake shebangfix tk zip +USES= gmake jpeg shebangfix tk zip SHEBANG_FILES= demos/scripts/xcolors.tcl SHEBANG_LANG= bltwish bltwish_OLD_CMD=../bltwish diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile index d0f01d93e1b8..7c2fd77e81ea 100644 --- a/x11-toolkits/fltk-devel/Makefile +++ b/x11-toolkits/fltk-devel/Makefile @@ -14,7 +14,6 @@ COMMENT= Cross-platform C++ graphical user interface toolkit LICENSE= LGPL20 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig @@ -24,7 +23,7 @@ EXAMPLES_CMAKE_OFF= -DOPTION_BUILD_EXAMPLES:BOOL=OFF USE_XORG= xft USE_GL= glu USE_LDCONFIG= ${PREFIX}/lib/fltk-devel -USES+= cmake:outsource +USES+= cmake:outsource jpeg LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DOPTION_BUILD_SHARED_LIBS:BOOL=ON \ -DPREFIX_BIN:PATH=${PREFIX}/bin/fltk-devel \ diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index a223a494c445..e3fe04fe4ada 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -13,10 +13,9 @@ COMMENT= Cross-platform C++ graphical user interface toolkit LICENSE= LGPL20 -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= pkgconfig +USES= jpeg pkgconfig USE_XORG= xft USE_GL= glu USE_LDCONFIG= yes diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 0520e03eb3f8..1850933d7a39 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -16,15 +16,14 @@ COMMENT= Fast and extensive C++ GUI toolkit LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff MAJORVER= ${PORTVERSION:R} SHVER= ${PORTVERSION:S/${MAJORVER}.//} PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER} -USES= libtool +USES= jpeg libtool USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-opengl=yes \ diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile index 302f673a997a..02cdf18345d3 100644 --- a/x11-toolkits/fox16/Makefile +++ b/x11-toolkits/fox16/Makefile @@ -14,11 +14,10 @@ COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.6 LICENSE= LGPL3 # (or later) -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff -USES= libtool pathfix +USES= jpeg libtool pathfix USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-opengl --with-x --with-xim diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile index 8b6a78691a6c..62e21b2320ec 100644 --- a/x11-toolkits/fox17/Makefile +++ b/x11-toolkits/fox17/Makefile @@ -33,7 +33,7 @@ PORTDOCS= * .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJPEG} -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .else CONFIGURE_ARGS+=--disable-jpeg .endif diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index 032cc1ff21da..a8346214708f 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -13,7 +13,6 @@ LICENSE_COMB= multi LICENSE= GPLv3 LGPL3 LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libXft.so:${PORTSDIR}/x11-fonts/libXft \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ @@ -30,7 +29,7 @@ CONFIGURE_ARGS= --with-tiff-library=${LOCALBASE}/lib \ --enable-graphics=cairo \ --disable-glitz -USES= gnustep pkgconfig +USES= gnustep jpeg pkgconfig USE_GNUSTEP= base gui build USE_XORG= xft xrender xmu xext x11 xcursor xfixes xmu USE_GL= yes diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index 22dea441bfd7..f53adf139aa4 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -21,7 +21,6 @@ DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html \ texi2pdf:${PORTSDIR}/print/texinfo LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile @@ -37,7 +36,7 @@ CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/lib -USES= gnustep pkgconfig +USES= gnustep jpeg pkgconfig USE_GNUSTEP= base build USE_XORG= x11 xt diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index cbdd93381cf4..6fc9ff599f02 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -13,11 +13,10 @@ COMMENT= High performance realtime 3D engine LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/readme.txt -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png DOS2UNIX_GLOB= Makefile *.cpp *.h *.txt -USES= alias dos2unix gmake zip +USES= alias dos2unix gmake jpeg zip USE_GL= gl USE_XORG= x11 xxf86vm USE_LDCONFIG= yes diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile index a9428992c643..99bf5d32b590 100644 --- a/x11-toolkits/nucleo/Makefile +++ b/x11-toolkits/nucleo/Makefile @@ -12,12 +12,11 @@ COMMENT= Toolkit to explore video and human-computer interaction LICENSE= LGPL21 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libexif.so:${PORTSDIR}/graphics/libexif \ +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -USES= gmake libtool pathfix pkgconfig shebangfix tar:bzip2 +USES= gmake jpeg libtool pathfix pkgconfig shebangfix tar:bzip2 USE_GL= glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-opencv diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 5ca6644e25b2..e787bf7c2692 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -14,15 +14,14 @@ COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295)) LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png MAKE_JOBS_UNSAFE= yes CONFLICTS= lesstif-[0-9]* # WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WRKSRC= ${WRKDIR}/motif-${PORTVERSION} -USES= autoreconf gmake iconv libtool:keepla pkgconfig tar:tgz +USES= autoreconf gmake iconv jpeg libtool:keepla pkgconfig tar:tgz USE_XORG= x11 xaw xbitmaps xext xft xt GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index f02462c28c25..3d5c85b521d6 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -13,7 +13,6 @@ COMMENT= Extensible Perl toolkit for multi-platform GUI development LICENSE= BSD2CLAUSE LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff @@ -22,7 +21,7 @@ OPTIONS_DEFAULT=ICONV XFT CONFIGURE_ARGS= EXTRA_CCFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" \ X11BASE=${LOCALBASE} -USES= perl5 +USES= jpeg perl5 USE_PERL5= configure USE_XORG= x11 xext xpm xrender MAKE_JOBS_UNSAFE= yes diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index fb4672954dfa..e9a3ad4d117f 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -11,8 +11,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= pi@FreeBSD.org COMMENT= Re-port of a perl5 interface to Tk8.4 -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 OPTIONS_DEFINE= XFT @@ -21,7 +20,7 @@ XFT_DESC= Client-side fonts via libXft CONFIGURE_ARGS= X11INC=${LOCALBASE}/include X11LIB=${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes -USES= perl5 shebangfix +USES= jpeg perl5 shebangfix SHEBANG_FILES= pTk/Tcl-pTk \ pTk/mkVFunc USE_PERL5= configure diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index f7ac99a14cf9..d4c121917350 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -13,7 +13,6 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libxcb.so:${PORTSDIR}/x11/libxcb \ libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \ @@ -23,6 +22,7 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils +USES= jpeg USE_GL= gl USE_GNOME= glib20 USE_QT5= core dbus qmake_build buildtools_build diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 5fd53477ec76..43df6ab2d77d 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -13,11 +13,10 @@ MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png\ - libjpeg.so:${PORTSDIR}/graphics/jpeg\ libtiff.so:${PORTSDIR}/graphics/tiff\ libexpat.so:${PORTSDIR}/textproc/expat2 -USES= compiler iconv gmake pkgconfig tar:bzip2 +USES= compiler gmake iconv jpeg pkgconfig tar:bzip2 USE_XORG= x11 sm xxf86vm xinerama USE_GL= glu USE_GNOME= gtk20 pangox-compat diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile index 0e33c8767f8d..592c492184d3 100644 --- a/x11-toolkits/wxgtk30/Makefile +++ b/x11-toolkits/wxgtk30/Makefile @@ -12,12 +12,11 @@ MAINTAINER= portmaster@bsdforge.com COMMENT= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png\ - libjpeg.so:${PORTSDIR}/graphics/jpeg\ libtiff.so:${PORTSDIR}/graphics/tiff\ libexpat.so:${PORTSDIR}/textproc/expat2\ libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 -USES+= compiler:c++11-lib iconv gmake pkgconfig tar:bzip2 +USES+= compiler:c++11-lib gmake iconv jpeg pkgconfig tar:bzip2 USE_XORG= x11 sm xxf86vm xinerama USE_GL= glu USE_GNOME= gtk20 diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile index f6e239993278..2f0ec94ccc15 100644 --- a/x11-toolkits/xforms/Makefile +++ b/x11-toolkits/xforms/Makefile @@ -14,10 +14,9 @@ COMMENT= Graphical user interface toolkit for X Window System LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff -USES= libtool +USES= jpeg libtool USE_XORG= xpm USE_GL= gl USE_LDCONFIG= yes diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile index 981fa75d1dd0..2179f3425130 100644 --- a/x11-toolkits/xmhtml/Makefile +++ b/x11-toolkits/xmhtml/Makefile @@ -13,10 +13,9 @@ COMMENT= Motif widget set for displaying HTML 3.2 documents LICENSE= LGPL20 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING.LIB -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= gmake libtool:build motif pkgconfig tar:tgz +USES= gmake jpeg libtool:build motif pkgconfig tar:tgz USE_XORG= xft xmu xpm xt USE_LDCONFIG= yes diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index aa4476b1bd15..51cacaddaee8 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -15,12 +15,11 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libgif.so:${PORTSDIR}/graphics/giflib \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff RUN_DEPENDS= xli:${PORTSDIR}/graphics/xli -USES= execinfo gmake pkgconfig shebangfix tar:bzip2 +USES= execinfo gmake jpeg pkgconfig shebangfix tar:bzip2 USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 librsvg2 pango USE_XORG+= ice sm x11 xcomposite xcursor xdamage xext xfixes xi xinerama \ xrandr xrender diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index cdc977d924b2..2245a95da25a 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -13,9 +13,7 @@ COMMENT= Extension to twm, with support for multiple virtual screens, etc LICENSE= MIT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg - -USES= imake tar:xz +USES= imake jpeg tar:xz USE_XORG= xpm xmu pre-configure: diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile index 291fea16e890..609457b519ba 100644 --- a/x11-wm/jwm/Makefile +++ b/x11-wm/jwm/Makefile @@ -30,7 +30,7 @@ DEBUG_CONFIGURE_ENABLE= debug FRIBIDI_DESC= Unicode Bidirectional Algorithm support FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CONFIGURE_ENABLE=fribidi -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg +JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 970fc43d4c2d..9b96a8d49969 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -11,10 +11,9 @@ MASTER_SITES= https://pekwm.org/projects/3/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Light, Unobtrusive, and configurable windowmanager -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png -USES= pkgconfig iconv:wchar_t gmake tar:bzip2 +USES= gmake iconv:wchar_t jpeg pkgconfig tar:bzip2 USE_XORG= xft xpm x11 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \ diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index cfd7328d9f9d..1fd77a602f81 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -41,8 +41,8 @@ BSDEL_CONFIGURE_OFF= --disable-backspace-key --disable-delete-key BSDEL_CONFIGURE_ON= --enable-backspace-key --enable-delete-key MOUSE_CONFIGURE_ENABLE= mousewheel BGIMG_LIB_DEPENDS= libAfterImage.so:${PORTSDIR}/graphics/libafterimage \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg + libpng.so:${PORTSDIR}/graphics/png +BGIMG_USES= jpeg BGIMG_CONFIGURE_ON= --with-afterimage-config --with-png --with-jpeg BGIMG_CONFIGURE_OFF= --without-afterimage-config --with-png=no --with-jpeg=no KANJI_CONFIGURE_ENABLE= kanji diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile index b33a1b616936..fd463ae09e89 100644 --- a/x11/dgs/Makefile +++ b/x11/dgs/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= GNU/../old-gnu/dgs MAINTAINER= ports@FreeBSD.org COMMENT= Display ghostscript system -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff MAKE_JOBS_UNSAFE= yes @@ -19,7 +18,7 @@ MAKE_JOBS_UNSAFE= yes USE_GHOSTSCRIPT_RUN= yes USE_XORG= xt sm ice xext x11 USE_GNOME= glib12 -USES= gmake libtool makeinfo +USES= gmake jpeg libtool makeinfo USE_LDCONFIG= yes GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-0.5.9 diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index d8056b9bb453..6ddaaead2a79 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -11,12 +11,11 @@ COMMENT= Futuristic zoomable user environment LICENSE= GPLv3 -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= compiler:features perl5 pkgconfig shebangfix tar:bzip2 +USES= compiler:features jpeg perl5 pkgconfig shebangfix tar:bzip2 USE_PERL5= build USE_XORG= x11 xext xxf86vm SUB_FILES= eaglemode.sh diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 0642ea140663..0c591036024c 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -10,7 +10,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Runtime components for KDE Plasma Desktop LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libwebp.so:${PORTSDIR}/graphics/webp \ libslp.so:${PORTSDIR}/net/openslp \ @@ -24,7 +23,7 @@ RUN_DEPENDS= cagibid:${PORTSDIR}/net/cagibi USE_KDE4= kactivities kdelibs kdeprefix oxygen \ attica automoc4 pimlibs strigi nepomuk-core -USES= cmake:outsource gettext gmake shared-mime-info shebangfix tar:xz +USES= cmake:outsource gettext gmake jpeg shared-mime-info shebangfix tar:xz USE_QT4= corelib dbus declarative designer_build gui phonon \ network qtestlib script svg webkit xml \ moc_build qmake_build rcc_build uic_build diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 51f2c750a439..16b3078d0a7b 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -21,7 +21,6 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil \ libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \ libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms @@ -45,7 +44,7 @@ USE_GL= glu USE_GNOME= glib20 USE_KDE4= kactivities kdelibs kdeprefix nepomuk-core oxygen \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi -USES= cmake:outsource compiler:c++11-lib gettext gmake iconv \ +USES= cmake:outsource compiler:c++11-lib gettext gmake iconv jpeg \ pkgconfig tar:xz USE_QT4= corelib dbus declarative designer_build gui network \ opengl phonon qtestlib script sql webkit xml \ diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 02327477f41b..a33eabdfe2b5 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libenchant.so:${PORTSDIR}/textproc/enchant \ libgif.so:${PORTSDIR}/graphics/giflib \ libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libhal.so:${PORTSDIR}/sysutils/hal \ libqca.so:${PORTSDIR}/devel/qca \ libHUpnp.so:${PORTSDIR}/net/hupnp \ @@ -36,7 +35,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol USE_GNOME= libxml2 libxslt USE_KDE4= kdeprefix oxygen \ attica automoc4 ontologies soprano strigi -USES= cmake:outsource fam gettext perl5 shared-mime-info shebangfix tar:xz +USES= cmake:outsource fam gettext jpeg perl5 shared-mime-info shebangfix tar:xz USE_OPENSSL= yes USE_QT4= corelib dbus declarative designer_build gui \ network opengl phonon qt3support \ diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile index ff016a627263..dd1663bd0ebc 100644 --- a/x11/mrxvt-devel/Makefile +++ b/x11/mrxvt-devel/Makefile @@ -69,7 +69,7 @@ CONFIGURE_ARGS+= --disable-xpm .if ! ${PORT_OPTIONS:MJPEG} || ! ${PORT_OPTIONS:MBACKGROUND} CONFIGURE_ARGS+= --disable-jpeg .else -LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +USES+= jpeg .endif .if ! ${PORT_OPTIONS:MPNG} || ! ${PORT_OPTIONS:MBACKGROUND} diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index fc12071c1f26..b00d875433d1 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -11,12 +11,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Tabbed version of rxvt -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png CONFLICTS= mrxvt-0.5.* GNU_CONFIGURE= yes +USES= jpeg USE_XORG= x11 OPTIONS_DEFINE= DOCS JAPANESE XFT diff --git a/x11/nxcomp/Makefile b/x11/nxcomp/Makefile index 39af0bdc3b08..25519a51e37e 100644 --- a/x11/nxcomp/Makefile +++ b/x11/nxcomp/Makefile @@ -11,12 +11,11 @@ COMMENT= NX X11 protocol compression libraries WRKSRC= ${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME} -USES= gmake +USES= gmake jpeg USE_AUTOTOOLS= autoconf USE_XORG= xproto GNU_CONFIGURE= yes -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png post-patch: @${REINPLACE_CMD} -e "s,libdir}/nx,libdir},g" ${WRKSRC}/Makefile.in diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 67768e773327..5604f34a66e5 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -15,12 +15,11 @@ LICENSE= GPLv2 LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -USES= cmake pkgconfig +USES= cmake jpeg pkgconfig USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrandr \ xrender xt USE_RC_SUBR= slim diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index 804c2e6473a7..6efd88728b3b 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -15,8 +15,7 @@ COMMENT= X11 Image Loading Utility LICENSE= MIT -LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff CONFLICTS_INSTALL= xli-* @@ -27,6 +26,7 @@ PATCH_STRIP= -p1 VERSION= ${PORTVERSION:R} REVISION= ${PORTVERSION:E} +USES= jpeg USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index f5c89ce39390..8fc4f4dc3e77 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -12,8 +12,7 @@ DISTNAME= xscreensaver-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Save your screen while you entertain your cat (for GNOME users) -LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle #CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]* @@ -21,7 +20,7 @@ USE_XORG= x11 xpm USE_GL= gl USE_PERL5= run USE_GNOME= libglade2 -USES+= dos2unix gettext gmake perl5 pathfix pkgconfig +USES+= dos2unix gettext gmake jpeg perl5 pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \ --with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \ diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 407336b94440..4356026658bb 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -12,14 +12,13 @@ COMMENT= Save your screen while you entertain your cat RUN_DEPENDS= p5-libwww>0:${PORTSDIR}/www/p5-libwww \ giftopnm:${PORTSDIR}/graphics/netpbm -LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle \ - libjpeg.so:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle DESTDIRNAME= install_prefix CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* -USES= pkgconfig gettext gmake perl5 +USES= gettext gmake jpeg perl5 pkgconfig USE_AUTOTOOLS= autoconf USE_GL= yes USE_GNOME= gdkpixbuf2 gtk20 intltool libglade2 libxml2 |