[pkgsrc/trunk]: pkgsrc Update pkgtools/xpkgwedge to 1.14. Changes from 1.13 ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0557de1ff0d2
branches:  trunk
changeset: 495599:0557de1ff0d2
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 14 20:12:51 2005 +0000

description:
Update pkgtools/xpkgwedge to 1.14.  Changes from 1.13 include using
the make required by the imake config files, which is specified by
${IMAKE_MAKE}.  This allows differing make programs to be used for
the main build versus xmkmf.

diffstat:

 doc/CHANGES                          |  3 ++-
 pkgtools/xpkgwedge/Makefile          |  6 ++++--
 pkgtools/xpkgwedge/files/pkgxmkmf.in |  8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r fcb3c8693a7d -r 0557de1ff0d2 doc/CHANGES
--- a/doc/CHANGES       Tue Jun 14 20:04:36 2005 +0000
+++ b/doc/CHANGES       Tue Jun 14 20:12:51 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10362 2005/06/14 18:28:52 abs Exp $
+$NetBSD: CHANGES,v 1.10363 2005/06/14 20:12:53 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
        
@@ -2876,3 +2876,4 @@
        Updated math/mathomatic to 12.4.2 [minskim 2005-06-14]
        Updated games/xjig to 2.4nb2 [jmmv 2005-06-14]
        Updated net/autonet to 0.15 [abs 2005-06-14]
+       Updated pkgtools/xpkgwedge to 1.14 [jlam 2005-06-14]
diff -r fcb3c8693a7d -r 0557de1ff0d2 pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Tue Jun 14 20:04:36 2005 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Tue Jun 14 20:12:51 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2005/06/14 07:23:56 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2005/06/14 20:12:51 jlam Exp $
 
-DISTNAME=      xpkgwedge-1.13
+DISTNAME=      xpkgwedge-1.14
 CATEGORIES=    pkgtools devel x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -38,6 +38,8 @@
 
 FILES_SUBST+=          VIEWBASE=${VIEWBASE}
 FILES_SUBST+=          FONT_PROGS=${FONT_PROGS:Q}
+FILES_SUBST+=          MAKE=${IMAKE_MAKE:Q}
+USE_TOOLS+=            ${IMAKE_TOOLS}
 
 .include "../../mk/x11.buildlink3.mk"
 
diff -r fcb3c8693a7d -r 0557de1ff0d2 pkgtools/xpkgwedge/files/pkgxmkmf.in
--- a/pkgtools/xpkgwedge/files/pkgxmkmf.in      Tue Jun 14 20:04:36 2005 +0000
+++ b/pkgtools/xpkgwedge/files/pkgxmkmf.in      Tue Jun 14 20:12:51 2005 +0000
@@ -3,7 +3,7 @@
 # XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp
 # XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws
 #
-# $NetBSD: pkgxmkmf.in,v 1.5 2005/06/14 07:23:56 jlam Exp $
+# $NetBSD: pkgxmkmf.in,v 1.6 2005/06/14 20:12:51 jlam Exp $
 #
 # make a Makefile from an Imakefile from inside or outside the sources
 # with support for config files in ${PREFIX}/lib/X11/config
@@ -71,11 +71,11 @@
 yes)
     imake $imake_defines $args && 
     echo "make Makefiles" &&
-    make Makefiles &&
+    @MAKE@ Makefiles &&
     echo "make includes" &&
-    make includes &&
+    @MAKE@ includes &&
     echo "make depend" &&
-    make depend
+    @MAKE@ depend
     ;;
 *)
     imake $imake_defines $args