diff options
author | joerg <joerg> | 2006-01-05 18:25:56 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-01-05 18:25:56 +0000 |
commit | 07df95cd7c39efce3270f2102fc5028013331021 (patch) | |
tree | 659ad7ad2255232ad9accf5dbc9b4465f2bf905d /x11/xview-lib/patches/patch-dj | |
parent | a6bb44eef8817162faf4de8e298ce24ebda2adeb (diff) | |
download | pkgsrc-07df95cd7c39efce3270f2102fc5028013331021.tar.gz |
First try on fixing xview. Fix errno. Add DragonFly support.
Use NAME_MAX when available. Don't try to fake a FILE on DragonFly.
The implementation of textsw_scanf can be improved, it is very
defensively and slow ATM, the snprintf usage should be portable.
Fix a number of prototype mismatches, e.g. variable argument functions
can conflict with K&R prototypes.
Bump revision since the package "compiled" before, e.g. build
errors where ignored.
Diffstat (limited to 'x11/xview-lib/patches/patch-dj')
-rw-r--r-- | x11/xview-lib/patches/patch-dj | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x11/xview-lib/patches/patch-dj b/x11/xview-lib/patches/patch-dj index 9363f94d217..b203fdf7c10 100644 --- a/x11/xview-lib/patches/patch-dj +++ b/x11/xview-lib/patches/patch-dj @@ -1,4 +1,4 @@ -$NetBSD: patch-dj,v 1.1 2001/12/20 09:20:07 tron Exp $ +$NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $ --- lib/libxview/file_chooser/file_list.c.orig Tue Jun 29 07:17:56 1993 +++ lib/libxview/file_chooser/file_list.c Thu Dec 20 10:09:16 2001 @@ -6,7 +6,7 @@ $NetBSD: patch-dj,v 1.1 2001/12/20 09:20:07 tron Exp $ #include <xview_private/flist_impl.h> #include <xview_private/portable.h> -+#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +#include <regex.h> +#endif @@ -24,7 +24,7 @@ $NetBSD: patch-dj,v 1.1 2001/12/20 09:20:07 tron Exp $ if (status == DESTROY_CLEANUP) { xv_free_ref( private->directory ); xv_free_ref( private->regex_pattern ); -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) xv_free_ref( private->regex_compile ); +#else + xv_free_regex_t( (regex_t *)private->regex_compile ); @@ -37,7 +37,7 @@ $NetBSD: patch-dj,v 1.1 2001/12/20 09:20:07 tron Exp $ #endif /* SVR4 */ - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) #include <regexp.h> +#endif @@ -46,7 +46,7 @@ $NetBSD: patch-dj,v 1.1 2001/12/20 09:20:07 tron Exp $ flist_compile_regex( private ) File_list_private *private; { -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) char compile_buf[MAXPATHLEN+1]; char *end_ptr; size_t num_bytes; @@ -72,7 +72,7 @@ $NetBSD: patch-dj,v 1.1 2001/12/20 09:20:07 tron Exp $ char *s; File_list_private *private; { -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) return step(s, private->regex_compile); +#else + return !regexec((regex_t *)private->regex_compile, s, 0, NULL, 0); |