From nobody Fri May 31 19:45:16 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VrYW13svhz5LFxc; Fri, 31 May 2024 19:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VrYW13BBlz4NSW; Fri, 31 May 2024 19:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717184717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6unSgTlBqJk0e3EazrN1c1AAx31NPw2lqwzL3g2HQ9g=; b=np3ZR7hy+ZkV3OGA6LZOSgeaB3JAkCJDkpb78FEg9M496zlvmDVeLnAoUY7puwLgocVYZx WiQvQoU8fod19DN7RvRQc9Q6c7BxR0c07BhD/tTta05ZCF3a4oRQcOtonqsPI2vEwgflTP gQXczG0XMWCoXEyi3NPvUWPLZEkepoTGyKIwtec7PvIKkz4ShFFraXgNRiCeIzYQyhD9Gq m5znqQUyGhHfgSMRlFOa3x4oSGm82UZPjK9r5O7jbSCAYN4FhEGpfTjHJzXErIbbB068r0 FN/oLxEQvIZHIoJB8cq1ON6EI7EHr8jjKlBt8kUSHD9azMZWdnhb3fpDFAQJMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717184717; a=rsa-sha256; cv=none; b=VVjuTE8mhvf/CPPlHGpJbnmAGJ67rXiFqiAADgyh2ud+hXjyPBcccXwy9IFDSaEY+7nOdq LcEkIG8XPjeHILs80t+zgc/hbMkMpSNAzsYikdg3WRfS+D+tf4yF4EF6iGrRLxLtXImf7o oRrwDXsbmaSIfaCTNGnJrSzJwhkraG5o9xPz+fTf8s1o+2x7VuXYZLlL4U7ynawyI7J0JG 1tGc6K84Nq/rAMLEklLDi0LWT/U94HN2kLuQhAvFSQEcnHkw3hkdKC2TLQmpfROjFMQUf1 wRLnuiam8zjqviyaJHoKpzfuSvVq/RFc3RVkJPOBmP6G1TdIsWEuwjP0BXueNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717184717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6unSgTlBqJk0e3EazrN1c1AAx31NPw2lqwzL3g2HQ9g=; b=cdSM++UhhaQguL2/95z87M/LBwGv9E7UefhNBROjGMql1Kl8XpIRvSJFA3sOyEI9d5EBrI UGoiLNBD91EE8FbluF1RPbkCJOpvStGcqLDGuJSdxVL0d/jp1goMq9S1XptxVMW4zsUE3B QdsBGoGpGxSSYRlgnRFJP31CHBy88YHsupioVPWKGRJlGJgP6VxxTq7q4gOGEmIx1ubfKa tuYf7u+U7CscfNHNUKnv1V87nlnHqwY6FHeL9FKRnGzyjmEjlaxOvhfSTErs1cY2jIi7an 5Q1EFU8SAE2ndM+4DiV/D3m7E+OgDrAB00XQUCA0qnVxgiRbgEBwBpaEvPMQlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VrYW12LFrzcr9; Fri, 31 May 2024 19:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VJjGJi084565; Fri, 31 May 2024 19:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VJjGxT084562; Fri, 31 May 2024 19:45:16 GMT (envelope-from git) Date: Fri, 31 May 2024 19:45:16 GMT Message-Id: <202405311945.44VJjGxT084562@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: ef5ce59f10cb - main - graphics/gimp{,-app}: sort out Makefile and pet portclippy List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef5ce59f10cbc3828e68ac7e8b6111f86bd217cf Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef5ce59f10cbc3828e68ac7e8b6111f86bd217cf commit ef5ce59f10cbc3828e68ac7e8b6111f86bd217cf Author: Vladimir Druzenko AuthorDate: 2024-05-31 19:41:00 +0000 Commit: Vladimir Druzenko CommitDate: 2024-05-31 19:41:00 +0000 graphics/gimp{,-app}: sort out Makefile and pet portclippy Changes: - converted to DISTVERSION; - pet protclippy; - alphabetical sort options; - removed SLAVE code - the port has had no slaves for several years; - other minor changes. PR: 279306 Approved by: fluffy (gnome, maintainer) --- graphics/gimp-app/Makefile | 130 +++++++++++++++++++-------------------------- graphics/gimp/Makefile | 29 ++++++---- 2 files changed, 73 insertions(+), 86 deletions(-) diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index abe09738b338..65bd46afbf63 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-altivec \ + --disable-mmx \ + --disable-sse -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 diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 2692d2bd5120..225f4936c222 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 (60+MB installed) +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