Import of pkgsrc-2015Q3

This commit is contained in:
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions

View File

@@ -1,23 +1,23 @@
$NetBSD: patch-tty.sh,v 1.1 2015/01/13 08:27:28 he Exp $
$NetBSD: patch-tty.sh,v 1.2 2015/09/01 13:34:47 kim Exp $
Change condition for using TIOCSCTTY.
NetBSD on the netbsd-5 branch insists on a non-NULL second argument
to the realpath() function. Make it so.
--- tty.sh.orig 2014-04-26 16:29:40.000000000 +0000
+++ tty.sh
@@ -812,7 +812,8 @@ int fd;
--- tty.sh.orig 2015-06-28 21:22:56.000000000 +0000
+++ tty.sh 2015-09-01 12:46:28.000000000 +0000
@@ -812,7 +812,8 @@
/*
* Under BSD we have to set the controlling terminal again explicitly.
*/
-# if (defined(__FreeBSD_kernel__) || defined(__GNU__)) && defined(TIOCSCTTY)
+# if (defined(__FreeBSD_kernel__) || defined(__GNU__) || (BSD >= 199103)) \
+ && defined(TIOCSCTTY)
-# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__)) && defined(TIOCSCTTY)
+# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) \
+ || defined(__GNU__) || (BSD >= 199103)) && defined(TIOCSCTTY)
ioctl(fd, TIOCSCTTY, (char *)0);
# endif
@@ -1508,8 +1509,10 @@ char *tty;
@@ -1508,8 +1509,10 @@
struct stat st;
char * real;
int rc;