Index: head/www/nginx/Makefile =================================================================== --- head/www/nginx/Makefile +++ head/www/nginx/Makefile @@ -14,6 +14,10 @@ LICENSE= BSD2CLAUSE +CONFLICTS_INSTALL= nginx-devel + +PORTSCOUT= limit:^1\.12\.[0-9]* + USES+= cpe CPE_VENDOR= nginx @@ -239,9 +243,9 @@ .include .if ${PORT_OPTIONS:MX11} -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick .else -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 .endif .if ${PORT_OPTIONS:MPASSENGER} @@ -465,11 +469,11 @@ .endif .if ${PORT_OPTIONS:MFASTDFS} -NGINX_FASTDFS_VERSION= 5a8110f -GH_ACCOUNT+= happyfish100:fastdfs -GH_PROJECT+= fastdfs-nginx-module:fastdfs -GH_TAGNAME+= ${NGINX_FASTDFS_VERSION}:fastdfs -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config +NGINX_FASTDFS_VERSION= 5a8110f +GH_ACCOUNT+= happyfish100:fastdfs +GH_PROJECT+= fastdfs-nginx-module:fastdfs +GH_TAGNAME+= ${NGINX_FASTDFS_VERSION}:fastdfs +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \ ${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \