<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dd8618acad6c60c62814c33a4a35a75046db2ee5">https://github.com/macports/macports-ports/commit/dd8618acad6c60c62814c33a4a35a75046db2ee5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dd8618acad6c60c62814c33a4a35a75046db2ee5
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Aug 4 09:03:50 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> gimp-app: obsolete port, replace with gimp2-launcher
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update gimp to depend on gimp2-launcher
</span><span style='display:block; white-space:pre;color:#404040;'> * Update gimp2-launcher to automatically deactivate gimp-app, if presently installed
</span>---
aqua/gimp-app/Portfile | 60 ++--------------------
...patch-ScriptExec.xcodeproj-project.pbxproj.diff | 10 ----
.../files/patch-ScriptExecController.m.diff | 11 ----
aqua/gimp2-launcher/Portfile | 13 ++++-
graphics/gimp/Portfile | 3 +-
5 files changed, 19 insertions(+), 78 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/gimp-app/Portfile b/aqua/gimp-app/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b340479950d..817c5aa054b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/gimp-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/gimp-app/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcode 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name gimp-app
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts-append gimp2-launcher
</span> version 2.8.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories aqua graphics
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description GIMP.app application bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gimp-app.sourceforge.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname GIMPskel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir GIMPskel/ScriptExecCocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c61d0e566d87c772b98cf7d8d8338994c4ce23d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ad1693cb10c415e8bc283d398a4952657b3a9dbfc4c6d6157211501c22ac6134 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 262127
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run path:bin/gimp:gimp2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gimpapp ${workpath}/GIMPskel/GIMP.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${gimpapp}/Contents/Resources/script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${gimpapp}/Contents/Resources/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${gimpapp}/Contents/Resources/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ScriptExec.xcodeproj-project.pbxproj.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ScriptExecController.m.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a temporary kludge. The new Xcode build system fails to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# destroot this for reasons that are poorly understood.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove this when a better fix is known.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${xcodeversion} 10.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args -UseNewBuildSystem=NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/ScriptExec.app/Contents/MacOS/ScriptExec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${gimpapp}/Contents/MacOS/GIMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/gimp ${gimpapp}/Contents/Resources/GIMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin ${gimpapp}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib ${gimpapp}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share ${gimpapp}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/etc ${gimpapp}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${gimpapp} ${destroot}${applications_dir}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/ScriptExec.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: Port obsoleted 2021-08-04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by gimp2-launcher
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/gimp-app/files/patch-ScriptExec.xcodeproj-project.pbxproj.diff b/aqua/gimp-app/files/patch-ScriptExec.xcodeproj-project.pbxproj.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 10f47be264f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/gimp-app/files/patch-ScriptExec.xcodeproj-project.pbxproj.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ScriptExec.xcodeproj/project.pbxproj.orig 2008-09-18 13:02:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ScriptExec.xcodeproj/project.pbxproj 2011-03-19 05:59:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,7 +241,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_WARN_UNUSED_VARIABLE = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ONLY_ACTIVE_ARCH = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREBINDING = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = Release;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/gimp-app/files/patch-ScriptExecController.m.diff b/aqua/gimp-app/files/patch-ScriptExecController.m.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 73b30690ec9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/gimp-app/files/patch-ScriptExecController.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ScriptExecController.m.orig 2014-01-14 09:42:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ScriptExecController.m 2014-01-14 09:43:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSEnumerator *enumerator = [files objectEnumerator];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- id filename;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- args[i++] = strdup([[[NSBundle mainBundle] pathForResource:@"script"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args[i++] = strdup([[[NSBundle mainBundle] pathForResource:@"GIMP"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ofType:nil] UTF8String]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (filename = [enumerator nextObject]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args[i++] = strdup([filename UTF8String]);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/gimp2-launcher/Portfile b/aqua/gimp2-launcher/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdf4edba0e1..60c2d5f5ba4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/gimp2-launcher/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/gimp2-launcher/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,16 +3,21 @@
</span> PortSystem 1.0
name gimp2-launcher
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # should match gimp2 version
version 2.10.24
revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories aqua graphics
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description GIMP.app application bundle
long_description ${description}
homepage https://www.gimp.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set branch [join [lrange [split ${version} .] 0 1] .]
master_sites gimp:gimp/v${branch}/osx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +33,6 @@ supported_archs noarch
</span>
use_dmg yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts-append gimp-app
</span> depends_run-append path:bin/gimp:gimp2
patchfiles-append patch-Info.plist.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,5 +58,12 @@ destroot {
</span> copy ${worksrcpath}/GIMP.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Automatically remove obsolete port 'gimp-app', if installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active gimp-app] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite gimp-app "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.url https://download.gimp.org/pub/gimp/v2.10/osx/
livecheck.regex {gimp-(\d+(?:\.\d+)*)-.*\.dmg}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp/Portfile b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 146ba4e360c..91276e72dfd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,8 @@ depends_lib port:gimp-lqr-plugin \
</span> port:gutenprint
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:${applications_dir}/GIMP.app/Contents/MacOS/GIMP:gimp-app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gimp2-launcher
</span> }
distfiles
</pre><pre style='margin:0'>
</pre>