[33206] trunk/dports/x11/gtk2

[nox at macports.org]

Revision: 33206
          http://trac.macosforge.org/projects/macports/changeset/33206
Author:   nox at macports.org
Date:     2008-01-21 06:30:23 -0800 (Mon, 21 Jan 2008)

Log Message:
-----------
gtk2:
 * Linted.
 * Removed old patches.

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Added Paths:
-----------
    trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c.diff

Removed Paths:
-------------
    trunk/dports/x11/gtk2/files/patch-gtk-gdk-x11-gdkspawn-x11.c
    trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimecache.c
    trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2008-01-21 13:26:34 UTC (rev 33205)
+++ trunk/dports/x11/gtk2/Portfile	2008-01-21 14:30:23 UTC (rev 33206)
@@ -3,22 +3,22 @@
 
 PortSystem      1.0
 
-name		    gtk2
-version		    2.12.2
+name            gtk2
+version         2.12.2
 set branch      [join [lrange [split ${version} .] 0 1] .]
-categories	    x11
-maintainers	    nox openmaintainer
-platforms	    darwin
-description	    Gimp ToolKit version 2
+categories      x11
+maintainers     nox openmaintainer
+platforms       darwin
+description     Gimp ToolKit version 2
 
 long_description \
     This is GTK+ version 2.x. GTK+, which stands for Gimp \
     ToolKit, is a library for creating GUIs for the X Windows \
     System.
 
-homepage	    http://www.gtk.org/
-distname	    gtk+-${version}
-use_bzip2	    yes
+homepage        http://www.gtk.org/
+distname        gtk+-${version}
+use_bzip2       yes
 
 master_sites    gnome:sources/gtk+/${branch}/ \
                 ftp://ftp.gtk.org/pub/gtk/v${branch}/ \
@@ -44,11 +44,11 @@
     }
 }
 
-checksums	    md5 a789a8a333d418f47cda1dba106d9aac \
+checksums       md5 a789a8a333d418f47cda1dba106d9aac \
                 sha1 495ff3ef09de44cc23718239967203bd7871b4aa \
                 rmd160 b5cd6b7ec6abf557a6f82c707e0eafb67c813f8d
 
-depends_build	port:gtk-doc \
+depends_build   port:gtk-doc \
                 port:pkgconfig
 
 depends_lib     port:cairo \
@@ -91,7 +91,7 @@
 }
 
 platform darwin 6 {
-    patchfiles-append   patch-gtk-xdgmime-xdgmimemagic.c
+    patchfiles-append   patch-gtk-xdgmime-xdgmimemagic.c.diff
 }
 
 platform darwin 7 {

Deleted: trunk/dports/x11/gtk2/files/patch-gtk-gdk-x11-gdkspawn-x11.c
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk-gdk-x11-gdkspawn-x11.c	2008-01-21 13:26:34 UTC (rev 33205)
+++ trunk/dports/x11/gtk2/files/patch-gtk-gdk-x11-gdkspawn-x11.c	2008-01-21 14:30:23 UTC (rev 33206)
@@ -1,12 +0,0 @@
---- gdk/x11/gdkspawn-x11.c.orig	2005-09-21 10:10:43.000000000 +0100
-+++ gdk/x11/gdkspawn-x11.c	2005-09-21 10:22:42.000000000 +0100
-@@ -28,7 +28,8 @@
- #include <gdk/gdk.h>
- #include "gdkalias.h"
- 
--extern char **environ;
-+#include <crt_externs.h> /* For _NSGetEnviron */
-+#define environ (*_NSGetEnviron())
- 
- /**
-  * gdk_make_spawn_environment_for_screen:

Deleted: trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimecache.c
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimecache.c	2008-01-21 13:26:34 UTC (rev 33205)
+++ trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimecache.c	2008-01-21 14:30:23 UTC (rev 33206)
@@ -1,11 +0,0 @@
---- gtk/xdgmime/xdgmimecache.c.org	2005-04-15 18:03:46.000000000 +0200
-+++ gtk/xdgmime/xdgmimecache.c	2005-04-15 18:06:31.000000000 +0200
-@@ -49,6 +49,8 @@
- #include "xdgmimecache.h"
- #include "xdgmimeint.h"
- 
-+#include <stdint.h>
-+
- #ifndef MAX
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
- #endif

Deleted: trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c	2008-01-21 13:26:34 UTC (rev 33205)
+++ trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c	2008-01-21 14:30:23 UTC (rev 33206)
@@ -1,13 +0,0 @@
---- gtk/xdgmime/xdgmimemagic.c~	Wed Aug 25 19:52:22 2004
-+++ gtk/xdgmime/xdgmimemagic.c	Sun Sep 19 16:53:28 2004
-@@ -44,6 +44,10 @@
- #define	TRUE	(!FALSE)
- #endif
- 
-+#ifndef HAVE_FLOCKFILE
-+#define getc_unlocked getc
-+#endif
-+
- extern int errno;
- 
- typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;

Copied: trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c.diff (from rev 33205, trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c)
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c.diff	                        (rev 0)
+++ trunk/dports/x11/gtk2/files/patch-gtk-xdgmime-xdgmimemagic.c.diff	2008-01-21 14:30:23 UTC (rev 33206)
@@ -0,0 +1,13 @@
+--- gtk/xdgmime/xdgmimemagic.c~	Wed Aug 25 19:52:22 2004
++++ gtk/xdgmime/xdgmimemagic.c	Sun Sep 19 16:53:28 2004
+@@ -44,6 +44,10 @@
+ #define	TRUE	(!FALSE)
+ #endif
+ 
++#ifndef HAVE_FLOCKFILE
++#define getc_unlocked getc
++#endif
++
+ extern int errno;
+ 
+ typedef struct XdgMimeMagicMatch XdgMimeMagicMatch;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080121/136129ab/attachment-0001.html