ports/86150: www/wsmake: unbreak on !i386

[Johan van Selst]

>Number:         86150
>Category:       ports
>Synopsis:       www/wsmake: unbreak on !i386
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 15 10:20:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 6.0-BETA4 amd64
>Organization:
>Environment:
System: FreeBSD hammer.stack.nl 6.0-BETA4 FreeBSD 6.0-BETA4 #2: Fri Sep 9 18:52:55 CEST 2005 root at hammer.stack.nl:/usr/obj/usr/src/sys/HAMMER amd64


	
>Description:
	

	This patch makes the port work on amd64 and probably other archs.

	Update MASTER_SITES while were at it, but note that SF doesn't
	provide the examples and documentation either.

>How-To-Repeat:
	
>Fix:

	

	va_end() expects a va_list as argument.

	This patch introduces:
	 wsmake/files/patch-libwsmake_wsUtil.cpp
	 wsmake/files/patch-libwsmake_wsUtil.h

diff -uNr wsmake/Makefile wsmake/Makefile
--- wsmake/Makefile	Thu Nov 25 11:15:32 2004
+++ wsmake/Makefile	Thu Sep 15 12:09:41 2005
@@ -8,8 +8,8 @@
 PORTNAME=	wsmake
 PORTVERSION=	0.6.4
 CATEGORIES=	www
-MASTER_SITES=	http://www.wsmake.org/dwnlds/stable/ \
-		http://www.wsmake.org/docs/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	wsmake
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} examples.tar.gz
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -26,10 +26,6 @@
 .endif
 
 .include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,void\*,char\*,g' ${WRKSRC}/libwsmake/wsUtil.cpp
diff -uNr wsmake/files/patch-libwsmake_wsUtil.cpp wsmake/files/patch-libwsmake_wsUtil.cpp
--- wsmake/files/patch-libwsmake_wsUtil.cpp	Thu Jan  1 01:00:00 1970
+++ wsmake/files/patch-libwsmake_wsUtil.cpp	Thu Sep 15 09:41:22 2005
@@ -0,0 +1,17 @@
+--- libwsmake/wsUtil.cpp.orig	Thu Sep 15 09:39:57 2005
++++ libwsmake/wsUtil.cpp	Thu Sep 15 09:37:15 2005
+@@ -709,12 +709,12 @@ void std::__wsmake_set_quiet(int quiet)
+   }
+ }
+ 
+-void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap)
++void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap)
+ {
+   if(__wsmake_quiet) return;
+ 
+   vfprintf(out,output,*ap);
+-  va_end((char*&)*ap);
++  va_end(*ap);
+ }
+ 
+ #ifdef DEBUG
diff -uNr wsmake/files/patch-libwsmake_wsUtil.h wsmake/files/patch-libwsmake_wsUtil.h
--- wsmake/files/patch-libwsmake_wsUtil.h	Thu Jan  1 01:00:00 1970
+++ wsmake/files/patch-libwsmake_wsUtil.h	Thu Sep 15 09:41:16 2005
@@ -0,0 +1,11 @@
+--- libwsmake/wsUtil.h.orig	Thu Sep 15 09:39:51 2005
++++ libwsmake/wsUtil.h	Thu Sep 15 09:38:34 2005
+@@ -77,7 +77,7 @@ namespace std
+   void __wsmake_print_error(const char *, ...);
+   void __wsmake_print(const char *, ...);
+   void __wsmake_print(int, const char *, ...);
+-  void __wsmake_print_it(FILE *, const char *, const va_list *);
++  void __wsmake_print_it(FILE *, const char *, va_list *);
+ }
+ 
+ #endif /* __WSUTIL_H__ */

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