Use ${MAKE}, not make

xaw95-1.1.4/export doesn't always exists, and isn't essential, so prefix
a 'cd exports ; ln -sf include X11' with a -

XXX still doesn't build out of the box on solaris, because of issues with
the openwin imake config.

3 files changed, 32 insertions, 9 deletions

diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index bc0b56c6d5f..ac3079e3f49 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2003/07/17 09:01:01 adam Exp $
+$NetBSD: distinfo,v 1.9 2004/03/20 22:30:36 bouyer Exp $
 
 SHA1 (xpaint-2.7.0.tar.bz2) = 9a718e279d15b043f4763a29a552f7cf609bb80e
 Size (xpaint-2.7.0.tar.bz2) = 548641 bytes
@@ -7,4 +7,5 @@ SHA1 (patch-ab) = 37e778cba2875691d5e411ae57374c47cee43bf6
 SHA1 (patch-ac) = 9bfad6abed6f1547eaa77c1cd98fdc4006f9474b
 SHA1 (patch-ae) = 9d45899230246b8651c2c9061fdbb47b09b7e489
 SHA1 (patch-af) = 2bf7c952d8cc8cc3d17c300d94541fc371e7d129
-SHA1 (patch-ag) = 5a9752c48f9b9b7ea2c73875202299ecf0b7d395
+SHA1 (patch-ag) = 0e6745ab4069f0532f20e193f151b5d5ea68fb3a
+SHA1 (patch-ah) = aa49732f29be3fb96d212c5b2e4e6cd3d9be4fc5
diff --git a/graphics/xpaint/patches/patch-ag b/graphics/xpaint/patches/patch-ag
index f86d849b94b..29a448df58b 100644
--- a/graphics/xpaint/patches/patch-ag
+++ b/graphics/xpaint/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2003/07/17 09:01:03 adam Exp $
+$NetBSD: patch-ag,v 1.4 2004/03/20 22:30:36 bouyer Exp $
 
---- Imakefile.orig	2003-06-11 15:44:30.000000000 +0200
-+++ Imakefile	2003-07-17 10:43:28.000000000 +0200
+--- Imakefile.orig	Wed Jun 11 15:44:30 2003
++++ Imakefile	Tue Oct 21 23:48:47 2003
 @@ -89,7 +89,7 @@
  #endif
  
@@ -16,11 +16,11 @@ $NetBSD: patch-ag,v 1.3 2003/07/17 09:01:03 adam Exp $
  	-$(RM) $(XAW95DEPENDS)
  	echo "SYS_LIBRARIES = XawClientLibs -lm" > Local.xawdefs
 -	xmkmf ; make
-+	${XMKMF} ; make
++	${XMKMF} ; ${MAKE}
  
  libXaw95.so:
 -	cd xaw95-1.1.4 ; xmkmf -a ; make
-+	cd xaw95-1.1.4 ; ${XMKMF} ; make
++	cd xaw95-1.1.4 ; ${XMKMF} ; ${MAKE}
  	-$(RM) libXaw95.so libXaw95.a
  	-$(LN) xaw95-1.1.4/libXaw95.so libXaw95.so
  	-$(LN) xaw95-1.1.4/libXaw95.a libXaw95.a
@@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.3 2003/07/17 09:01:03 adam Exp $
  	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
  	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
 -	xmkmf ; make
-+	${XMKMF} ; make
++	${XMKMF} ; ${MAKE}
  
  xaw95static:: libXaw95.a
  	-$(RM) $(XAW95DEPENDS)
@@ -37,7 +37,16 @@ $NetBSD: patch-ag,v 1.3 2003/07/17 09:01:03 adam Exp $
 -	echo "SYS_LIBRARIES = ./libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
 -	xmkmf ; make
 +	echo "SYS_LIBRARIES = ./xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
-+	${XMKMF} ; make
++	${XMKMF} ; ${MAKE}
  
  clean::
  	-$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.*
+@@ -153,7 +153,7 @@
+ 	cd share/messages ; $(RM) *~
+ 	cd app-defaults ; $(RM) core *~ substads
+ 	cd app-defaults/out ; $(RM) -f Xpaint*
+-	cd xaw95-1.1.4 ; if [ -r Makefile ] ; then make clean ; fi
++	cd xaw95-1.1.4 ; if [ -r Makefile ] ; then ${MAKE} clean ; fi
+ 
+ includes:: XPaint.ad.h DefaultRC.txt.h messages.h
+ 	cd bitmaps; $(RM) tools; \
diff --git a/graphics/xpaint/patches/patch-ah b/graphics/xpaint/patches/patch-ah
new file mode 100644
index 00000000000..f43d5a9ae13
--- /dev/null
+++ b/graphics/xpaint/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/03/20 22:30:36 bouyer Exp $
+
+--- xaw95-1.1.4/Imakefile.orig	Sat Mar 20 22:45:21 2004
++++ xaw95-1.1.4/Imakefile	Sat Mar 20 22:45:42 2004
+@@ -233,7 +233,7 @@
+ all::
+ 
+ depend:: laygram.c laylex.c
+-	cd exports ; ln -sf include X11
++	-cd exports ; ln -sf include X11
+ 
+ #if DoSharedLib && SharedDataSeparation
+ SpecialCObjectRule(sharedlib.o,NullParameter,$(SHLIBDEF))