From jason-fbsd-ports-gale@shalott.net  Fri Apr 22 02:18:49 2005
Return-Path: <jason-fbsd-ports-gale@shalott.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3054B16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 22 Apr 2005 02:18:49 +0000 (GMT)
Received: from dfmm.org (treehorn.dfmm.org [66.180.195.213])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AB2E843D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 22 Apr 2005 02:18:48 +0000 (GMT)
	(envelope-from jason-fbsd-ports-gale@shalott.net)
Received: (qmail 74601 invoked by uid 1000); 22 Apr 2005 02:18:46 -0000
Message-Id: <20050422021846.74600.qmail@treehorn.dfmm.org>
Date: 22 Apr 2005 02:18:46 -0000
From: Jason Stone <jason-fbsd-ports-gale@shalott.net>
Reply-To: Jason Stone <jason-fbsd-ports-gale@shalott.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: unbreak gale port on 4.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         80230
>Category:       ports
>Synopsis:       unbreak gale port on 4.x
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    lawrance
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 22 02:20:15 GMT 2005
>Closed-Date:    Sat Apr 23 08:39:49 GMT 2005
>Last-Modified:  Sat Apr 23 08:39:49 GMT 2005
>Originator:     Jason Stone
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD treehorn.dfmm.org 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Thu Mar 3 01:13:08 PST 2005 root@treehorn.dfmm.org:/usr/obj/usr/src/sys/JKERN i386


	
>Description:
	unbreak gale on 4.x
>How-To-Repeat:
	
>Fix:

diff -ruN gale.orig/Makefile gale/Makefile
--- gale.orig/Makefile	Thu Apr 21 03:19:42 2005
+++ gale/Makefile	Thu Apr 21 19:16:01 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	gale
 PORTVERSION=	0.99f
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.ofb.net/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}ruit
@@ -34,14 +35,13 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500039
-IGNORE=         requires wchar functions for compilation
+CFLAGS+=	-DNEED_WCWIDTH
 .endif
 
 # cheesy hack - test-oop doesn't build, but we don't care.
 pre-configure:
 	${REINPLACE_CMD} -e 's/\(^noinst_PROGRAMS =.*\)test-oop/\1/' \
 			${WRKSRC}/liboop/Makefile.in
-	${ECHO} -n > ${WRKSRC}/libgale/wcwidth.c
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -ruN gale.orig/files/patch-wcwidth gale/files/patch-wcwidth
--- gale.orig/files/patch-wcwidth	Wed Dec 31 16:00:00 1969
+++ gale/files/patch-wcwidth	Thu Apr 21 15:05:11 2005
@@ -0,0 +1,15 @@
+--- libgale/wcwidth.c.orig	Mon Dec 30 21:08:50 2002
++++ libgale/wcwidth.c	Thu Apr 21 15:02:47 2005
+@@ -6,6 +6,7 @@
+  * Markus Kuhn -- 2000-02-08 -- public domain
+  */
+ 
++#ifdef NEED_WCWIDTH
+ #include "gale/compat.h"
+ 
+ /* These functions define the column width of an ISO 10646 character
+@@ -126,3 +127,4 @@
+ 
+   return width;
+ }
++#endif
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lawrance 
Responsible-Changed-By: lawrance 
Responsible-Changed-When: Fri Apr 22 02:51:57 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80230 
State-Changed-From-To: open->closed 
State-Changed-By: lawrance 
State-Changed-When: Sat Apr 23 08:39:36 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80230 
>Unformatted:
