Changeset 8363 for trunk/dports/gnome


Ignore:
Timestamp:
Sep 19, 2004, 6:14:32 PM (15 years ago)
Author:
olegb
Message:

Bug:
Submitted by:
Reviewed by:
Approved by:
Obtained from:
gnome 2.8 !

Location:
trunk/dports/gnome/gnome-vfs
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gnome/gnome-vfs/Portfile

    r7407 r8363  
    1 # $Id: Portfile,v 1.16 2004/06/08 09:20:53 olegb Exp $
     1# $Id: Portfile,v 1.17 2004/09/19 18:14:32 olegb Exp $
    22PortSystem 1.0
    33name            gnome-vfs
    4 version         2.6.1.1
     4version         2.8.0
    55description     This is the GNOME Virtual File System.
    66long_description        This is the GNOME Virtual File System. \
     
    1111platforms       darwin
    1212homepage        http://www.gnome.org/
    13 master_sites    gnome:sources/gnome-vfs/2.6/
    14 checksums       md5 a5a7e86dbe539d64c7be99ccef5bc8db
     13master_sites    gnome:sources/gnome-vfs/2.8/
     14checksums       md5 fbb17f6937b8210ba4bdc7f47dc2ad8b
    1515depends_lib     lib:gnome-mime-magic:gnome-mime-data
    16 patchfiles      patch_gnome-vfs-cdrom.c patch_gnome-vfs-utils.c patch_pty-open.c \
    17                 patch_extfs-method.c patch_file-metod.c patch_bzip2-method.c \
    18                 patch_sftp-method.c
     16patchfiles      patch_gnome-vfs-cdrom.c patch_gnome-vfs-utils.c \
     17                patch_file-metod.c patch_bzip2-method.c patch_pty-open.c
    1918use_bzip2       yes
    2019configure.args  --mandir=${prefix}/share/man --enable-ipv6
    2120configure.env   CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \
    22                 CFLAGS="-no-cpp-precomp -flat_namespace -undefined suppress" \
    23                 PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:/usr/lib/pkgconfig"
    24 #post-destroot  {
    25                 #reinplace "s|libvfolder-desktop.so|libvfolder-desktop.dylib|g" \
    26                     #${destroot}/${prefix}/etc/gnome-vfs-2.0/modules/default-modules.conf
    27                 #}
     21                CFLAGS="-no-cpp-precomp -flat_namespace -undefined suppress -lresolv"
  • trunk/dports/gnome/gnome-vfs/files/patch_gnome-vfs-cdrom.c

    r6301 r8363  
    1 --- libgnomevfs/gnome-vfs-cdrom.c.org   Mon Apr  5 08:17:10 2004
    2 +++ libgnomevfs/gnome-vfs-cdrom.c       Mon Apr  5 08:17:57 2004
    3 @@ -143,8 +143,10 @@
     1--- libgnomevfs/gnome-vfs-cdrom.c.org   Fri Sep 17 13:59:52 2004
     2+++ libgnomevfs/gnome-vfs-cdrom.c       Fri Sep 17 14:00:01 2004
     3@@ -143,6 +143,7 @@
    44 #endif /* defined(__FreeBSD__) */
    55        return type;
     
    77+       #if !defined(__APPLE__)
    88        *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
     9        if (*fd  < 0) {
     10                return -1;
     11@@ -153,6 +154,7 @@
     12                return -1;
     13        }
    914        return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
    1015+       #endif
  • trunk/dports/gnome/gnome-vfs/files/patch_pty-open.c

    r7407 r8363  
    1 --- modules/pty-open.c.org      Fri Jun  4 20:51:58 2004
    2 +++ modules/pty-open.c  Fri Jun  4 20:53:17 2004
    3 @@ -44,6 +44,12 @@
    4  #include <glib.h>
    5  #include "pty-open.h"
     1--- modules/pty-open.c.org      Fri Sep 17 17:43:28 2004
     2+++ modules/pty-open.c  Fri Sep 17 17:49:03 2004
     3@@ -554,51 +554,6 @@
     4 static char *
     5 _gnome_vfs_pty_ptsname(int master)
     6 {
     7-#if defined(HAVE_PTSNAME_R)
     8-       gsize len = 1024;
     9-       char *buf = NULL;
     10-       int i;
     11-       do {
     12-               buf = g_malloc0(len);
     13-               i = ptsname_r(master, buf, len - 1);
     14-               switch (i) {
     15-               case 0:
     16-                       /* Return the allocated buffer with the name in it. */
     17-#ifdef GNOME_VFS_DEBUG
     18-                       if (_gnome_vfs_debug_on(GNOME_VFS_DEBUG_PTY)) {
     19-                               fprintf(stderr, "PTY slave is `%s'.\n", buf);
     20-                       }
     21-#endif
     22-                       return buf;
     23-                       break;
     24-               default:
     25-                       g_free(buf);
     26-                       buf = NULL;
     27-                       break;
     28-               }
     29-               len *= 2;
     30-       } while ((i != 0) && (errno == ERANGE));
     31-#elif defined(HAVE_PTSNAME)
     32-       char *p;
     33-       if ((p = ptsname(master)) != NULL) {
     34-#ifdef GNOME_VFS_DEBUG
     35-               if (_gnome_vfs_debug_on(GNOME_VFS_DEBUG_PTY)) {
     36-                       fprintf(stderr, "PTY slave is `%s'.\n", p);
     37-               }
     38-#endif
     39-               return g_strdup(p);
     40-       }
     41-#elif defined(TIOCGPTN)
     42-       int pty = 0;
     43-       if (ioctl(master, TIOCGPTN, &pty) == 0) {
     44-#ifdef GNOME_VFS_DEBUG
     45-               if (_gnome_vfs_debug_on(GNOME_VFS_DEBUG_PTY)) {
     46-                       fprintf(stderr, "PTY slave is `/dev/pts/%d'.\n", pty);
     47-               }
     48-#endif
     49-               return g_strdup_printf("/dev/pts/%d", pty);
     50-       }
     51-#endif
     52        return NULL;
     53 }
    654 
    7 +#undef HAVE_POSIX_OPENPT
    8 +#undef HAVE_GETPT
    9 +#undef HAVE_GRANTPT
    10 +#undef HAVE_PTSNAME_R
    11 +#undef HAVE_UNLOCKPT
    12 +#undef HAVE_PTSNAME
    13  int _gnome_vfs_pty_set_size(int master, int columns, int rows);
     55@@ -606,18 +561,13 @@
     56 _gnome_vfs_pty_getpt(void)
     57 {
     58        int fd, flags;
     59-#ifdef HAVE_GETPT
     60-       /* Call the system's function for allocating a pty. */
     61-       fd = getpt();
     62-#elif defined(HAVE_POSIX_OPENPT)
     63-       fd = posix_openpt(O_RDWR | O_NOCTTY);
     64-#else
     65-       /* Try to allocate a pty by accessing the pty master multiplex. */
     66-       fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
     67-       if ((fd == -1) && (errno == ENOENT)) {
     68-               fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
     69-       }
     70-#endif
     71+
     72+        /* Try to allocate a pty by accessing the pty master multiplex. */
     73+        fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
     74+        if ((fd == -1) && (errno == ENOENT)) {
     75+                fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
     76+        }
     77+
     78        /* Set it to blocking. */
     79        flags = fcntl(fd, F_GETFL);
     80        flags &= ~(O_NONBLOCK);
     81@@ -628,24 +578,13 @@
     82 static int
     83 _gnome_vfs_pty_grantpt(int master)
     84 {
     85-#ifdef HAVE_GRANTPT
     86-       return grantpt(master);
     87-#else
     88        return 0;
     89-#endif
     90 }
    1491 
    15  /* Reset the handlers for all known signals to their defaults.  The parent
     92 static int
     93 _gnome_vfs_pty_unlockpt(int fd)
     94 {
     95-#ifdef HAVE_UNLOCKPT
     96-       return unlockpt(fd);
     97-#elif defined(TIOCSPTLCK)
     98-       int zero = 0;
     99-       return ioctl(fd, TIOCSPTLCK, &zero);
     100-#else
     101        return -1;
     102-#endif
     103 }
     104 
     105 static int
Note: See TracChangeset for help on using the changeset viewer.