ports/64682: devel/ossp-ex: maintainer update

[Chia-Hsing Yu]

>Number:         64682
>Category:       ports
>Synopsis:       devel/ossp-ex: maintainer update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 24 22:20:19 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Chia-Hsing Yu
>Release:        FreeBSD 5.2.1-RELEASE-p2 i386
>Organization:
National Taiwan U. Speech Lab
>Environment:
System: FreeBSD sppcg.ee.ntu.edu.tw 5.2.1-RELEASE-p2 FreeBSD 5.2.1-RELEASE-p2 #4: Wed Mar 17 17:10:46 CST 2004 root at sppcg.ee.ntu.edu.tw:/usr/obj/usr/src/sys/DAVIDYU i386


>Description:
 - fix compile error on 4-stable
 - fix compiler warning message
>How-To-Repeat:

>Fix:

move files/patch-ts.c to files/extra-patch-ts.c

diff -ruN ossp-ex.orig/Makefile ossp-ex/Makefile
--- ossp-ex.orig/Makefile	Thu Mar 25 13:40:51 2004
+++ ossp-ex/Makefile	Thu Mar 25 13:45:01 2004
@@ -9,7 +9,7 @@
 
 PORTNAME=	ex
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ossp.org/pkg/lib/ex/
 PKGNAMEPREFIX=	ossp-
@@ -26,6 +26,10 @@
 
 .if ${ARCH} == "alpha"
 BROKEN=		"Does not compile on alpha"
+.endif
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ts.c
 .endif
 
 .include "${FILESDIR}/manpages.mk"
diff -ruN ossp-ex.orig/files/extra-patch-ts.c ossp-ex/files/extra-patch-ts.c
--- ossp-ex.orig/files/extra-patch-ts.c	Thu Jan  1 08:00:00 1970
+++ ossp-ex/files/extra-patch-ts.c	Wed Mar 24 17:37:01 2004
@@ -0,0 +1,11 @@
+--- ts.c.orig	Wed Mar 24 17:36:35 2004
++++ ts.c	Wed Mar 24 17:36:49 2004
+@@ -202,7 +202,7 @@
+ 
+     if (format == NULL || ap == NULL)
+         return NULL;
+-    ap2 = ap;
++    va_copy(ap2, ap);
+     if ((n = ts_suite_mvxprintf(NULL, 0, format, ap)) == -1)
+         return NULL;
+     if ((buffer = (char *)malloc(n+1)) == NULL)
diff -ruN ossp-ex.orig/files/patch-ex.h ossp-ex/files/patch-ex.h
--- ossp-ex.orig/files/patch-ex.h	Thu Jan  1 08:00:00 1970
+++ ossp-ex/files/patch-ex.h	Wed Mar 24 18:14:21 2004
@@ -0,0 +1,14 @@
+--- ex.h.orig	Wed Mar 24 18:13:57 2004
++++ ex.h	Wed Mar 24 18:14:09 2004
+@@ -86,9 +86,9 @@
+     void *ex_object;
+     void *ex_value;
+     /* throw point */
+-    char *ex_file;
++    const char *ex_file;
+     int   ex_line;
+-    char *ex_func;
++    const char *ex_func;
+ } ex_t;
+ 
+ /* declare the context type (private) */
diff -ruN ossp-ex.orig/files/patch-ts.c ossp-ex/files/patch-ts.c
--- ossp-ex.orig/files/patch-ts.c	Thu Mar 25 13:40:51 2004
+++ ossp-ex/files/patch-ts.c	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- ts.c.orig	Wed Mar 24 17:36:35 2004
-+++ ts.c	Wed Mar 24 17:36:49 2004
-@@ -202,7 +202,7 @@
- 
-     if (format == NULL || ap == NULL)
-         return NULL;
--    ap2 = ap;
-+    va_copy(ap2, ap);
-     if ((n = ts_suite_mvxprintf(NULL, 0, format, ap)) == -1)
-         return NULL;
-     if ((buffer = (char *)malloc(n+1)) == NULL)


>Release-Note:
>Audit-Trail:
>Unformatted: