Mon Jan 12 14:24:40 2015 UTC ()
The NetBSD -5 branch's version of realpath() insists on a non-NULL
second argument, so make the usage cater for that.
Bump PKGREVISION.


(he)
diff -r1.90 -r1.91 pkgsrc/misc/screen/Makefile
diff -r1.34 -r1.35 pkgsrc/misc/screen/distinfo
diff -r0 -r1.1 pkgsrc/misc/screen/patches/patch-tty.c
cvs diff -r1.90 -r1.91 pkgsrc/misc/screen/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/screen/Makefile 2014/10/09 14:06:43 1.90
+++ pkgsrc/misc/screen/Makefile 2015/01/12 14:24:40 1.91
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.90 2014/10/09 14:06:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.91 2015/01/12 14:24:40 he Exp $
2 2
3DISTNAME= screen-4.2.1 3DISTNAME= screen-4.2.1
4#PKGREVISION= 4PKGREVISION= 1
5CATEGORIES= misc shells 5CATEGORIES= misc shells
6MASTER_SITES= ${MASTER_SITE_GNU:=screen/} 6MASTER_SITES= ${MASTER_SITE_GNU:=screen/}
7 7
8MAINTAINER= kim@tac.nyc.ny.us 8MAINTAINER= kim@tac.nyc.ny.us
9HOMEPAGE= http://www.gnu.org/software/screen/screen.html 9HOMEPAGE= http://www.gnu.org/software/screen/screen.html
10COMMENT= Multi-screen window manager 10COMMENT= Multi-screen window manager
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13.include "options.mk" 13.include "options.mk"
14 14
15NOT_FOR_PLATFORM= Interix-*-* # user auth and username size fixes needed 15NOT_FOR_PLATFORM= Interix-*-* # user auth and username size fixes needed
16 16
17PLIST_SUBST+= DISTNAME=${DISTNAME:Q} 17PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
cvs diff -r1.34 -r1.35 pkgsrc/misc/screen/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/screen/distinfo 2014/08/25 20:02:32 1.34
+++ pkgsrc/misc/screen/distinfo 2015/01/12 14:24:40 1.35
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.34 2014/08/25 20:02:32 kim Exp $ 1$NetBSD: distinfo,v 1.35 2015/01/12 14:24:40 he Exp $
2 2
3SHA1 (screen-4.2.1.tar.gz) = 21eadf5f1d64120649f3390346253c6bc8a5103c 3SHA1 (screen-4.2.1.tar.gz) = 21eadf5f1d64120649f3390346253c6bc8a5103c
4RMD160 (screen-4.2.1.tar.gz) = 20ddf4a33f91e60a42a31f02aa2a30a9c5cba9b5 4RMD160 (screen-4.2.1.tar.gz) = 20ddf4a33f91e60a42a31f02aa2a30a9c5cba9b5
5Size (screen-4.2.1.tar.gz) = 1062485 bytes 5Size (screen-4.2.1.tar.gz) = 1062485 bytes
6SHA1 (patch-aa) = 776eafabda01f8bc7a748e7d8dc1ffa706cd4c9d 6SHA1 (patch-aa) = 776eafabda01f8bc7a748e7d8dc1ffa706cd4c9d
7SHA1 (patch-ab) = bbbdb1494beb1fcde9388f8e0ab628a841a076e8 7SHA1 (patch-ab) = bbbdb1494beb1fcde9388f8e0ab628a841a076e8
8SHA1 (patch-ae) = fbdd06a56bfeaa6d02f13075c8a0363c8d0fbf93 8SHA1 (patch-ae) = fbdd06a56bfeaa6d02f13075c8a0363c8d0fbf93
9SHA1 (patch-ai) = f8615e11bdfa8a7882a7c1feb75ac1a40d6c7ab7 9SHA1 (patch-ai) = f8615e11bdfa8a7882a7c1feb75ac1a40d6c7ab7
10SHA1 (patch-aj) = 4b2ec0f3d7a275a17d535fe31e0bccb297b5bc49 10SHA1 (patch-aj) = 4b2ec0f3d7a275a17d535fe31e0bccb297b5bc49
11SHA1 (patch-ak) = 28fb1de315b9622de4babd065eda06c516f786c2 11SHA1 (patch-ak) = 28fb1de315b9622de4babd065eda06c516f786c2
12SHA1 (patch-al) = d06f52323c7f8343fdea1296e9942391cbbde75e 12SHA1 (patch-al) = d06f52323c7f8343fdea1296e9942391cbbde75e
13SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9 13SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
14SHA1 (patch-an) = 2984db4597a1b09450a6632d0b9b7fb05a0ccb06 14SHA1 (patch-an) = 2984db4597a1b09450a6632d0b9b7fb05a0ccb06
15SHA1 (patch-ao) = d5d0eca07045b83ec06ee284e754c24ae90b405c 15SHA1 (patch-ao) = d5d0eca07045b83ec06ee284e754c24ae90b405c
16SHA1 (patch-ap) = 5082cf450f4cfa85570540504f1691ee2676dec4 16SHA1 (patch-ap) = 5082cf450f4cfa85570540504f1691ee2676dec4
17SHA1 (patch-as) = 79af75200cbe428be9bb78ebf9aeba9f23a52eec 17SHA1 (patch-as) = 79af75200cbe428be9bb78ebf9aeba9f23a52eec
 18SHA1 (patch-tty.c) = 5bbcacd286f9b936d516746762f8d02c5218920d
File Added: pkgsrc/misc/screen/patches/Attic/patch-tty.c
$NetBSD: patch-tty.c,v 1.1 2015/01/12 14:24:40 he Exp $

NetBSD on the netbsd-5 branch insists on a non-NULL second argument
to the realpath() function.  Make it so.

--- tty.c.orig	2015-01-12 09:30:15.000000000 +0000
+++ tty.c
@@ -1833,8 +1833,10 @@ char *tty;
   struct stat st;
   char * real;
   int rc;
+  char *ttynamebuf;
 
-  real = realpath(tty, NULL);
+  ttynamebuf = malloc(MAXPATHLEN);
+  real = realpath(tty, ttynamebuf);
   if (!real)
     return -1;