Fix build on SunOS.

4 files changed, 52 insertions, 7 deletions

diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 99efb8097f4..dec12448b9f 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/04/13 07:55:05 ghen Exp $
+# $NetBSD: Makefile,v 1.27 2013/05/20 09:04:44 jperkin Exp $
 
 DISTNAME=		wmii-3.6
 PKGREVISION=		4
@@ -33,6 +33,11 @@ CONF_FILES_MODE=	0755
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
+SUBST_CLASSES+=		vars
+SUBST_STAGE.vars=	pre-build
+SUBST_FILES.vars=	util/compile
+SUBST_VARS.vars=	EGREP SED SH
+
 post-build:
 	mv ${WRKSRC}/man/wmii.1 ${WRKSRC}/man/wmii.tbl
 	${TBL} ${WRKSRC}/man/wmii.tbl > ${WRKSRC}/man/wmii.1
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index d7525468070..0def53b6781 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/05/27 18:13:59 marino Exp $
+$NetBSD: distinfo,v 1.12 2013/05/20 09:04:44 jperkin Exp $
 
 SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3
 RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52
 Size (wmii-3.6.tar.gz) = 208249 bytes
-SHA1 (patch-aa) = d773336dc54d07c634b27fbc9a1660fff1589e7e
+SHA1 (patch-aa) = 2f034052a301d031d38692bb86acc055918db462
 SHA1 (patch-ab) = 5e208344ea8bde06ec4cc8084eef0e3ba2f165f7
 SHA1 (patch-ac) = 8e4712bd308caeba9ca5dad023e32db8b27f3b31
+SHA1 (patch-util_compile) = f6435bfa38bed3a8d897289ef2e0afeb793c5640
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa
index 37d9b157ab8..6ed7d7fd181 100644
--- a/wm/wmii/patches/patch-aa
+++ b/wm/wmii/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $
+$NetBSD: patch-aa,v 1.9 2013/05/20 09:04:44 jperkin Exp $
 
 --- config.mk.orig	2007-11-16 13:59:15.000000000 +0000
 +++ config.mk
@@ -20,18 +20,20 @@ $NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $
  
  # Includes and libs
  INCPATH = .:${ROOT}/include:${INCLUDE}:/usr/include
-@@ -14,8 +13,8 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib
+@@ -14,9 +13,9 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib
  
  # Flags
  include ${ROOT}/mk/gcc.mk
 -CFLAGS += -g -O0 -DIXPlint
 -LDFLAGS += -g ${LIBS}
+-STATIC = -static
 +CFLAGS += -DIXPlint
 +LDFLAGS += ${LIBS}
- STATIC = -static
++#STATIC = -static
  MKDEP = cpp -M
  
-@@ -32,8 +31,7 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u
+ # Compiler
+@@ -32,13 +31,12 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/u
  INCX11 = -I/usr/X11R6/include
  LIBX11 = -L/usr/X11R6/lib -lX11
  LIBICONV = # Leave blank if your libc includes iconv (glibc does)
@@ -41,3 +43,9 @@ $NetBSD: patch-aa,v 1.8 2012/05/27 18:13:59 marino Exp $
  
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
+ #LDFLAGS = ${LIBS} -R${PREFIX}/lib
+-#LDFLAGS += -lsocket -lnsl
++LDFLAGS += -lsocket -lnsl
+ #CFLAGS += -xtarget=ultra
+ 
+ 
diff --git a/wm/wmii/patches/patch-util_compile b/wm/wmii/patches/patch-util_compile
new file mode 100644
index 00000000000..b1ff343f4ff
--- /dev/null
+++ b/wm/wmii/patches/patch-util_compile
@@ -0,0 +1,31 @@
+$NetBSD: patch-util_compile,v 1.1 2013/05/20 09:04:44 jperkin Exp $
+
+--- util/compile.orig	2007-11-16 13:59:15.000000000 +0000
++++ util/compile
+@@ -1,7 +1,7 @@
+-#!/bin/sh -f
++#!@SH@ -f
+ 
+ outfile="$1"; shift
+-bin="$(echo $0 | sed 's,/[^/]*$,,')"
++bin="$(echo $0 | @SED@ 's,/[^/]*$,,')"
+ 
+ # Derived from Russ Cox's 9c in plan9port.
+ 
+@@ -12,12 +12,12 @@ echo CC $($bin/cleanname ${BASE}$outfile
+ $CC -o $outfile $CFLAGS $@ 2>$xtmp
+ status=$?
+ 
+-base=$(echo $BASE | sed 's/,/\\,/g')
++base=$(echo $BASE | @SED@ 's/,/\\,/g')
+ re='\([^[:space:]/]*\..:[0-9]\)'
+ 
+-cat $xtmp | sed "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" |
+-	egrep -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' |
+-	sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
++cat $xtmp | @SED@ "s,^$re,$base&,g; s,\([[:space:]]\)$re,\1$base\2,g" |
++	@EGREP@ -v ': error: .Each undeclared identifier|: error: for each function it appears|is dangerous, better use|is almost always misused|: In function |: At top level:|support .long long.|use of C99 long long|ISO C forbids conversion' |
++	@SED@ 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
+ 	uniq 1>&2
+ 
+ rm -f $xtmp