[27319] trunk/dports/graphics/gimp

source_changes at macosforge.org source_changes at macosforge.org
Sun Jul 29 05:14:15 PDT 2007


Revision: 27319
          http://trac.macosforge.org/projects/macports/changeset/27319
Author:   yves at macports.org
Date:     2007-07-29 05:14:15 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Savage Gimp port development

gimp2 now syncs with (stable enough) unstable version
This fixes many issues still present in the stable branch :
python plugins now just work and dbus is included in the command

gimp is now a meta port to include plug-ins and enhancements

python25 now default (ticket:12329)

Modified Paths:
--------------
    trunk/dports/graphics/gimp/Portfile
    trunk/dports/graphics/gimp-dev/Portfile
    trunk/dports/graphics/gimp-user-manual/Portfile
    trunk/dports/graphics/gimp2/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gimp/files/
    trunk/dports/graphics/gimp/files/DO_NOT_README
    trunk/dports/graphics/gimp-dev/files/gimp
    trunk/dports/graphics/gimp-dev/files/gimp-remote
    trunk/dports/graphics/gimp2/files/
    trunk/dports/graphics/gimp2/files/gimp
    trunk/dports/graphics/gimp2/files/gimp-remote

Removed Paths:
-------------
    trunk/dports/graphics/gimp-dev/files/gimp-2.3.in

Modified: trunk/dports/graphics/gimp/Portfile
===================================================================
--- trunk/dports/graphics/gimp/Portfile	2007-07-29 07:39:45 UTC (rev 27318)
+++ trunk/dports/graphics/gimp/Portfile	2007-07-29 12:14:15 UTC (rev 27319)
@@ -2,56 +2,36 @@
 
 PortSystem 1.0
 name            gimp
-version         2.2.17
+version         2.3
 categories      graphics
-maintainers     yves at macports.org
+maintainers     yves
 homepage        http://www.gimp.org/
 platforms       darwin
 
-description     The GNU Image Manipulation Program (version 2)
+description     The Gimp - Batteries Included
 long_description \
 	The GNU Image Manipulation Program (GIMP) is a powerful \
 	tool for the preparation and manipulation of digital images. \
 	The GIMP provides the user with a wide variety of image \
 	manipulation, painting, processing, and rendering tools.
 
-master_sites    ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
-                ftp://ftp.flirble.org/pub/X/gimp/gimp/v2.2/ \
-                ftp://ftp.minet.net/pub/gimp/v2.2/ \
-                ftp://ftp.gimp.org/pub/gimp/v2.2/
-checksums       md5 4f509ed4a605452d88e04045ff388d58
-use_bzip2       yes
+depends_lib     port:icns-gimp \
+                port:gimp-jp2 \
+                port:gutenprint \
+                port:ufraw \
+                port:xsane
 
-depends_lib     port:aalib \
-                port:gimp-print \
-                lib:libgtk-x11-2.0:gtk2 \
-                port:lcms \
-                port:libart_lgpl \
-                port:libexif \
-                port:libmng \
-                port:libwmf \
-                port:p5-xml-parser
-depends_run     bin:gs:ghostscript
-
-configure.args  --enable-mp \
-                --mandir=${prefix}/share/man
-
-post-destroot {
-    file mkdir ${destroot}${prefix}/share/applications
-    cd ${destroot}${prefix}/share/applications
-	system "ln -s ../gimp/2.0/misc/gimp.desktop"
+platform macosx {
+    depends_lib-append  port:gimp-app \
+                        port:macclipboard-gimp \
+                        port:macfile-gimp
 }
 
-variant enable_python {
-    depends_lib-append    port:py-gtk2
-    configure.args-append --enable-python
-}
+use_configure   no
+build           {}
 
-variant with_gnome {
-    depends_lib-append	port:libgtkhtml \
-                        port:librsvg
+destroot {
+    xinstall -d ${destroot}${prefix}/share/gimp
+    xinstall -m 644 ${filespath}/DO_NOT_README \
+        ${destroot}${prefix}/share/gimp
 }
-
-platform darwin i386 {
-    configure.args-append   --disable-mmx
-}

Added: trunk/dports/graphics/gimp/files/DO_NOT_README
===================================================================
--- trunk/dports/graphics/gimp/files/DO_NOT_README	                        (rev 0)
+++ trunk/dports/graphics/gimp/files/DO_NOT_README	2007-07-29 12:14:15 UTC (rev 27319)
@@ -0,0 +1,18 @@
+The Gimp - Batteries Included
+
+Includes :
+
+    The GIMP
+    icns plugin (readonly)
+    JPEG 2000 plugin
+    Gutenprint plugin
+    RAW plugin
+    Scanner (Xsane) support
+
+Mac OS X goodies :
+
+    MacClipboard
+    MacFile
+    Gimp.app
+
+Laptop batteries not included.

Modified: trunk/dports/graphics/gimp-dev/Portfile
===================================================================
--- trunk/dports/graphics/gimp-dev/Portfile	2007-07-29 07:39:45 UTC (rev 27318)
+++ trunk/dports/graphics/gimp-dev/Portfile	2007-07-29 12:14:15 UTC (rev 27319)
@@ -4,11 +4,11 @@
 name            gimp-dev
 version         2.3.18
 categories      graphics
-maintainers     yves at macports.org
+maintainers     yves
 homepage        http://www.gimp.org/
 platforms       darwin
 
-description     The GNU Image Manipulation Program (unstable)
+description     The GNU Image Manipulation Program
 long_description \
 	The GNU Image Manipulation Program (GIMP) is a powerful \
 	tool for the preparation and manipulation of digital images. \
@@ -25,7 +25,6 @@
 
 depends_lib     port:aalib \
                 port:curl \
-                port:gimp-print \
                 port:libexif \
                 port:libgnomeui \
                 port:libgtkhtml \
@@ -33,24 +32,26 @@
                 port:librsvg \
                 port:libwmf \
                 port:poppler \
-                port:py-gtk2
+                port:py25-gtk
                 
-configure.pre_args \
-                --prefix="${prefix}/gimp-2.3"
-configure.args  --enable-mp
+configure.env   PYTHON=${prefix}/bin/python2.5
+configure.args  --enable-mp \
+                --with-pdbgen
 
 post-destroot {
-    xinstall -m 755 ${filespath}/gimp-2.3.in \
-    	${destroot}${prefix}/bin/gimp-2.3
-    reinplace "s|@@PREFIX@@|${prefix}|g" \
-    	${destroot}${prefix}/bin/gimp-2.3
+    cd ${destroot}${prefix}/bin
+    xinstall -m 755 ${filespath}/gimp ${filespath}/gimp-remote .
+    reinplace "s|__PREFIX__|${prefix}|" gimp gimp-remote
 }
 
 variant without_gnome {
-    depends_lib-append	port:dbus-glib \
-                        port:libart_lgpl \
-                        port:p5-xml-parser
-    depends_lib-delete	port:libgnomeui \
-                        port:libgtkhtml \
-                        port:librsvg
+    depends_lib-delete	    port:libgnomeui \
+                            port:libgtkhtml \
+                            port:librsvg
+    depends_lib-append	    port:dbus-glib \
+                            port:libart_lgpl \
+                            port:p5-xml-parser
+    configure.args-append   --without-gtkhtml2 \
+                            --without-librsvg \
+                            --without-gnomevfs
 }

Added: trunk/dports/graphics/gimp-dev/files/gimp
===================================================================
--- trunk/dports/graphics/gimp-dev/files/gimp	                        (rev 0)
+++ trunk/dports/graphics/gimp-dev/files/gimp	2007-07-29 12:14:15 UTC (rev 27319)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export PATH=__PREFIX__/bin:$PATH
+
+dbus-launch gimp-2.3 "$@"

Deleted: trunk/dports/graphics/gimp-dev/files/gimp-2.3.in
===================================================================
--- trunk/dports/graphics/gimp-dev/files/gimp-2.3.in	2007-07-29 07:39:45 UTC (rev 27318)
+++ trunk/dports/graphics/gimp-dev/files/gimp-2.3.in	2007-07-29 12:14:15 UTC (rev 27319)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PATH=@@PREFIX@@/gimp-2.3/bin:$PATH
-export PATH
-LD_LIBRARY_PATH=@@PREFIX@@/gimp-2.3/lib
-export LD_LIBRARY_PATH
-
-@@PREFIX@@/gimp-2.3/bin/gimp-2.3 "$@"

Added: trunk/dports/graphics/gimp-dev/files/gimp-remote
===================================================================
--- trunk/dports/graphics/gimp-dev/files/gimp-remote	                        (rev 0)
+++ trunk/dports/graphics/gimp-dev/files/gimp-remote	2007-07-29 12:14:15 UTC (rev 27319)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export PATH=__PREFIX__/bin:$PATH
+
+dbus-launch gimp-remote-2.3 "$@"

Modified: trunk/dports/graphics/gimp-user-manual/Portfile
===================================================================
--- trunk/dports/graphics/gimp-user-manual/Portfile	2007-07-29 07:39:45 UTC (rev 27318)
+++ trunk/dports/graphics/gimp-user-manual/Portfile	2007-07-29 12:14:15 UTC (rev 27319)
@@ -21,7 +21,7 @@
                 port:docbook-xsl \
                 port:docbook-xml-4.3 \
                 port:libxslt \
-                bin:${prefix}/bin/gimp:gimp
+                bin:${prefix}/bin/gimp:gimp2
 
 configure.args  --enable-build
 
@@ -29,5 +29,5 @@
 
 variant without_gimp {
     configure.args-append   --without-gimp
-    depends_build-delete    bin:${prefix}/bin/gimp:gimp
+    depends_build-delete    bin:${prefix}/bin/gimp:gimp2
 }

Modified: trunk/dports/graphics/gimp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp2/Portfile	2007-07-29 07:39:45 UTC (rev 27318)
+++ trunk/dports/graphics/gimp2/Portfile	2007-07-29 12:14:15 UTC (rev 27319)
@@ -2,31 +2,62 @@
 
 PortSystem 1.0
 name            gimp2
-version         2.2.16
+version         2.3.18
 categories      graphics
-maintainers     yves at macports.org
+maintainers     yves
 homepage        http://www.gimp.org/
 platforms       darwin
 
-description     The GNU Image Manipulation Program (version 2)
+description     The GNU Image Manipulation Program
 long_description \
 	The GNU Image Manipulation Program (GIMP) is a powerful \
 	tool for the preparation and manipulation of digital images. \
 	The GIMP provides the user with a wide variety of image \
 	manipulation, painting, processing, and rendering tools.
 
-master_sites    ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
-                ftp://ftp.flirble.org/pub/X/gimp/gimp/v2.2/ \
-                ftp://ftp.minet.net/pub/gimp/v2.2/ \
-                ftp://ftp.gimp.org/pub/gimp/v2.2/
-checksums       md5 2f47dd66d714a970356e275dd1d3caac
+master_sites    ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
+                ftp://ftp.flirble.org/pub/X/gimp/gimp/v2.3/ \
+                ftp://ftp.minet.net/pub/gimp/v2.3/ \
+                ftp://ftp.gimp.org/pub/gimp/v2.3/
+checksums       md5 344945459dd23452b3ba42580a5655e4
 distname        gimp-${version}
 use_bzip2       yes
 
-pre-fetch {
-    ui_msg "
-            the gimp2 port is now just 'gimp'
-            Please use the gimp port from now on
-           "
-    exit 0
+depends_lib     port:aalib \
+                port:curl \
+                port:libexif \
+                port:libgnomeui \
+                port:libgtkhtml \
+                port:libmng \
+                port:librsvg \
+                port:libwmf \
+                port:poppler \
+                port:py25-gtk
+                
+configure.env   PYTHON=${prefix}/bin/python2.5
+configure.args  --enable-mp \
+                --with-pdbgen
+
+post-destroot {
+    cd ${destroot}${prefix}/bin
+    xinstall -m 755 ${filespath}/gimp ${filespath}/gimp-remote .
+    reinplace "s|__PREFIX__|${prefix}|" gimp gimp-remote
 }
+
+variant without_gnome {
+    depends_lib-delete	    port:libgnomeui \
+                            port:libgtkhtml \
+                            port:librsvg
+    depends_lib-append	    port:dbus-glib \
+                            port:libart_lgpl \
+                            port:p5-xml-parser
+    configure.args-append   --without-gtkhtml2 \
+                            --without-librsvg \
+                            --without-gnomevfs
+}
+
+variant python24 {
+    depends_lib-delete	    port:py25-gtk
+    depends_lib-append	    port:py-gtk2
+    configure.env-delete    PYTHON=${prefix}/bin/python2.5
+}
\ No newline at end of file

Added: trunk/dports/graphics/gimp2/files/gimp
===================================================================
--- trunk/dports/graphics/gimp2/files/gimp	                        (rev 0)
+++ trunk/dports/graphics/gimp2/files/gimp	2007-07-29 12:14:15 UTC (rev 27319)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export PATH=__PREFIX__/bin:$PATH
+
+dbus-launch gimp-2.3 "$@"

Added: trunk/dports/graphics/gimp2/files/gimp-remote
===================================================================
--- trunk/dports/graphics/gimp2/files/gimp-remote	                        (rev 0)
+++ trunk/dports/graphics/gimp2/files/gimp-remote	2007-07-29 12:14:15 UTC (rev 27319)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export PATH=__PREFIX__/bin:$PATH
+
+dbus-launch gimp-remote-2.3 "$@"

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070729/beb2669b/attachment.html


More information about the macports-changes mailing list