diff --git a/graphics/imlib2-jxl/Makefile b/graphics/imlib2-jxl/Makefile --- a/graphics/imlib2-jxl/Makefile +++ b/graphics/imlib2-jxl/Makefile @@ -2,6 +2,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.2.0 CATEGORIES= graphics +PKGNAMESUFFIX= -external PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= de2b38f5f34f.patch:-p1 # libjxl 0.9 @@ -23,6 +24,8 @@ ALL_TARGET= # empty PLIST_FILES= lib/imlib2/loaders/jxl.so +CONFLICTS_INSTALL= imlib2-jxl + OPTIONS_DEFINE= LCMS2 OPTIONS_DEFAULT=LCMS2 diff --git a/graphics/imlib2-webp/Makefile b/graphics/imlib2-webp/Makefile --- a/graphics/imlib2-webp/Makefile +++ b/graphics/imlib2-webp/Makefile @@ -2,6 +2,7 @@ PORTVERSION= 20230222 PORTREVISION= 1 CATEGORIES= graphics +PKGNAMESUFFIX= -external MAINTAINER= eduardo@FreeBSD.org COMMENT= WebP image loader plugin for Imlib 2 @@ -18,7 +19,7 @@ GH_ACCOUNT= gawen947 GH_TAGNAME= d7a8b758576 -CONFLICTS_INSTALL= imlib2 +CONFLICTS_INSTALL= imlib2-webp PLIST_FILES= lib/imlib2/loaders/webp.so diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,6 +1,6 @@ PORTNAME= imlib2 DISTVERSION= 1.12.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= SF/enlightenment/imlib2-src/${DISTVERSION} @@ -44,9 +44,11 @@ JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg -JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +JXL_SUBPACKAGES= jxl +LIB_DEPENDS.jxl= libjxl.so:graphics/libjxl +SELF_DEPENDS.jxl= main JXL_CONFIGURE_WITH= jxl -JXL_CONFLICTS_INSTALL= imlib2-jxl +JXL_CONFLICTS_INSTALL= imlib2-jxl-external PNG_LIB_DEPENDS= libpng16.so:graphics/png PNG_CONFIGURE_WITH= png @@ -54,9 +56,11 @@ TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff -WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp +WEBP_SUBPACKAGES= webp +LIB_DEPENDS.webp= libwebpdemux.so:graphics/webp +SELF_DEPENDS.webp= main WEBP_CONFIGURE_WITH= webp -WEBP_CONFLICTS_INSTALL= imlib2-webp +WEBP_CONFLICTS_INSTALL= imlib2-webp-external X11_USES= xorg X11_USE= XORG=sm,x11,xcb,xext diff --git a/graphics/imlib2/pkg-message b/graphics/imlib2/pkg-message new file mode 100644 --- /dev/null +++ b/graphics/imlib2/pkg-message @@ -0,0 +1,10 @@ +[ +{ type: upgrade + maximum_version: "1.12.1_1,2" + message: <