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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5305e3f829b
branches:  trunk
changeset: 495566:f5305e3f829b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 14 07:23:56 2005 +0000

description:
Update pkgtools/xpkgwedge to 1.13.  Changes from version 1.12 include
invoking the make(1) program as "make" instead of hardcoding the
(wrong) path in ${MAKE_PROGRAM}.  This will rely on the tools framework
to have set up "make" to properly call the correct make(1) program.
This should fix cases where pkgxmkmf called the wrong make(1) program
on Linux systems.

diffstat:

 pkgtools/xpkgwedge/Makefile          |  5 ++---
 pkgtools/xpkgwedge/files/pkgxmkmf.in |  8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r dcaffae2446d -r f5305e3f829b pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Tue Jun 14 07:15:52 2005 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Tue Jun 14 07:23:56 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2005/06/01 18:03:08 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/06/14 07:23:56 jlam Exp $
 
-DISTNAME=      xpkgwedge-1.12
+DISTNAME=      xpkgwedge-1.13
 CATEGORIES=    pkgtools devel x11
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -38,7 +38,6 @@
 
 FILES_SUBST+=          VIEWBASE=${VIEWBASE}
 FILES_SUBST+=          FONT_PROGS=${FONT_PROGS:Q}
-FILES_SUBST+=          MAKE=${MAKE_PROGRAM:Q}
 
 .include "../../mk/x11.buildlink3.mk"
 
diff -r dcaffae2446d -r f5305e3f829b pkgtools/xpkgwedge/files/pkgxmkmf.in
--- a/pkgtools/xpkgwedge/files/pkgxmkmf.in      Tue Jun 14 07:15:52 2005 +0000
+++ b/pkgtools/xpkgwedge/files/pkgxmkmf.in      Tue Jun 14 07:23:56 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.4 2004/01/03 23:34:21 jlam Exp $
+# $NetBSD: pkgxmkmf.in,v 1.5 2005/06/14 07:23:56 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