diff options
author | jperkin <jperkin@pkgsrc.org> | 2013-05-20 11:35:22 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2013-05-20 11:35:22 +0000 |
commit | cedd83e8b6619d5f86eaab1fc861e00805edb8ca (patch) | |
tree | 1ca5524b880e06fd0b9fd89ca5e2f55e79cc55a5 /x11/xview-lib | |
parent | 9b10244e3ddf6375b69cd184773016513c4e3498 (diff) | |
download | pkgsrc-cedd83e8b6619d5f86eaab1fc861e00805edb8ca.tar.gz |
Avoid conflicts with SunOS regexp.h.
Diffstat (limited to 'x11/xview-lib')
-rw-r--r-- | x11/xview-lib/distinfo | 4 | ||||
-rw-r--r-- | x11/xview-lib/patches/patch-dj | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo index 73f9ad5380e..6ee2917887b 100644 --- a/x11/xview-lib/distinfo +++ b/x11/xview-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2012/12/16 19:03:50 dholland Exp $ +$NetBSD: distinfo,v 1.20 2013/05/20 11:35:22 jperkin Exp $ SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb @@ -90,7 +90,7 @@ SHA1 (patch-df) = 13d32d9ab53be3376b5c04badec91dbc65def34f SHA1 (patch-dg) = 3c4a28631ff074b374c8f78a6cbce7841071e025 SHA1 (patch-dh) = abe92b740c400d87bf804369846643e1ee0b1a95 SHA1 (patch-di) = ab2356a19e0e89d1aeb01301973dcde9761e49fc -SHA1 (patch-dj) = e955245cdb9d493c6a4cf6eed446b60d0aac155a +SHA1 (patch-dj) = eb395506f648474c74a50321282de1c40abf7c26 SHA1 (patch-dk) = 66ee20ded2515d9b063b2512ab3c6eaa74ab3c0c SHA1 (patch-dl) = a899b511f6632392652d4eda620ecb3a7318bf7b SHA1 (patch-dm) = f9cab5bd87ad213635fc75153b961d77d6d534fd diff --git a/x11/xview-lib/patches/patch-dj b/x11/xview-lib/patches/patch-dj index 56cd7a132fc..4d9885715c2 100644 --- a/x11/xview-lib/patches/patch-dj +++ b/x11/xview-lib/patches/patch-dj @@ -1,4 +1,4 @@ -$NetBSD: patch-dj,v 1.4 2009/12/10 20:35:58 abs Exp $ +$NetBSD: patch-dj,v 1.5 2013/05/20 11:35:22 jperkin Exp $ --- lib/libxview/file_chooser/file_list.c.orig 1993-06-29 05:17:56.000000000 +0000 +++ lib/libxview/file_chooser/file_list.c @@ -32,6 +32,15 @@ $NetBSD: patch-dj,v 1.4 2009/12/10 20:35:58 abs Exp $ xv_free_ref( private->dotdot_string ); if ( private->dir_ptr ) (void) closedir( private->dir_ptr ); +@@ -1166,7 +1174,7 @@ flist_update_list( private, rows, num_ro + * ifdef'd for SVR4 because it causes the 4.x MIT build to fail, not just print + * warnings. + */ +-#ifdef SVR4 ++#ifdef notSVR4 + static int sed, nbra, circf; + static char *loc1, *loc2, *locs; + static int advance(); @@ -1174,14 +1182,16 @@ static char *compile(); static int step(); #endif /* SVR4 */ |