[50839] trunk/dports/gnome/gedit

devans at macports.org devans at macports.org
Sun May 10 18:44:07 PDT 2009


Revision: 50839
          http://trac.macports.org/changeset/50839
Author:   devans at macports.org
Date:     2009-05-10 18:44:07 -0700 (Sun, 10 May 2009)
Log Message:
-----------
gedit:

  * take maintainership openmaintainer
  * update to version 2.26.1
  * update dependencies
  * remove outdated patch files
  * install/update gconf schema files post-activate

Modified Paths:
--------------
    trunk/dports/gnome/gedit/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gedit/files/patch-configure.ac.diff
    trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff

Removed Paths:
-------------
    trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-commands.override.diff
    trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-override.diff
    trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-module.c.diff
    trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-plugin.c.diff
    trunk/dports/gnome/gedit/files/patch-plugins-externaltools-data-Makefile.in.diff

Modified: trunk/dports/gnome/gedit/Portfile
===================================================================
--- trunk/dports/gnome/gedit/Portfile	2009-05-10 21:53:16 UTC (rev 50838)
+++ trunk/dports/gnome/gedit/Portfile	2009-05-11 01:44:07 UTC (rev 50839)
@@ -4,42 +4,65 @@
 PortSystem 1.0
 
 name		gedit
-version		2.24.0
+version		2.26.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description	GNOME editor.
 long_description        ${description}
-maintainers	nomaintainer
+maintainers	devans openmaintainer
 categories	gnome editors
 platforms	darwin
 homepage	http://www.gnome.org/projects/gedit/
 master_sites    gnome:sources/${name}/${branch}/
-checksums	md5 c6a13bd45ddde3e6a1e45131f430086b \
-		sha1 a024a0bd15872628c5045e1093cb079859834b80
+
+checksums       md5     ced9cdd3da86cbc8ed353f7ebd3c398f \
+                sha1    741483dcaa6c92f908f27cb2f3197c3811f4462a \
+                rmd160  90460809013e4c0f657442c55b62cfc6df07cde0
+
+depends_build	\
+        port:p5-xml-parser \
+        port:gtk-doc \
+	port:intltool \
+        port:gnome-doc-utils \
+        port:autoconf \
+        port:automake
+
 depends_lib	\
 	port:gtksourceview2 \
-	port:eel \
-	port:dbus-glib \
-	port:py25-pygtksourceview \
-	port:py25-gnome \
+	port:gconf \
+        port:py25-gobject \
+        port:py25-gtk \
+        port:py25-pygtksourceview \
 	port:iso-codes \
-	port:xorg-libsm \
-	port:enchant
-depends_build	\
-	port:gnome-doc-utils
+        port:enchant \
+        port:policykit \
+        port:xorg-libsm
+
 use_bzip2 	yes
 
-patchfiles 	patch-gedit-gedit-python-module.c.diff \
-		patch-gedit-gedit-python-plugin.c.diff \
-		patch-bindings-python-gedit-override.diff \
-		patch-bindings-python-gedit-commands.override.diff \
-		patch-plugins-externaltools-data-Makefile.in.diff
+post-extract {
+    file copy ${worksrcpath}/configure.ac ${worksrcpath}/configure.ac.orig
+}
 
+patchfiles      patch-configure.ac.diff \
+                patch-gedit-smclient-Makefile.am.diff
+
+use_autoreconf    yes
+autoreconf.args   -vfi
+
 configure.args  --mandir=${prefix}/share/man \
-		--disable-scrollkeeper
-configure.env	PYTHON=${prefix}/bin/python2.5
+		--disable-scrollkeeper \
+                --disable-schemas-install
 
+configure.python ${prefix}/bin/python2.5
+
+variant no_x11 {
+        depends_lib-delete  port:xorg-libsm
+}
+
 post-activate	{
 	system "${prefix}/bin/scrollkeeper-update"
+        system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+             gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
 }
 
 livecheck.check regex

Deleted: trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-commands.override.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-commands.override.diff	2009-05-10 21:53:16 UTC (rev 50838)
+++ trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-commands.override.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -1,10 +0,0 @@
---- bindings/python/geditcommands.override.orig	2007-07-21 12:31:19.000000000 +0200
-+++ bindings/python/geditcommands.override	2008-02-08 09:08:04.000000000 +0100
-@@ -2,6 +2,7 @@
- headers
- #define NO_IMPORT_PYGOBJECT
- #include "pygobject.h"
-+#define NO_IMPORT_PYGTK
- #include <pygtk/pygtk.h>
- 
- #include "gedit-commands.h"

Deleted: trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-override.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-override.diff	2009-05-10 21:53:16 UTC (rev 50838)
+++ trunk/dports/gnome/gedit/files/patch-bindings-python-gedit-override.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -1,10 +0,0 @@
---- bindings/python/gedit.override.orig	2007-07-27 12:30:04.000000000 +0200
-+++ bindings/python/gedit.override	2008-02-08 09:07:45.000000000 +0100
-@@ -2,6 +2,7 @@
- headers
- #define NO_IMPORT_PYGOBJECT
- #include "pygobject.h"
-+#define NO_IMPORT_PYGTK
- #include <pygtk/pygtk.h>
- 
- #include "gedit-language-manager.h"

Added: trunk/dports/gnome/gedit/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/gedit/files/patch-configure.ac.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -0,0 +1,39 @@
+--- configure.ac.orig	2009-04-13 08:46:20.000000000 -0700
++++ configure.ac	2009-05-10 17:41:50.000000000 -0700
+@@ -93,6 +93,25 @@
+ 	AC_DEFINE([PLATFORM_OSX],[1],[Defined if platform is Mac OSX])
+ fi
+ 
++dnl check for gdk quartz support
++AC_MSG_CHECKING([if GDK supports quartz])
++gdk_has_quartz=no
++if $PKG_CONFIG --exists gdk-quartz-2.0; then
++       gdk_has_quartz=yes
++fi
++AC_MSG_RESULT([$gdk_has_quartz])
++
++dnl check if osx quartz platform
++AC_MSG_CHECKING([if platform is osx quartz])
++platform_osx_quartz=no
++if test "$platform_osx" = "yes" &&
++   test "$gdk_has_quartz" = "yes" ; then
++        platform_osx_quartz=yes
++fi
++AC_MSG_RESULT([$platform_osx_quartz])
++
++AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "$platform_osx_quartz" = "yes")
++
+ dnl ===============================================================
+ dnl Expanded dirs
+ dnl ===============================================================
+@@ -233,8 +252,8 @@
+ 
+ AM_CONDITIONAL(BUILD_SEXY, test "$gtkatleast" = "no")
+ 
+-if test "$platform_osx" = "no" &&
+-   test "$os_win32" = no; then
++if test "$platform_osx_quartz" = "no" &&
++   test "$os_win32" = "no"; then
+ 	PKG_CHECK_MODULES(EGG_SMCLIENT, [
+ 		sm >= 1.0.0
+ 	])

Deleted: trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-module.c.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-module.c.diff	2009-05-10 21:53:16 UTC (rev 50838)
+++ trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-module.c.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -1,10 +0,0 @@
---- gedit/gedit-python-module.c.orig	2008-10-17 21:52:44.000000000 -0400
-+++ gedit/gedit-python-module.c	2008-10-17 21:53:55.000000000 -0400
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#define NO_IMPORT_PYGTK
- #include <Python.h>
- #include <pygobject.h>
- #include <pygtk/pygtk.h>

Deleted: trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-plugin.c.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-plugin.c.diff	2009-05-10 21:53:16 UTC (rev 50838)
+++ trunk/dports/gnome/gedit/files/patch-gedit-gedit-python-plugin.c.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -1,11 +0,0 @@
---- gedit/gedit-python-plugin.c.orig	2007-07-21 12:31:18.000000000 +0200
-+++ gedit/gedit-python-plugin.c	2008-02-08 00:04:14.000000000 +0100
-@@ -25,7 +25,7 @@
- #include "gedit-python-plugin.h"
- #include "gedit-plugin.h"
- #include "gedit-debug.h"
--
-+#define NO_IMPORT_PYGOBJECT
- #include <pygobject.h>
- #include <string.h>
- 

Added: trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/gnome/gedit/files/patch-gedit-smclient-Makefile.am.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -0,0 +1,11 @@
+--- gedit/smclient/Makefile.am.orig	2009-05-09 19:07:51.000000000 -0700
++++ gedit/smclient/Makefile.am	2009-05-09 19:08:22.000000000 -0700
+@@ -2,7 +2,7 @@
+ platform_sources = eggsmclient-win32.c
+ platform_logout_test_ldflags = -mwindows
+ else
+-if PLATFORM_OSX
++if PLATFORM_OSX_QUARTZ
+ platform_defines = -xobjective-c
+ platform_ldflags = -framework Carbon
+ platform_sources = eggsmclient-osx.c

Deleted: trunk/dports/gnome/gedit/files/patch-plugins-externaltools-data-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-plugins-externaltools-data-Makefile.in.diff	2009-05-10 21:53:16 UTC (rev 50838)
+++ trunk/dports/gnome/gedit/files/patch-plugins-externaltools-data-Makefile.in.diff	2009-05-11 01:44:07 UTC (rev 50839)
@@ -1,11 +0,0 @@
---- plugins/externaltools/data/Makefile.in.orig	Thu Jan 11 00:53:33 2007
-+++ plugins/externaltools/data/Makefile.in	Thu Jan 11 00:53:41 2007
-@@ -471,7 +471,7 @@
- # (.desktop), which happens to be translated using intltool.
- $(tools_SCRIPTS): %: %.tool.in %.desktop $(TOOL_MERGE)
- 	perl $(TOOL_MERGE) -o $@ $< $(word 2,$^)
--	chmod --reference=$< $@
-+	chmod 0755 $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090510/b5a5ddb5/attachment-0001.html>


More information about the macports-changes mailing list