diff options
| author | tron <tron> | 1999-01-04 21:58:12 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-01-04 21:58:12 +0000 |
| commit | 3249326ebe7ef9137c64b44842498e52d99ae046 (patch) | |
| tree | 9a5b8e9e0a089222609f82a0ab41e40663aadb19 /x11 | |
| parent | bf54d58bb050f1cd1cccdf3a1d2814d32aeab8fc (diff) | |
| download | pkgsrc-3249326ebe7ef9137c64b44842498e52d99ae046.tar.gz | |
Merge patches supplied by Clifford Wright in PR pkg/6389 to make this
package compile on 1.3 and 1.3.x.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-core/patches/patch-ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/x11/gnome-core/patches/patch-ac b/x11/gnome-core/patches/patch-ac index 64cf19b46b7..a20d9c849ea 100644 --- a/x11/gnome-core/patches/patch-ac +++ b/x11/gnome-core/patches/patch-ac @@ -1,18 +1,17 @@ -$NetBSD: patch-ac,v 1.1.1.1 1998/10/07 19:45:26 agc Exp $ +$NetBSD: patch-ac,v 1.2 1999/01/04 21:58:12 tron Exp $ -Make this compile on NetBSD as well as FreeBSD. (June 1995 was the -release of 4.4BSD-lite). +Make this compile on NetBSD, as well as FreeBSD. ---- applets/modemlights/modemlights.c 1998/10/05 14:51:41 1.1 -+++ applets/modemlights/modemlights.c 1998/10/05 15:03:55 -@@ -222,17 +222,17 @@ +--- applets/modemlights/modemlights.c.orig Mon Dec 14 20:34:38 1998 ++++ applets/modemlights/modemlights.c Mon Jan 4 22:39:43 1999 +@@ -226,17 +226,21 @@ struct ppp_stats stats; memset(&ifreq, 0, sizeof(ifreq)); -#ifndef __FreeBSD__ - strncpy(ifreq.ifr_ifrn.ifrn_name, device_name, IFNAMSIZ); -#else -+#if (defined(BSD) && BSD >= 199506) ++#if (defined(BSD) && BSD >= 199506) || defined(__NetBSD__) strncpy(ifreq.ifr_name, device_name, IFNAMSIZ); -#endif /* __FreeBSD__ */ +#else @@ -23,10 +22,14 @@ release of 4.4BSD-lite). - if ((ioctl(ip_socket,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0)) +#if (defined(BSD) && BSD >= 199506) + if ((ioctl(ip_socket,SIOCGPPPSTATS,(caddr_t)&ifreq) < 0)) ++#else ++#if defined(__NetBSD__) ++ if ((ioctl(ip_socket,SIOCGIFFLAGS,(caddr_t)&ifreq) < 0)) #else - if ((ioctl(ip_socket,SIOCGPPPSTATS,(caddr_t)&ifreq) < 0)) -#endif /* __FreeBSD__ */ + if ((ioctl(ip_socket,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0)) ++#endif /* NetBSD */ +#endif /* 4.4-BSD derived */ { /* failure means ppp is not up */ |