[119793] users/devans/GNOME-3/stable/dports/gnome/gnome-terminal

[devans at macports.org]

Revision: 119793
          https://trac.macports.org/changeset/119793
Author:   devans at macports.org
Date:     2014-05-06 19:04:05 -0700 (Tue, 06 May 2014)
Log Message:
-----------
GNOME-3/stable: gnome-terminal, merge license information from trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
   + /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-terminal:108265-119792
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154
/users/rmstonecipher/gnome/gnome-terminal:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile	2014-05-07 01:49:45 UTC (rev 119792)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile	2014-05-07 02:04:05 UTC (rev 119793)
@@ -11,7 +11,7 @@
                 ${description}
 maintainers     devans openmaintainer
 categories      gnome
-license         GPL-2+
+license         GPL-3+
 platforms       darwin
 homepage        https://wiki.gnome.org/Apps/Terminal
 master_sites    gnome:sources/${name}/${branch}/

Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch	2014-05-07 01:49:45 UTC (rev 119792)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch	2014-05-07 02:04:05 UTC (rev 119793)
@@ -1,24 +0,0 @@
---- src/terminal-screen.c.orig	2014-02-17 13:39:53.000000000 -0800
-+++ src/terminal-screen.c	2014-03-14 09:35:53.000000000 -0700
-@@ -27,7 +27,7 @@
- #include <unistd.h>
- #include <sys/wait.h>
- #include <fcntl.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -1243,7 +1243,12 @@
-       for (j = 0; j < n_fds; j++) {
-         if (fds[j] == target_fd) {
-           do {
-+#ifdef F_DUPFD_CLOEXEC
-             fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
-+#else
-+            fd = fcntl (fds[j], F_DUPFD, 3);
-+            fcntl(fd, F_SETFD, FD_CLOEXEC);
-+#endif
-           } while (fd == -1 && errno == EINTR);
-           if (fd == -1)
-             _exit (127);

Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (from rev 119792, trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch	2014-05-07 02:04:05 UTC (rev 119793)
@@ -0,0 +1,24 @@
+--- src/terminal-screen.c.orig	2014-02-17 13:39:53.000000000 -0800
++++ src/terminal-screen.c	2014-03-14 09:35:53.000000000 -0700
+@@ -27,7 +27,7 @@
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -1243,7 +1243,12 @@
+       for (j = 0; j < n_fds; j++) {
+         if (fds[j] == target_fd) {
+           do {
++#ifdef F_DUPFD_CLOEXEC
+             fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
++#else
++            fd = fcntl (fds[j], F_DUPFD, 3);
++            fcntl(fd, F_SETFD, FD_CLOEXEC);
++#endif
+           } while (fd == -1 && errno == EINTR);
+           if (fd == -1)
+             _exit (127);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140506/7c8faacf/attachment.html>