diff -urN editors/wily.orig/Makefile editors/wily/Makefile
--- editors/wily.orig/Makefile	Thu May 18 10:01:50 2006
+++ editors/wily/Makefile	Fri Jun 30 12:57:54 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	wily
 PORTVERSION=	0.13.42
+PORTREVISION=	1
 CATEGORIES=	editors plan9
 MASTER_SITES=	ftp://ftp.cs.yorku.ca/pub/wily/src/
 
@@ -45,7 +46,9 @@
 # Run the configure script in the tools directory.
 post-configure:
 	@${RM} ${WRKSRC}/tools/win/config.cache
-	cd ${WRKSRC}/tools/win;  ./configure --prefix=${PREFIX}
+	cd ${WRKSRC}/tools/win && \
+		${SETENV} CC=${CC} "CFLAGS=${CFLAGS}" \
+		${SH} ./configure --prefix=${PREFIX}
 
 # The default Wily makefile does not install any documentation.  Rectify.
 post-install:
diff -urN editors/wily.orig/files/patch-win::Makefile editors/wily/files/patch-win::Makefile
--- editors/wily.orig/files/patch-win::Makefile	Wed Feb  5 01:36:11 2003
+++ editors/wily/files/patch-win::Makefile	Wed Dec 31 19:00:00 1969
@@ -1,22 +0,0 @@
---- tools/win/Makefile.in.orig	Sun Jan 19 09:03:49 2003
-+++ tools/win/Makefile.in	Sun Jan 19 09:05:36 2003
-@@ -3,6 +3,7 @@
- srcdir			= @srcdir@
- VPATH			= @srcdir@
- 
-+wilydir			= ../../
- prefix			= @prefix@
- exec_prefix		= @exec_prefix@
- bindir			= $(exec_prefix)/bin
-@@ -12,9 +13,9 @@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- CC				= @CC@
--CFLAGS			= @CFLAGS@ -I.. -I$(srcdir)/../include -I$(srcdir)/../sam/include
-+CFLAGS			= @CFLAGS@ -I$(wilydir) -I$(wilydir)/include
- DEFS			= @DEFS@
--LIBS			= @LIBS@ ../libmsg/libmsg.a  ../sam/libXg/libXg.a
-+LIBS			= $(wilydir)/libmsg/libmsg.a  $(wilydir)/libXg/libXg.a
- LDFLAGS			= @LDFLAGS@
- 
- RC				= @RC@
diff -urN editors/wily.orig/files/patch-win::Man.rc editors/wily/files/patch-win::Man.rc
--- editors/wily.orig/files/patch-win::Man.rc	Wed Feb  5 01:36:11 2003
+++ editors/wily/files/patch-win::Man.rc	Wed Dec 31 19:00:00 1969
@@ -1,10 +0,0 @@
---- tools/win/Man.rc.orig	Sun Jan 19 08:59:21 2003
-+++ tools/win/Man.rc	Sun Jan 19 08:59:41 2003
-@@ -10,6 +10,6 @@
- }
- 
- name = `{ echo $*($#*) }
--man $* >[2=1] | col -bx | wreplace -c '+Man '^$name^':,'
-+man $* >[2=1] | col -bx | wreplace -c '~Man '^$name^':,'
- 
- exit
diff -urN editors/wily.orig/files/patch-win_Makefile editors/wily/files/patch-win_Makefile
--- editors/wily.orig/files/patch-win_Makefile	Wed Dec 31 19:00:00 1969
+++ editors/wily/files/patch-win_Makefile	Fri Jun 30 12:57:54 2006
@@ -0,0 +1,22 @@
+--- tools/win/Makefile.in.orig	Sun Jan 19 09:03:49 2003
++++ tools/win/Makefile.in	Sun Jan 19 09:05:36 2003
+@@ -3,6 +3,7 @@
+ srcdir			= @srcdir@
+ VPATH			= @srcdir@
+ 
++wilydir			= ../../
+ prefix			= @prefix@
+ exec_prefix		= @exec_prefix@
+ bindir			= $(exec_prefix)/bin
+@@ -12,9 +13,9 @@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ CC				= @CC@
+-CFLAGS			= @CFLAGS@ -I.. -I$(srcdir)/../include -I$(srcdir)/../sam/include
++CFLAGS			= @CFLAGS@ -I$(wilydir) -I$(wilydir)/include
+ DEFS			= @DEFS@
+-LIBS			= @LIBS@ ../libmsg/libmsg.a  ../sam/libXg/libXg.a
++LIBS			= $(wilydir)/libmsg/libmsg.a  $(wilydir)/libXg/libXg.a
+ LDFLAGS			= @LDFLAGS@
+ 
+ RC				= @RC@
diff -urN editors/wily.orig/files/patch-win_Man.rc editors/wily/files/patch-win_Man.rc
--- editors/wily.orig/files/patch-win_Man.rc	Wed Dec 31 19:00:00 1969
+++ editors/wily/files/patch-win_Man.rc	Fri Jun 30 12:57:54 2006
@@ -0,0 +1,10 @@
+--- tools/win/Man.rc.orig	Sun Jan 19 08:59:21 2003
++++ tools/win/Man.rc	Sun Jan 19 08:59:41 2003
+@@ -10,6 +10,6 @@
+ }
+ 
+ name = `{ echo $*($#*) }
+-man $* >[2=1] | col -bx | wreplace -c '+Man '^$name^':,'
++man $* >[2=1] | col -bx | wreplace -c '~Man '^$name^':,'
+ 
+ exit