Index: Mk/Uses/jpeg.mk =================================================================== --- Mk/Uses/jpeg.mk +++ Mk/Uses/jpeg.mk @@ -6,31 +6,25 @@ # Usage: USES=jpeg or USES=jpeg:ARGS # Valid ARGS: lib (default, implicit), build, run, both # -# User defined variables: -# JPEG_PORT - jpeg implementation -# Valid values: graphics/jpeg and graphics/jpeg-turbo -# Default value: graphics/jpeg-turbo -# # MAINTAINER: portmgr@FreeBSD.org .if !defined(_INCLUDE_USES_JPEG_MK) _INCLUDE_USES_JPEG_MK= yes -JPEG_PORT?= graphics/jpeg-turbo .if empty(jpeg_ARGS) jpeg_ARGS= lib .endif .if ${jpeg_ARGS} == lib -LIB_DEPENDS+= libjpeg.so:${JPEG_PORT} +LIB_DEPENDS+= libjpeg.so:graphics/${JPEG_DEFAULT} .elif ${jpeg_ARGS} == build -BUILD_DEPENDS+= cjpeg:${JPEG_PORT} +BUILD_DEPENDS+= cjpeg:graphics/${JPEG_DEFAULT} .elif ${jpeg_ARGS} == run -RUN_DEPENDS+= cjpeg:${JPEG_PORT} +RUN_DEPENDS+= cjpeg:graphics/${JPEG_DEFAULT} .elif ${jpeg_ARGS} == both -BUILD_DEPENDS+= cjpeg:${JPEG_PORT} -RUN_DEPENDS+= cjpeg:${JPEG_PORT} +BUILD_DEPENDS+= cjpeg:graphics/${JPEG_DEFAULT} +RUN_DEPENDS+= cjpeg:graphics/${JPEG_DEFAULT} .else IGNORE= USES=jpeg - invalid args: [${jpeg_ARGS}] specified .endif Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -48,6 +48,8 @@ GCC_DEFAULT?= 8 # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl +# Possible values: jpeg, jpeg-turbo +JPEG_DEFAULT?= jpeg-turbo # Possible values: 1.8.4 LAZARUS_DEFAULT?= 1.8.4 .if ${ARCH} == amd64 Index: UPDATING =================================================================== --- UPDATING +++ UPDATING @@ -4380,7 +4380,7 @@ If you compile your ports and want to keep using IJG's jpeg implementation, add this line to your /etc/make.conf file: - JPEG_PORT=graphics/jpeg + DEFAULT_VERSIONS+=jpeg=jpeg 20150914: AFFECTS: users of lang/perl5* Index: multimedia/motion/Makefile =================================================================== --- multimedia/motion/Makefile +++ multimedia/motion/Makefile @@ -77,7 +77,7 @@ .include -.if ${JPEG_PORT} == "graphics/jpeg-turbo" +.if ${JPEG_DEFAULT} == "jpeg-turbo" CONFIGURE_ARGS+= --with-jpeg-turbo=${LOCALBASE} .endif