[44453] trunk/dports/gnome/libgnomeui

[gwhitney at macports.org]

Revision: 44453
          http://trac.macports.org/changeset/44453
Author:   gwhitney at macports.org
Date:     2008-12-28 15:25:36 -0800 (Sun, 28 Dec 2008)
Log Message:
-----------
Add no_x11 variant to libgnomeui

  In building gnucash-2.2.8 on an OS X 10.5 with Apple's X windows
  installed but in a strict +no_X11 +quartz Macports environment, I
  could only get gnucash to link via the accompanying configure flags
  and patch.  Since there was no no_x11 variant for libgnomeui
  previously, I offer this Portfile with these changes encapsulated as
  a no_x11 variant.  Since I am only adding a new variant, existing
  installs should not need to be redone, and so I am not bumping the
  revision number on the port.  While I am at it, I am deleting two
  very old patch files that are no longer referenced.

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

Added Paths:
-----------
    trunk/dports/gnome/libgnomeui/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/gnome/libgnomeui/files/patch-file-chooser_sucky-desktop-item.c
    trunk/dports/gnome/libgnomeui/files/patch_gnome-multiscreen.c

Modified: trunk/dports/gnome/libgnomeui/Portfile
===================================================================
--- trunk/dports/gnome/libgnomeui/Portfile	2008-12-28 23:07:19 UTC (rev 44452)
+++ trunk/dports/gnome/libgnomeui/Portfile	2008-12-28 23:25:36 UTC (rev 44453)
@@ -26,6 +26,12 @@
                 port:libiconv \
                 port:gettext
 
+variant no_x11 description {Do not link in X11} {
+	configure.args-append   --disable-static --enable-shared --without-x
+	configure.env-append  X11_CFLAGS=' ' X11_LIBS=' ' SM_CFLAGS=' ' SM_LIBS=' '
+	patchfiles-append patch-configure.diff
+}
+
 livecheck.check regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
 livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

Added: trunk/dports/gnome/libgnomeui/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/libgnomeui/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/gnome/libgnomeui/files/patch-configure.diff	2008-12-28 23:25:36 UTC (rev 44453)
@@ -0,0 +1,31 @@
+*** configure.orig	2008-09-22 08:26:09.000000000 -0400
+--- configure	2008-12-27 18:11:26.000000000 -0500
+***************
+*** 29309,29321 ****
+  	:
+  fi
+  
+! if test "$GNOME_HAVE_SM" = true; then
+! 
+! cat >>confdefs.h <<\_ACEOF
+! #define HAVE_LIBSM 1
+! _ACEOF
+! 
+! fi
+  
+  
+  GNOMEUI_MODULES="  libxml-2.0 >= 2.4.20   libgnome-2.0 >= 2.13.7   libgnomecanvas-2.0 >= 2.0.0   libbonoboui-2.0 >= 2.13.1   gconf-2.0 >= 1.1.11   pango >= 1.1.2   glib-2.0 >= 2.16.0
+--- 29309,29321 ----
+  	:
+  fi
+  
+! #if test "$GNOME_HAVE_SM" = true; then
+! #
+! #cat >>confdefs.h <<\_ACEOF
+! ##define HAVE_LIBSM 1
+! #_ACEOF
+! #
+! #fi
+  
+  
+  GNOMEUI_MODULES="  libxml-2.0 >= 2.4.20   libgnome-2.0 >= 2.13.7   libgnomecanvas-2.0 >= 2.0.0   libbonoboui-2.0 >= 2.13.1   gconf-2.0 >= 1.1.11   pango >= 1.1.2   glib-2.0 >= 2.16.0

Deleted: trunk/dports/gnome/libgnomeui/files/patch-file-chooser_sucky-desktop-item.c
===================================================================
--- trunk/dports/gnome/libgnomeui/files/patch-file-chooser_sucky-desktop-item.c	2008-12-28 23:07:19 UTC (rev 44452)
+++ trunk/dports/gnome/libgnomeui/files/patch-file-chooser_sucky-desktop-item.c	2008-12-28 23:25:36 UTC (rev 44453)
@@ -1,16 +0,0 @@
---- file-chooser/sucky-desktop-item.c.org	Wed Sep 14 00:52:11 2005
-+++ file-chooser/sucky-desktop-item.c	Wed Sep 14 00:54:15 2005
-@@ -67,7 +67,12 @@
- 
- #define sure_string(s) ((s)!=NULL?(s):"")
- 
--extern char **environ;
-+#ifdef __APPLE__
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#elif
-+ extern char **environ;
-+#endif
- 
- struct _SuckyDesktopItem {
- 	int refcount;

Deleted: trunk/dports/gnome/libgnomeui/files/patch_gnome-multiscreen.c
===================================================================
--- trunk/dports/gnome/libgnomeui/files/patch_gnome-multiscreen.c	2008-12-28 23:07:19 UTC (rev 44452)
+++ trunk/dports/gnome/libgnomeui/files/patch_gnome-multiscreen.c	2008-12-28 23:25:36 UTC (rev 44453)
@@ -1,16 +0,0 @@
---- libgnomeui/gnome-multiscreen.c.org	Mon Apr  5 20:14:10 2004
-+++ libgnomeui/gnome-multiscreen.c	Mon Apr  5 20:14:30 2004
-@@ -26,7 +26,12 @@
- 
- #include <string.h>
- 
--extern char **environ;
-+#ifdef __APPLE__
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#elif
-+ extern char **environ;
-+#endif
- 
- /**
-  * make_environment_for_screen:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081228/f05fdaf9/attachment.html>