Attachment 250964 Details for Bug 279306 – sort out Makefile and pet portclippy

[patch] sort out Makefile and pet portclippy

gimp.diff (text/plain), 6.91 KB, created by Vladimir Druzenko on 2024-05-25 22:55:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-05-25 22:55:27 UTC

Size: 6.91 KB

patch

obsolete

>diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
>index abe09738b338..782a2b6ead28 100644
>--- a/graphics/gimp-app/Makefile
>+++ b/graphics/gimp-app/Makefile
>@@ -1,11 +1,9 @@
>-PORTNAME?=	gimp
>-PORTVERSION=	2.10.38
>-PORTREVISION?=	0
>-PORTEPOCH?=	1
>-CATEGORIES?=	graphics gnome
>+PORTNAME=	gimp
>+DISTVERSION=	2.10.38
>+PORTEPOCH=	1
>+CATEGORIES=	graphics gnome
> MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
> PKGNAMESUFFIX=	-app
>-#DISTNAME=	gimp-${PORTVERSION}
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	GNU Image Manipulation Program
>@@ -31,13 +29,13 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
> 		libmypaint.so:graphics/libmypaint \
> 		libpng.so:graphics/png \
> 		libpoppler-glib.so:graphics/poppler-glib \
>-		libtiff.so:graphics/tiff
>-LIB_DEPENDS+=	${LIB_DEPENDS_${ARCH}}
>+		libtiff.so:graphics/tiff \
>+		${LIB_DEPENDS_${ARCH}}
> 
>-LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
>-LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
>-LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
>-LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
>+LIB_DEPENDS_aarch64=		libunwind.so:devel/libunwind
>+LIB_DEPENDS_amd64=		libunwind.so:devel/libunwind
>+LIB_DEPENDS_armv7=		libunwind.so:devel/libunwind
>+LIB_DEPENDS_i386=		libunwind.so:devel/libunwind
> LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
> LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
> 
>@@ -45,8 +43,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
> 		glib-networking>=0:net/glib-networking \
> 		mypaint-brushes>0:graphics/mypaint-brushes
> 
>-USES+=		cpe compiler:c++14-lang gettext gmake gnome jpeg libtool \
>-		localbase pkgconfig shebangfix tar:bzip2 xorg
>+USES=		cpe compiler:c++14-lang desktop-file-utils gettext gmake gnome \
>+		jpeg libtool localbase pkgconfig shebangfix tar:bzip2 xorg
> CPE_VENDOR=	gimp
> CPE_PRODUCT=	gimp
> USE_GNOME+=	cairo gtk20 intltool librsvg2
>@@ -55,24 +53,23 @@ USE_XORG=	ice sm x11 xcursor xext xfixes xmu xpm xt
> 
> SHEBANG_FILES=	plug-ins/pygimp/plug-ins/*.py
> 
>-GNU_CONFIGURE=		yes
>-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>-CONFIGURE_ARGS?=	--with-html-dir=${PREFIX}/share/doc/gimp \
>-			--with-bug-report-url="https://bugs.freebsd.org/" \
>-			--disable-gtk-doc \
>-			--without-linux-input \
>-			--with-print \
>-			--without-gudev \
>-			--enable-default-binary \
>-			--disable-gimp-console \
>-			--disable-python \
>-			--without-appdata-test \
>-			--with-desktop-dir=${PREFIX}/share \
>-			--docdir=${PREFIX}/share/doc/gimp \
>-			--with-icc-directory=${LOCALBASE}/share/color/icc \
>-			--without-webkit \
>-			--enable-default-binary
>-CONFIGURE_ENV=		GIMP_THREAD_LIBS=-lpthread
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc/gimp \
>+		--with-bug-report-url="https://bugs.freebsd.org/" \
>+		--disable-gtk-doc \
>+		--without-linux-input \
>+		--with-print \
>+		--without-gudev \
>+		--enable-default-binary \
>+		--disable-gimp-console \
>+		--disable-python \
>+		--without-appdata-test \
>+		--with-desktop-dir=${PREFIX}/share \
>+		--docdir=${PREFIX}/share/doc/gimp \
>+		--with-icc-directory=${LOCALBASE}/share/color/icc \
>+		--without-webkit \
>+		--enable-default-binary
>+CONFIGURE_ENV=	GIMP_THREAD_LIBS=-lpthread
> 
> INSTALL_TARGET=	install-strip
> .if !defined(XAUTHORITY)
>@@ -84,65 +81,46 @@ LIBS+=		-lexecinfo -lm
> 
> PLIST_SUB+=	LIBVER=0.1000.${PORTVERSION:E}
> 
>-.if !defined(GIMP_SLAVE)
>+OPTIONS_DEFINE=			AALIB GHOSTSCRIPT HEIF JXL LIBMNG OPENEXR OPENJPEG \
>+				SIMD WEBP WMF
>+OPTIONS_DEFAULT=		AALIB HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
>+OPTIONS_SUB=			yes
> 
>-USES+=		desktop-file-utils
>+AALIB_DESC=			Ascii-art Plug-in
>+OPENJPEG_DESC=			Enhanced JPEG (JPEG 2000) graphics support
> 
>-OPTIONS_DEFINE?=	AALIB GHOSTSCRIPT HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD \
>-			WEBP WMF
>-OPTIONS_DEFAULT=	AALIB HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF
>-OPTIONS_SUB=		yes
>-
>-.endif
>-
>-.if defined(GIMP_SLAVE)
>-PKG_CONFIG?=		${LOCALBASE}/bin/pkg-config
>-GIMP_LIBS=		`${PKG_CONFIG} --libs gimp-2.0`
>-GIMP_THUMB_LIBS=	`${PKG_CONFIG} --libs gimpthumb-2.0`
>-GIMP_UI_LIBS=		`${PKG_CONFIG} --libs gimpui-2.0`
>-
>-LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
>-
>-.else
>-
>-AALIB_DESC=	Ascii-art Plug-in
>-OPENJPEG_DESC=	Enhanced JPEG (jpeg2000) graphics support
>-
>-AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
>-AALIB_CONFIGURE_WITH=	aa
>+AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
>+AALIB_CONFIGURE_WITH=		aa
> 
> GHOSTSCRIPT_USES=		ghostscript
> GHOSTSCRIPT_CONFIGURE_WITH=	gs
> 
>-HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
>-HEIF_CONFIGURE_WITH=	libheif
>+HEIF_LIB_DEPENDS=		libheif.so:graphics/libheif
>+HEIF_CONFIGURE_WITH=		libheif
> 
>-JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
>-JXL_CONFIGURE_WITH=	jpegxl
>+JXL_LIB_DEPENDS=		libjxl.so:graphics/libjxl
>+JXL_CONFIGURE_WITH=		jpegxl
> 
>-LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
>-LIBMNG_CONFIGURE_WITH=	libmng
>+LIBMNG_LIB_DEPENDS=		libmng.so:graphics/libmng
>+LIBMNG_CONFIGURE_WITH=		libmng
> 
>-OPENEXR_LIB_DEPENDS=	libImath.so:math/Imath \
>-			libOpenEXR.so:graphics/openexr
>-OPENEXR_CONFIGURE_WITH=	openexr
>+OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
>+				libOpenEXR.so:graphics/openexr
>+OPENEXR_CONFIGURE_WITH=		openexr
> 
> OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
> OPENJPEG_CONFIGURE_WITH=	jpeg2000
> 
>-SIMD_CONFIGURE_OFF=	--disable-mmx \
>-			--disable-sse \
>-			--disable-altivec
>-
>-WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
>-WEBP_CONFIGURE_WITH=	webp
>+SIMD_CONFIGURE_OFF=		--disable-mmx \
>+				--disable-sse \
>+				--disable-altivec
> 
>-WMF_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
>-			libwmf.so:graphics/libwmf
>+WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
>+WEBP_CONFIGURE_WITH=		webp
> 
>-WMF_CONFIGURE_WITH=	wmf
>-
>-.endif
>+WMF_LIB_DEPENDS=		libexpat.so:textproc/expat2 \
>+				libwmf.so:graphics/libwmf
>+WMF_CONFIGURE_WITH=		wmf
> 
> .include <bsd.port.options.mk>
> 
>diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
>index 2692d2bd5120..1f57b8a4cfa0 100644
>--- a/graphics/gimp/Makefile
>+++ b/graphics/gimp/Makefile
>@@ -1,23 +1,32 @@
> PORTNAME=	gimp
>-DISTVERSION?=	2.10.38
>-PORTEPOCH?=	2
>+DISTVERSION=	2.10.38
>+PORTEPOCH=	2
> CATEGORIES=	graphics gnome
>+MASTER_SITES=	# empty
>+DISTFILES=	# empty
>+EXTRACT_ONLY=	# empty
> 
> MAINTAINER=	gnome@FreeBSD.org
>-COMMENT=	The "meta-port" for The Gimp
>+COMMENT=	Meta-port for the Gimp
> WWW=		https://www.gimp.org/
> 
>+LICENSE=	GPLv3 LGPL3
>+LICENSE_COMB=	multi
>+
> RUN_DEPENDS=	gimp-2.10:graphics/gimp-app
> 
>-USES+=	metaport
>+USES=		metaport
>+
>+NO_ARCH=	yes
>+NO_BUILD=	yes
> 
>-OPTIONS_DEFINE=	PRINT HELP
>-OPTIONS_DEFAULT=PRINT
>-PRINT_DESC=	Gutenprint (gimp-print) plugin
>-HELP_DESC=	Gimp-Help (50+MB distfile)
>+OPTIONS_DEFINE=		HELP PRINT
>+OPTIONS_DEFAULT=	PRINT
>+HELP_DESC=		Gimp-Help (50+MB distfile)
>+PRINT_DESC=		Gutenprint (gimp-print) plugin
> 
>-HELP_RUN_DEPENDS+=	en-gimp-help-html>=0:misc/gimp-help-en
>-PRINT_RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/gutenprint:print/gimp-gutenprint \
>+HELP_RUN_DEPENDS=	en-gimp-help-html>=0:misc/gimp-help-en
>+PRINT_RUN_DEPENDS=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/gutenprint:print/gimp-gutenprint \
> 			gutenprint>0:print/gutenprint
> 
> .include <bsd.port.mk>

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 279306: 250964