Date: Fri, 30 Jun 2006 13:04:17 -0400
From: Serge Gagnon <serge.gagnon@b2b2c.ca>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/99656: [maintainer-update] port: editors/wily respect ${CC} and ${CFLAGS}
Message-ID: <E1FwMPh-000PQa-R4@quenix1.dyndns.org>
Resent-Message-ID: <200606301710.k5UHAI1P074379@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99656
>Category: ports
>Synopsis: [maintainer-update] port: editors/wily respect ${CC} and ${CFLAGS}
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 30 17:10:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Serge Gagnon
>Release: FreeBSD 6.1-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 6.1-STABLE FreeBSD 6.1-STABLE #0: Fri May 19 13:21:57 EDT 2006 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/QUENIX1 i386
>Description:
- Make wily CC and CFLAGS compliant in a src subdir
- Bump PORTREVISION accordingly
- Rename ${FILESDIR}/patch-win::Makefile & ${FILESDIR}/patch-win::Man.rc \
to make portlint happy
>How-To-Repeat:
>Fix:
--- patch-wily.diff begins here ---
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
--- patch-wily.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1FwMPh-000PQa-R4>