This is a multi-part message in MIME format.
--------------020005050607070102010702
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Martti Kuparinen wrote:
> Hi!
> 
> Why is defs.Linux.mk mixing ZOULARISBASE and LOCALBASE? Shouldn't
> we use LOCALBASE for everything like IRIX does it?

I fixed Darwin as well. Is it okay to commit the attached patch?

Martti

--------------020005050607070102010702
Content-Type: text/plain;
 name="mk.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="mk.diff"

? mk.diff
Index: defs.Darwin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defs.Darwin.mk,v
retrieving revision 1.53
diff -u -r1.53 defs.Darwin.mk
--- defs.Darwin.mk	2003/09/02 06:59:44	1.53
+++ defs.Darwin.mk	2003/09/04 11:44:34
@@ -77,7 +77,7 @@
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
 MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		${FALSE}
-PKG_TOOLS_BIN?=		${ZOULARISBASE}/sbin
+PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		sudo sh -c
 ROOT_GROUP?=		wheel
 ROOT_USER?=		root
@@ -86,7 +86,6 @@
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		${FALSE}			# XXX - Fix me!
-ZOULARISBASE?=		${LOCALBASE}
 
 PKG_CREATE_USERGROUP?=	NO				# XXX - Until then
 
@@ -129,3 +128,9 @@
 _STRIPFLAG_CC?=		-Wl,-x	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
+
+LOCALBASE?=		${DESTDIR}/usr/pkg
+.if exists(${LOCALBASE}/sbin/pkg_info)
+PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
+.endif
+PKG_TOOLS_BIN?=		${LOCALBASE}/bin
Index: defs.Linux.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defs.Linux.mk,v
retrieving revision 1.57
diff -u -r1.57 defs.Linux.mk
--- defs.Linux.mk	2003/09/02 06:59:45	1.57
+++ defs.Linux.mk	2003/09/04 11:44:34
@@ -73,7 +73,7 @@
 LS?=		/bin/ls
 M4?=		/usr/bin/m4
 MKDIR?=		/bin/mkdir -p
-MTREE?=		${ZOULARISBASE}/sbin/mtree
+MTREE?=		${LOCALBASE}/sbin/mtree
 MV?=		/bin/mv
 .if exists(/bin/nice)
 NICE?=		/bin/nice
@@ -81,7 +81,7 @@
 NICE?=		/usr/bin/nice
 .endif
 PATCH?=		/usr/bin/patch
-PAX?=		${ZOULARISBASE}/bin/pax
+PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
 PKGLOCALEDIR?=	share
 PS?=		/bin/ps
@@ -129,7 +129,7 @@
 MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
 MOTIF12_TYPE_DEFAULT?=	lesstif12	# default 1.2 compatible libs type
 NOLOGIN?=		${FALSE}
-PKG_TOOLS_BIN?=		${ZOULARISBASE}/sbin
+PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
 ROOT_GROUP?=		root
 ROOT_USER?=		root
@@ -138,7 +138,6 @@
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		/usr/sbin/useradd
-ZOULARISBASE?=		/usr/pkg
 
 # imake installs manpages in weird places
 # these values from /usr/X11R6/lib/X11/config/linux.cf
@@ -178,3 +177,9 @@
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 .endif
+
+LOCALBASE?=		${DESTDIR}/usr/pkg
+.if exists(${LOCALBASE}/sbin/pkg_info)
+PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
+.endif
+PKG_TOOLS_BIN?=		${LOCALBASE}/bin

--------------020005050607070102010702--