From f4eaefd0d152a4cec64a1802c84ab4dc61d0c0ab Mon Sep 17 00:00:00 2001
From: Sam Lawrance <lawrance@FreeBSD.org>
Date: Sat, 23 Apr 2005 08:39:14 +0000
Subject: [PATCH] Unbreak on 4.x by using the port's included wide character
 functions.

PR:		ports/80230
Submitted by:	Jason Stone <jason-fbsd-ports-gale@shalott.net> (maintainer)
Approved by:	clement (mentor)
---
 net-im/gale/Makefile                    |  3 +--
 net-im/gale/files/patch-libgale_wcwidth | 15 +++++++++++++++
 net/gale/Makefile                       |  3 +--
 net/gale/files/patch-libgale_wcwidth    | 15 +++++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 net-im/gale/files/patch-libgale_wcwidth
 create mode 100644 net/gale/files/patch-libgale_wcwidth

diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 2c6a787a158f..0d64372037cf 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -34,14 +34,13 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .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 --git a/net-im/gale/files/patch-libgale_wcwidth b/net-im/gale/files/patch-libgale_wcwidth
new file mode 100644
index 000000000000..07d736fbee02
--- /dev/null
+++ b/net-im/gale/files/patch-libgale_wcwidth
@@ -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
diff --git a/net/gale/Makefile b/net/gale/Makefile
index 2c6a787a158f..0d64372037cf 100644
--- a/net/gale/Makefile
+++ b/net/gale/Makefile
@@ -34,14 +34,13 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 .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 --git a/net/gale/files/patch-libgale_wcwidth b/net/gale/files/patch-libgale_wcwidth
new file mode 100644
index 000000000000..07d736fbee02
--- /dev/null
+++ b/net/gale/files/patch-libgale_wcwidth
@@ -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