Attachment #67650 for bug #99656

View | Details | Raw Unified | Return to bug 99656
Collapse All | Expand All

Lines 7-12 Link Here

(-)editors/wily/Makefile (-1 / +4 lines)
7		7
8	PORTNAME= wily	8	PORTNAME= wily
9	PORTVERSION= 0.13.42	9	PORTVERSION= 0.13.42
		10	PORTREVISION= 1
10	CATEGORIES= editors plan9	11	CATEGORIES= editors plan9
11	MASTER_SITES= ftp://ftp.cs.yorku.ca/pub/wily/src/	12	MASTER_SITES= ftp://ftp.cs.yorku.ca/pub/wily/src/
12		13
Lines 45-51 Link Here
45	# Run the configure script in the tools directory.	46	# Run the configure script in the tools directory.
46	post-configure:	47	post-configure:
47	@${RM} ${WRKSRC}/tools/win/config.cache	48	@${RM} ${WRKSRC}/tools/win/config.cache
48	cd ${WRKSRC}/tools/win; ./configure --prefix=${PREFIX}	49	cd ${WRKSRC}/tools/win && \
		50	${SETENV} CC=${CC} "CFLAGS=${CFLAGS}" \
		51	${SH} ./configure --prefix=${PREFIX}
49		52
50	# The default Wily makefile does not install any documentation. Rectify.	53	# The default Wily makefile does not install any documentation. Rectify.
51	post-install:	54	post-install:




--- 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@

Lines 1-10 Link Here

(-)editors/wily/files/patch-win::Man.rc (-10 lines)
1	--- tools/win/Man.rc.orig Sun Jan 19 08:59:21 2003
2	+++ tools/win/Man.rc Sun Jan 19 08:59:41 2003
3	@@ -10,6 +10,6 @@
4	}
5
6	name = `{ echo $($#) }
7	-man $* >[2=1] \| col -bx \| wreplace -c '+Man '^$name^':,'
8	+man $* >[2=1] \| col -bx \| wreplace -c '~Man '^$name^':,'
9
10	exit




--- 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@

Line 0 Link Here

(-)editors/wily/files/patch-win_Man.rc (+10 lines)
	1	--- tools/win/Man.rc.orig Sun Jan 19 08:59:21 2003
	2	+++ tools/win/Man.rc Sun Jan 19 08:59:41 2003
	3	@@ -10,6 +10,6 @@
	4	}
	5
	6	name = `{ echo $($#) }
	7	-man $* >[2=1] \| col -bx \| wreplace -c '+Man '^$name^':,'
	8	+man $* >[2=1] \| col -bx \| wreplace -c '~Man '^$name^':,'
	9
	10	exit

Return to bug 99656

Lines 1-22 Link Here

(-)editors/wily/files/patch-win::Makefile (-22 lines)
1	--- tools/win/Makefile.in.orig Sun Jan 19 09:03:49 2003
2	+++ tools/win/Makefile.in Sun Jan 19 09:05:36 2003
3	@@ -3,6 +3,7 @@
4	srcdir = @srcdir@
5	VPATH = @srcdir@
6
7	+wilydir = ../../
8	prefix = @prefix@
9	exec_prefix = @exec_prefix@
10	bindir = $(exec_prefix)/bin
11	@@ -12,9 +13,9 @@
12	INSTALL_DATA = @INSTALL_DATA@
13
14	CC = @CC@
15	-CFLAGS = @CFLAGS@ -I.. -I$(srcdir)/../include -I$(srcdir)/../sam/include
16	+CFLAGS = @CFLAGS@ -I$(wilydir) -I$(wilydir)/include
17	DEFS = @DEFS@
18	-LIBS = @LIBS@ ../libmsg/libmsg.a ../sam/libXg/libXg.a
19	+LIBS = $(wilydir)/libmsg/libmsg.a $(wilydir)/libXg/libXg.a
20	LDFLAGS = @LDFLAGS@
21
22	RC = @RC@

Line 0 Link Here

(-)editors/wily/files/patch-win_Makefile (+22 lines)
	1	--- tools/win/Makefile.in.orig Sun Jan 19 09:03:49 2003
	2	+++ tools/win/Makefile.in Sun Jan 19 09:05:36 2003
	3	@@ -3,6 +3,7 @@
	4	srcdir = @srcdir@
	5	VPATH = @srcdir@
	6
	7	+wilydir = ../../
	8	prefix = @prefix@
	9	exec_prefix = @exec_prefix@
	10	bindir = $(exec_prefix)/bin
	11	@@ -12,9 +13,9 @@
	12	INSTALL_DATA = @INSTALL_DATA@
	13
	14	CC = @CC@
	15	-CFLAGS = @CFLAGS@ -I.. -I$(srcdir)/../include -I$(srcdir)/../sam/include
	16	+CFLAGS = @CFLAGS@ -I$(wilydir) -I$(wilydir)/include
	17	DEFS = @DEFS@
	18	-LIBS = @LIBS@ ../libmsg/libmsg.a ../sam/libXg/libXg.a
	19	+LIBS = $(wilydir)/libmsg/libmsg.a $(wilydir)/libXg/libXg.a
	20	LDFLAGS = @LDFLAGS@
	21
	22	RC = @RC@