head	1.6;
access;
symbols
	pkgsrc-2026Q1:1.6.0.68
	pkgsrc-2026Q1-base:1.6
	pkgsrc-2025Q4:1.6.0.66
	pkgsrc-2025Q4-base:1.6
	pkgsrc-2025Q3:1.6.0.64
	pkgsrc-2025Q3-base:1.6
	pkgsrc-2025Q2:1.6.0.62
	pkgsrc-2025Q2-base:1.6
	pkgsrc-2025Q1:1.6.0.60
	pkgsrc-2025Q1-base:1.6
	pkgsrc-2024Q4:1.6.0.58
	pkgsrc-2024Q4-base:1.6
	pkgsrc-2024Q3:1.6.0.56
	pkgsrc-2024Q3-base:1.6
	pkgsrc-2024Q2:1.6.0.54
	pkgsrc-2024Q2-base:1.6
	pkgsrc-2024Q1:1.6.0.52
	pkgsrc-2024Q1-base:1.6
	pkgsrc-2023Q4:1.6.0.50
	pkgsrc-2023Q4-base:1.6
	pkgsrc-2023Q3:1.6.0.48
	pkgsrc-2023Q3-base:1.6
	pkgsrc-2023Q2:1.6.0.46
	pkgsrc-2023Q2-base:1.6
	pkgsrc-2023Q1:1.6.0.44
	pkgsrc-2023Q1-base:1.6
	pkgsrc-2022Q4:1.6.0.42
	pkgsrc-2022Q4-base:1.6
	pkgsrc-2022Q3:1.6.0.40
	pkgsrc-2022Q3-base:1.6
	pkgsrc-2022Q2:1.6.0.38
	pkgsrc-2022Q2-base:1.6
	pkgsrc-2022Q1:1.6.0.36
	pkgsrc-2022Q1-base:1.6
	pkgsrc-2021Q4:1.6.0.34
	pkgsrc-2021Q4-base:1.6
	pkgsrc-2021Q3:1.6.0.32
	pkgsrc-2021Q3-base:1.6
	pkgsrc-2021Q2:1.6.0.30
	pkgsrc-2021Q2-base:1.6
	pkgsrc-2021Q1:1.6.0.28
	pkgsrc-2021Q1-base:1.6
	pkgsrc-2020Q4:1.6.0.26
	pkgsrc-2020Q4-base:1.6
	pkgsrc-2020Q3:1.6.0.24
	pkgsrc-2020Q3-base:1.6
	pkgsrc-2020Q2:1.6.0.22
	pkgsrc-2020Q2-base:1.6
	pkgsrc-2020Q1:1.6.0.18
	pkgsrc-2020Q1-base:1.6
	pkgsrc-2019Q4:1.6.0.20
	pkgsrc-2019Q4-base:1.6
	pkgsrc-2019Q3:1.6.0.16
	pkgsrc-2019Q3-base:1.6
	pkgsrc-2019Q2:1.6.0.14
	pkgsrc-2019Q2-base:1.6
	pkgsrc-2019Q1:1.6.0.12
	pkgsrc-2019Q1-base:1.6
	pkgsrc-2018Q4:1.6.0.10
	pkgsrc-2018Q4-base:1.6
	pkgsrc-2018Q3:1.6.0.8
	pkgsrc-2018Q3-base:1.6
	pkgsrc-2018Q2:1.6.0.6
	pkgsrc-2018Q2-base:1.6
	pkgsrc-2018Q1:1.6.0.4
	pkgsrc-2018Q1-base:1.6
	pkgsrc-2017Q4:1.6.0.2
	pkgsrc-2017Q4-base:1.6
	pkgsrc-2017Q3:1.5.0.42
	pkgsrc-2017Q3-base:1.5
	pkgsrc-2017Q2:1.5.0.38
	pkgsrc-2017Q2-base:1.5
	pkgsrc-2017Q1:1.5.0.36
	pkgsrc-2017Q1-base:1.5
	pkgsrc-2016Q4:1.5.0.34
	pkgsrc-2016Q4-base:1.5
	pkgsrc-2016Q3:1.5.0.32
	pkgsrc-2016Q3-base:1.5
	pkgsrc-2016Q2:1.5.0.30
	pkgsrc-2016Q2-base:1.5
	pkgsrc-2016Q1:1.5.0.28
	pkgsrc-2016Q1-base:1.5
	pkgsrc-2015Q4:1.5.0.26
	pkgsrc-2015Q4-base:1.5
	pkgsrc-2015Q3:1.5.0.24
	pkgsrc-2015Q3-base:1.5
	pkgsrc-2015Q2:1.5.0.22
	pkgsrc-2015Q2-base:1.5
	pkgsrc-2015Q1:1.5.0.20
	pkgsrc-2015Q1-base:1.5
	pkgsrc-2014Q4:1.5.0.18
	pkgsrc-2014Q4-base:1.5
	pkgsrc-2014Q3:1.5.0.16
	pkgsrc-2014Q3-base:1.5
	pkgsrc-2014Q2:1.5.0.14
	pkgsrc-2014Q2-base:1.5
	pkgsrc-2014Q1:1.5.0.12
	pkgsrc-2014Q1-base:1.5
	pkgsrc-2013Q4:1.5.0.10
	pkgsrc-2013Q4-base:1.5
	pkgsrc-2013Q3:1.5.0.8
	pkgsrc-2013Q3-base:1.5
	pkgsrc-2013Q2:1.5.0.6
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2013Q1:1.5.0.4
	pkgsrc-2013Q1-base:1.5
	pkgsrc-2012Q4:1.5.0.2
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2012Q3:1.4.0.24
	pkgsrc-2012Q3-base:1.4
	pkgsrc-2012Q2:1.4.0.22
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.20
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.18
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.16
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.14
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.12
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2010Q4:1.4.0.10
	pkgsrc-2010Q4-base:1.4
	pkgsrc-2010Q3:1.4.0.8
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q2:1.4.0.6
	pkgsrc-2010Q2-base:1.4
	pkgsrc-2010Q1:1.4.0.4
	pkgsrc-2010Q1-base:1.4
	pkgsrc-2009Q4:1.4.0.2
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2009Q3:1.3.0.34
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.32
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.30
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.28
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.26
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.24
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.22
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.20
	pkgsrc-2008Q1:1.3.0.18
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.16
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.14
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.12
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.10
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.8
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.6
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.4
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.2
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.2.0.26
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.24
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.22
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.20
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.18
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.16
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.14
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.12
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.10
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.2.0.6
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.2.0.8
	netbsd-1-6-RELEASE-base:1.2
	pkgviews:1.2.0.4
	pkgviews-base:1.2
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2;
locks; strict;
comment	@# @;


1.6
date	2017.12.12.20.42.41;	author hauke;	state Exp;
branches;
next	1.5;
commitid	1TZtWK96CxwrXDiA;

1.5
date	2012.11.16.00.29.40;	author joerg;	state Exp;
branches;
next	1.4;

1.4
date	2009.12.10.20.35.57;	author abs;	state Exp;
branches;
next	1.3;

1.3
date	2006.01.05.18.25.57;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2001.12.20.09.22.04;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	2001.12.20.09.20.05;	author tron;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Unbreak package by culling extern declarations doubling as function
prototypes. Since NetBSD headers have moved to #including what they
reference, <string.h> is everywhere, which turns the externs from
annoying into harmful.
@
text
@$NetBSD$

--- lib/libxview/textsw/txt_again.c.orig	1993-06-29 05:17:32.000000000 +0000
+++ lib/libxview/textsw/txt_again.c
@@@@ -24,10 +24,11 @@@@ static char     sccsid[] = "@@(#)txt_agai
 #include <string.h>
 #endif /* SVR4 */
 
-Pkg_private CHAR    *STRNCPY();
 Pkg_private Es_index textsw_do_input();
 Pkg_private Es_index textsw_do_pending_delete();
 
+static int textsw_string_min_free();
+
 string_t        null_string = {0, 0, 0};
 
 #define	TEXT_DELIMITER	"\\"
@@@@ -182,6 +183,7 @@@@ textsw_string_min_free(ptr_to_string, mi
  * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
  * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
  */
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
 #ifndef SVR4
 
 /* VARARGS2 */
@@@@ -325,6 +327,46 @@@@ va_dcl
 
 #endif /* SVR4 */
 
+#elif defined(__DragonFly__)
+static int
+textsw_printf(register string_t *ptr_to_string, char  *fmt, ...)
+{
+    int result;
+    va_list args;
+
+    VA_START(args, fmt);
+    result = vsnprintf(TXTSW_STRING_FREE(ptr_to_string), ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string), fmt, args);
+    if (result >=0)
+	TXTSW_STRING_FREE(ptr_to_string) += result;
+    return(result);
+}
+
+
+#else /* __FreeBSD__ */
+/*inspiration taken from sprintf.c */
+
+static int
+textsw_printf(register string_t *ptr_to_string, char  *fmt, ...)
+{ 
+    FILE            _strbuf;
+    int             result;
+    va_list         args;
+    _strbuf._flags = __SWR | __SSTR;
+    _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_FREE(ptr_to_string);
+    _strbuf._bf._size = _strbuf._w = ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string);
+    VA_START(args, fmt);
+    result = vfprintf (&_strbuf, fmt, args);
+    va_end(args);
+    TXTSW_STRING_FREE(ptr_to_string) = (char *) _strbuf._p;
+#ifndef lint
+    if (result >= 0)
+    putc('\0', &_strbuf);
+#endif
+    return (result); 
+}
+
+#endif /* __FreeBSD__ */
+
 static	void
 textsw_record_buf(again, buffer, buffer_length)
     register string_t *again;
@@@@ -619,6 +661,8 @@@@ textsw_record_trash_insert(textsw)
  */
 /* VARARGS2 */
 
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+
 static int
 #ifdef ANSI_FUNC_PROTO
 textsw_scanf(register string_t *ptr_to_string, register char  *fmt, ...)
@@@@ -705,6 +749,57 @@@@ va_dcl
 
 #endif /* OW_I18N */
 }
+#elif defined(__DragonFly__)
+static int
+textsw_scanf(register string_t *ptr_to_string, char  *fmt, ...)
+{
+	va_list args;
+	int result;
+	size_t len = TXTSW_STRING_LENGTH(ptr_to_string);
+	char *str = malloc(len + 1);
+	if (str == NULL)
+	    return -1;
+	memcpy(str, TXTSW_STRING_BASE(ptr_to_string), len);
+	str[len] = '\0';
+	VA_START(args, fmt);
+	result = vsscanf(str, fmt, args);
+	va_end(args);
+	free(str);
+	return(result);
+}
+
+#else /* __FreeBSD__ */
+/*inspiration/code taken from sscanf.c */
+
+static int
+eofread(cookie, buf, len)
+        void *cookie;
+        char *buf;
+        int len;
+{
+
+        return (0);
+}   
+
+static int
+textsw_scanf(register string_t *ptr_to_string, char  *fmt, ...)
+{
+    FILE            _strbuf;
+    int             result;
+    va_list         args;
+
+    memset(&_strbuf, '\0', sizeof(_strbuf));
+    _strbuf._flags = __SRD;
+    _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string);
+    _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string);
+    _strbuf._read = eofread;
+    VA_START(args, fmt);
+    result = __svfscanf(&_strbuf, fmt, args);
+    va_end(args);
+    TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p;
+    return (result);
+}       
+#endif /* __FreeBSD__ */
 
 static int
 textsw_next_is_delimiter(again)
@@@@ -848,7 +943,7 @@@@ textsw_get_recorded_x(view)
     int             found_it_already = FALSE;
 
     if (!TXTSW_DO_AGAIN(folio))
-	return;
+	return -1;
     again = &folio->again[0];
     if (TXTSW_STRING_IS_NULL(again)) {
 	return (result);
@


1.5
log
@Fix return with/without value errors.
@
text
@d1 1
a1 1
$NetBSD: patch-cw,v 1.4 2009/12/10 20:35:57 abs Exp $
d5 5
a9 1
@@@@ -28,6 +28,8 @@@@ Pkg_private CHAR    *STRNCPY();
d18 1
a18 1
@@@@ -182,6 +184,7 @@@@ textsw_string_min_free(ptr_to_string, mi
d26 1
a26 1
@@@@ -325,6 +328,46 @@@@ va_dcl
d73 1
a73 1
@@@@ -619,6 +662,8 @@@@ textsw_record_trash_insert(textsw)
d82 1
a82 1
@@@@ -705,6 +750,57 @@@@ va_dcl
d140 1
a140 1
@@@@ -848,7 +944,7 @@@@ textsw_get_recorded_x(view)
@


1.4
log
@- Add PKG_DESTDIR_SUPPORT
- Depend on the latest version of xview-config
- Mark as LICENSE sun-openlook-license
- Bump pkgrevision
@
text
@d1 1
a1 1
$NetBSD: patch-cw,v 1.3 2006/01/05 18:25:57 joerg Exp $
d136 9
@


1.3
log
@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.
@
text
@d1 1
a1 1
$NetBSD: patch-cw,v 1.2 2001/12/20 09:22:04 tron Exp $
d3 2
a4 2
--- lib/libxview/textsw/txt_again.c.orig	Tue Jun 29 07:17:32 1993
+++ lib/libxview/textsw/txt_again.c	Thu Dec 20 10:11:57 2001
@


1.2
log
@Fix build problem under NetBSD-current.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
@@@@ -28,6 +28,8 @@@@
d14 1
a14 1
@@@@ -182,6 +184,7 @@@@
d18 1
a18 1
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
d22 1
a22 1
@@@@ -325,6 +328,31 @@@@
d26 15
d69 1
a69 1
@@@@ -619,6 +647,8 @@@@
d73 1
a73 1
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
d78 1
a78 1
@@@@ -705,6 +735,38 @@@@
d82 19
@


1.1
log
@Cleanup patch files:
- unified format
- only one patch per file
- no files gets patched twice
@
text
@d4 1
a4 1
+++ lib/libxview/textsw/txt_again.c	Thu Dec 20 10:09:17 2001
d63 1
a63 1
@@@@ -705,6 +735,39 @@@@
d87 1
a91 2
+    _strbuf._ub._base = NULL;
+    _strbuf._lb._base = NULL;
@