>Number:         13877
>Category:       pkg
>Synopsis:       pkgsrc/pkgtools/pkgdiff zoularis portability fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 06 06:26:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Stoned Elipot
>Release:        pkgsrc-current
>Organization:
SCRIPT, Paris VII University, France
>Environment:
System: SunOS deep-space-9 5.8 Generic_108528-07 sun4u sparc SUNW,Ultra-60
>Description:
mkpatches and patchdiff commands from this packages use make command to get
Makefile's variables from pkgs. Under Soalris/Zoularis it should be bmake
>How-To-Repeat:
Install and try to use mkpatches and patchdiff on a Solaris/Zoularis system.
>Fix:
The following patch try to fix the problem, it's along the line of what
had been recently made for pkgtools/pkgchk. A build dependency on textproc/groff
had also been added for Solaris...

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkgdiff/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2001/05/31 10:24:40	1.14
+++ Makefile	2001/09/06 13:25:15
@@ -24,6 +24,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
+BUILD_DEPENDS+=	groff-*:../../textproc/groff
 NROFF=		gnroff
 .else
 NROFF=		nroff
@@ -32,6 +33,7 @@
 do-build:
 .for FILE in mkpatches patchdiff
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
+		-e 's|@MAKE@|${MAKE}|g'			\
 		< ${FILESDIR}/${FILE}.pl 		\
 		> ${WRKSRC}/${FILE}
 .endfor
Index: files/mkpatches.pl
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkgdiff/files/mkpatches.pl,v
retrieving revision 1.5
diff -u -r1.5 mkpatches.pl
--- mkpatches.pl	2001/05/24 17:02:44	1.5
+++ mkpatches.pl	2001/09/06 13:25:15
@@ -49,7 +49,7 @@
 
 # get WRKDIR
 
-$wrkdir=`make show-var VARNAME=WRKDIR` or
+$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or
     die ("can't find WRKDIR -- wrong dir?");
 chomp($wrkdir);
 
@@ -64,7 +64,7 @@
 
 # get WRKSRC
 
-$wrksrc=`make show-var VARNAME=WRKSRC` or 
+$wrksrc=`@MAKE@ show-var VARNAME=WRKSRC` or 
     die ("can't find WRKSRC -- wrong dir?");
 chomp($wrksrc);
 
Index: files/patchdiff.pl
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkgdiff/files/patchdiff.pl,v
retrieving revision 1.3
diff -u -r1.3 patchdiff.pl
--- patchdiff.pl	2001/03/31 20:19:04	1.3
+++ patchdiff.pl	2001/09/06 13:25:15
@@ -65,7 +65,7 @@
 chomp($thisdir);
 $oldpatchdir=$thisdir."/patches";
 
-$wrkdir=`make show-var VARNAME=WRKDIR` or 
+$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or 
     die ("can't find WRKDIR -- wrong dir?");
 chomp($wrkdir);
 
>Release-Note:
>Audit-Trail:
>Unformatted: