* Make PKGSRC_TOPDIR a private variable by renaming it to _PKGSRC_TOPDIR,

  as it's only used internally by bsd.prefs.mk.

* Make _PKGSRCDIR a public variable by renaming it to PKGSRCDIR.
  Also, generate its value from ${_PKGSRC_TOPDIR} so it's less fragile
  than the old method of stripping off the last two components of
  ${.CURDIR}.  PKGSRCDIR may now be used after bsd.prefs.mk is defined.

* Change all references to _PKGSRCDIR to PKGSRCDIR.

6 files changed, 69 insertions, 65 deletions

diff --git a/mk/autoconf.mk b/mk/autoconf.mk
index 5ab5d38633e..f8b599bbd11 100644
--- a/mk/autoconf.mk
+++ b/mk/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.4 2004/02/20 09:58:49 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.5 2004/10/07 02:01:38 jlam Exp $
 #
 # makefile fragment for packages that use autoconf
 # AUTOCONF_REQD can be set to the minimum version required.
@@ -51,7 +51,7 @@ do-libtool-m4-override:
 	for file in ${_pattern_:S/libtool.m4$/configure/}; do		\
 		if [ -f "$$file" ]; then				\
 			libtool_m4=`${DIRNAME} $$file`/libtool.m4;	\
-			${LN} -sf ${_PKGSRCDIR}/mk/gnu-config/libtool-1.4.m4 \
+			${LN} -sf ${PKGSRCDIR}/mk/gnu-config/libtool-1.4.m4 \
 				$$libtool_m4;				\
 		fi;							\
 	done
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 623bef7134a..2f4da90b84f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1509 2004/10/05 15:28:50 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1510 2004/10/07 02:01:38 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -598,9 +598,9 @@ BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
 
 # Figure out where the local mtree file is
 .if defined(USE_X11BASE)
-MTREE_FILE?=	${_PKGSRCDIR}/mk/${OPSYS}.x11.dist
+MTREE_FILE?=	${PKGSRCDIR}/mk/${OPSYS}.x11.dist
 .else
-MTREE_FILE?=	${_PKGSRCDIR}/mk/${OPSYS}.pkg.dist
+MTREE_FILE?=	${PKGSRCDIR}/mk/${OPSYS}.pkg.dist
 .endif
 
 MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
@@ -850,7 +850,7 @@ uptodate-digest:
 .if !empty(USE_DIGEST:M[yY][eE][sS])
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if [ -f ${DISTINFO_FILE} -a \( ! -f ${DIGEST} -o ${DIGEST_VERSION} -lt ${DIGEST_REQD} \) ]; then \
-		{ cd ${_PKGSRCDIR}/pkgtools/digest;			\
+		{ cd ${PKGSRCDIR}/pkgtools/digest;			\
 		${MAKE} clean;						\
 		if [ -f ${DIGEST} ]; then				\
 			${MAKE} ${MAKEFLAGS} deinstall;			\
@@ -882,7 +882,7 @@ PKG_FAIL_REASON+='Error: The package tools installed on this system are out of d
 PKG_FAIL_REASON+='The installed package tools are dated ${PKGTOOLS_VERSION:C|(....)(..)(..)|\1/\2/\3|} and you must update'
 PKG_FAIL_REASON+='them to at least ${PKGTOOLS_REQD:C|(....)(..)(..)|\1/\2/\3|} using the following command:'
 PKG_FAIL_REASON+=''
-PKG_FAIL_REASON+='	cd ${_PKGSRCDIR}/pkgtools/pkg_install && ${MAKE} clean && ${MAKE} install'
+PKG_FAIL_REASON+='	cd ${PKGSRCDIR}/pkgtools/pkg_install && ${MAKE} clean && ${MAKE} install'
 .		endif
 .	endif
 
@@ -1185,7 +1185,7 @@ SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \
 	PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin \
 	WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
 	SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
-	_PKGSRCDIR=${_PKGSRCDIR} DEPENDS="${DEPENDS}" \
+	_PKGSRCDIR=${_PKGSRCDIR} PKGSRCDIR=${PKGSRCDIR} DEPENDS="${DEPENDS}" \
 	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 	VIEWBASE=${VIEWBASE}
 
@@ -1827,7 +1827,7 @@ show-needs-update:
 .  if defined(DEPENDS)
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	for i in `${MAKE} show-all-depends-dirs`; do			\
-		cd ${_PKGSRCDIR}/$$i;					\
+		cd ${PKGSRCDIR}/$$i;					\
 		want=`${MAKE} show-var VARNAME=PKGNAME`;		\
 		wild=`${MAKE} show-var VARNAME=PKGWILDCARD`;		\
 		have=`${PKG_BEST_EXISTS} "$$wild" || ${TRUE}`;		\
@@ -2253,7 +2253,7 @@ do-config-star-override:
 	for file in ${_pattern_}; do					\
 		if [ -f "$$file" ]; then				\
 			${RM} -f $$file;				\
-			${LN} -s ${_PKGSRCDIR}/mk/gnu-config/config.guess \
+			${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.guess \
 				$$file;					\
 		fi;							\
 	done
@@ -2265,7 +2265,7 @@ do-config-star-override:
 	for file in ${_pattern_}; do					\
 		if [ -f "$$file" ]; then				\
 			${RM} -f $$file;				\
-			${LN} -s ${_PKGSRCDIR}/mk/gnu-config/config.sub	\
+			${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.sub	\
 				$$file;					\
 		fi;							\
 	done
@@ -4254,7 +4254,7 @@ README.html: .PRECIOUS
 	@if ${TEST} -d ${PACKAGES}; then					\
 		cd ${PACKAGES};						\
 		case `${PWD_CMD}` in					\
-			${_PKGSRCDIR}/packages)				\
+			${PKGSRCDIR}/packages)				\
 				MULTIARCH=no;				\
 				;;					\
 			*)						\
@@ -4347,7 +4347,7 @@ print-summary-data:
 	@${ECHO} "maintainer ${PKGPATH} ${MAINTAINER}"
 	@${ECHO} "categories ${PKGPATH} ${CATEGORIES}"
 	@if [ -f ${DESCR_SRC} ]; then						\
-		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC:S;${_PKGSRCDIR}/;;g}";	\
+		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC:S;${PKGSRCDIR}/;;g}";	\
 	else									\
 		${ECHO}  "descr ${PKGPATH} /dev/null";				\
 	fi
@@ -4357,11 +4357,11 @@ print-summary-data:
 .if !target(show-license)
 show-license show-licence:
 	@if [ "${LICENSE}" != "" ]; then				\
-		if ${TEST} -f ${_PKGSRCDIR}/licenses/${LICENSE}; then	\
+		if ${TEST} -f ${PKGSRCDIR}/licenses/${LICENSE}; then	\
 			if [ "${PAGER}" != "" ]; then			\
-				${PAGER} ${_PKGSRCDIR}/licenses/${LICENSE};\
+				${PAGER} ${PKGSRCDIR}/licenses/${LICENSE};\
 			else						\
-				${CAT} ${_PKGSRCDIR}/licenses/${LICENSE};\
+				${CAT} ${PKGSRCDIR}/licenses/${LICENSE};\
 			fi						\
 		else							\
 			${ECHO} "Generic ${LICENSE} information not available"; \
@@ -4652,7 +4652,7 @@ fake-pkg: ${PLIST} ${DESCR} ${MESSAGE}
 			esac;						\
 		done;							\
 	fi;								\
-	eval ${GREP} '\$$NetBSD' $$files | ${SED} -e 's|^${_PKGSRCDIR}/||' > ${BUILD_VERSION_FILE}
+	eval ${GREP} '\$$NetBSD' $$files | ${SED} -e 's|^${PKGSRCDIR}/||' > ${BUILD_VERSION_FILE}
 .  for def in ${BUILD_DEFS}
 	@${ECHO} ${def}=${${def}:Q} | ${SED} -e 's|^PATH=[^ 	]*|PATH=...|' >> ${BUILD_INFO_FILE}
 .  endfor
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index db196d0cee2..6d3b5aeb019 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.170 2004/10/06 20:59:40 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.171 2004/10/07 02:01:39 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -214,16 +214,16 @@ OBJECT_FMT?=	a.out
 
 # Calculate depth
 .if exists(${.CURDIR}/mk/bsd.pkg.mk)
-PKGSRC_TOPDIR=	${.CURDIR}
+_PKGSRC_TOPDIR=	${.CURDIR}
 .elif exists(${.CURDIR}/../mk/bsd.pkg.mk)
-PKGSRC_TOPDIR=	${.CURDIR}/..
+_PKGSRC_TOPDIR=	${.CURDIR}/..
 .elif exists(${.CURDIR}/../../mk/bsd.pkg.mk)
-PKGSRC_TOPDIR=	${.CURDIR}/../..
+_PKGSRC_TOPDIR=	${.CURDIR}/../..
 .endif
 
 # include the defaults file
-.if exists(${PKGSRC_TOPDIR}/mk/defaults/mk.conf)
-.  include "${PKGSRC_TOPDIR}/mk/defaults/mk.conf"
+.if exists(${_PKGSRC_TOPDIR}/mk/defaults/mk.conf)
+.  include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf"
 .endif
 
 .if ${OPSYS} == "NetBSD"
@@ -257,10 +257,10 @@ SHAREMODE?=		${DOCMODE}
 
 # Load the OS-specific definitions for program variables.  Default to loading
 # the NetBSD ones if an OS-specific file doesn't exist.
-.if exists(${PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk)
-.  include "${PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk"
-.elif exists(${PKGSRC_TOPDIR}/mk/platform/NetBSD.mk)
-.  include "${PKGSRC_TOPDIR}/mk/platform/NetBSD.mk"
+.if exists(${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk)
+.  include "${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk"
+.elif exists(${_PKGSRC_TOPDIR}/mk/platform/NetBSD.mk)
+.  include "${_PKGSRC_TOPDIR}/mk/platform/NetBSD.mk"
 .endif
 
 PKGDIRMODE?=		755
@@ -465,10 +465,14 @@ PKG_FAIL_REASON+=	'for more details.'
 
 _PKGSRCDIR?=		${.CURDIR:C|/[^/]*/[^/]*$||}
 PKGPATH?=		${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
+.if !defined(PKGSRCDIR)
+PKGSRCDIR!=		cd ${_PKGSRC_TOPDIR} && ${PWD_CMD}
+MAKEFLAGS+=		PKGSRCDIR=${PKGSRCDIR:Q}
+.endif
 
-DISTDIR?=		${_PKGSRCDIR}/distfiles
-PACKAGES?=		${_PKGSRCDIR}/packages
-TEMPLATES?=		${_PKGSRCDIR}/templates
+DISTDIR?=		${PKGSRCDIR}/distfiles
+PACKAGES?=		${PKGSRCDIR}/packages
+TEMPLATES?=		${PKGSRCDIR}/templates
 
 PATCHDIR?=		${.CURDIR}/patches
 SCRIPTDIR?=		${.CURDIR}/scripts
@@ -512,8 +516,8 @@ PKG_DEFAULT_OPTIONS?=	# empty
 PKG_OPTIONS?=		# empty
 
 # Wrapper framework definitions
-.if exists(${PKGSRC_TOPDIR}/mk/wrapper/wrapper-defs.mk)
-.  include "${PKGSRC_TOPDIR}/mk/wrapper/wrapper-defs.mk"
+.if exists(${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk)
+.  include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
 .endif
 
 .endif	# BSD_PKG_MK
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 31f39ca733c..6cb9f75db0a 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.62 2004/07/25 08:40:46 grant Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.63 2004/10/07 02:01:39 jlam Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -81,41 +81,41 @@ BUILDLOG?=	.make${BULK_ID}
 # foo/bar devel/libfoo
 # meaning 'foo/bar' is requied to build 'devel/libfoo'
 # this is in the format needed by tsort(1)
-DEPENDSTREEFILE?=	${_PKGSRCDIR}/.dependstree${BULK_ID}
+DEPENDSTREEFILE?=	${PKGSRCDIR}/.dependstree${BULK_ID}
 
 # This is a top level file which lists the entire pkgsrc depends tree in the
 # format:
 # foo/bar depends on: devel/libfoo devel/libbar devel/baz .....
 # ie, to build foo/bar we need devel/libfoo devel/libbar devel/baz ... installed
-DEPENDSFILE?=	${_PKGSRCDIR}/.depends${BULK_ID}
+DEPENDSFILE?=	${PKGSRCDIR}/.depends${BULK_ID}
 
 # This is a top level file which lists the entire pkgsrc depends tree in the
 # format:
 # devel/libfoo is depended upon by: foo/bar graphics/gtkfoo ...
 # ie, to build foo/bar we need devel/libfoo to be installed.
 #     to build graphics/gtkfoo we need devel/libfoo to be installed
-SUPPORTSFILE?=	${_PKGSRCDIR}/.supports${BULK_ID}
+SUPPORTSFILE?=	${PKGSRCDIR}/.supports${BULK_ID}
 
 # This is a top level file which cross-references each package name and pkg
 # directory in the format:
 # devel/libfoo libfoo-1.3
-INDEXFILE?=	${_PKGSRCDIR}/.index${BULK_ID}
+INDEXFILE?=	${PKGSRCDIR}/.index${BULK_ID}
 
 # File containing a list of all the packages in the correct order for a bulk
 # build.  The correct order is one where packages that are required by others
 # are built before the packages which require them.
-ORDERFILE?=	${_PKGSRCDIR}/.order${BULK_ID}
+ORDERFILE?=	${PKGSRCDIR}/.order${BULK_ID}
 
 # File which is used as a timestamp for when the build started.  This is used
 # eventually for looking for leftover files (files not properly deinstalled)
-STARTFILE?=	${_PKGSRCDIR}/.start${BULK_ID}
+STARTFILE?=	${PKGSRCDIR}/.start${BULK_ID}
 
 # File which is used as a database for bulk builds in which SPECIFIC_PKGS is
 # defined.  This database is used to hold all the dependency and index
 # information for the specific packages as well as their dependencies.  In a
 # SPECIFIC_PKGS bulk build, this file is created and then used to create the
 # INDEXFILE and DEPENDSTREEFILE.
-BULK_DBFILE?=	${_PKGSRCDIR}/.bulk_db${BULK_ID}
+BULK_DBFILE?=	${PKGSRCDIR}/.bulk_db${BULK_ID}
 
 # A list of pkgs which we should _never_ delete during a build.  The primary
 # use is for digest and also for xpkgwedge.  Add pkgtools/xpkgwedge in
@@ -132,7 +132,7 @@ _PRESERVE_WRKDIR?=	no
 bulk-cache:
 	@${ECHO_MSG} "BULK> Installing BULK_PREREQ packages"
 .for __prereq in ${BULK_PREREQ}
-	cd ${_PKGSRCDIR}/${__prereq} && ${MAKE} bulk-install
+	cd ${PKGSRCDIR}/${__prereq} && ${MAKE} bulk-install
 .endfor
 	${RM} -f ${BULK_DBFILE}
 	${TOUCH} ${BULK_DBFILE}
@@ -140,15 +140,15 @@ bulk-cache:
 	@${ECHO} "This file is unused for a full pkgsrc bulk build" >> ${BULK_DBFILE}
 	@${ECHO} "It is only used for a SPECIFIC_PKGS bulk build" >> ${BULK_DBFILE}
 	@${ECHO_MSG} "BULK> Building complete pkgsrc dependency tree (this may take a while)."
-	cd ${_PKGSRCDIR} && ${SETENV} BMAKE=${MAKE} ${SH} mk/bulk/printdepends ${BROKENFILE} > ${DEPENDSTREEFILE}
+	cd ${PKGSRCDIR} && ${SETENV} BMAKE=${MAKE} ${SH} mk/bulk/printdepends ${BROKENFILE} > ${DEPENDSTREEFILE}
 	@${ECHO_MSG} "BULK> Generating package name <=> package directory cross reference file"
 	@${ECHO_MSG} "      (this may take a while)."
-	cd ${_PKGSRCDIR} && ${SETENV} BMAKE=${MAKE} ${SH} mk/bulk/printindex ${BROKENFILE} > ${INDEXFILE}
+	cd ${PKGSRCDIR} && ${SETENV} BMAKE=${MAKE} ${SH} mk/bulk/printindex ${BROKENFILE} > ${INDEXFILE}
 .else
 	@${ECHO_MSG} "BULK> Extracting database for SPECIFIC_PKGS subset of pkgsrc"
 	@${ECHO_MSG} "      along with their dependencies"
 .for __tmp__ in ${SUBDIR} ${BULK_PREREQ} lang/perl5 pkgtools/pkglint
-	cd ${_PKGSRCDIR}/${__tmp__} && ../../mk/scripts/mkdatabase -a -f ${BULK_DBFILE}
+	cd ${PKGSRCDIR}/${__tmp__} && ../../mk/scripts/mkdatabase -a -f ${BULK_DBFILE}
 .endfor
 	@${ECHO_MSG} "BULK> Extracting dependency tree file"
 	${AWK} '/^(build_)?depends/ {pkgs[$$2] = 1; cat=$$2; sub(/\/.*/, "", cat); \
@@ -167,8 +167,8 @@ bulk-cache:
 	@${ECHO_MSG} "BULK> Sorting build order."
 	${TSORT} ${DEPENDSTREEFILE} > ${ORDERFILE}
 	@${ECHO_MSG} "BULK> Generating up and down dependency files."
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
+	${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
+	${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
 
 # remove the bulk cache files
 clean-bulk-cache:
@@ -273,7 +273,7 @@ bulk-package:
 		${ECHO_MSG} "BULK> Cleaning package and its depends" ;\
 		if [ "${USE_BULK_CACHE}" = "yes" ]; then \
 			for pkgdir in ${PKGPATH} `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'`; do \
-				${DO}       (cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
+				${DO}       (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
 			done ;\
 		else \
 			${ECHO_MSG} ${MAKE} clean CLEANDEPENDS=YES;\
@@ -361,25 +361,25 @@ bulk-package:
 					if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \
 					${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\
 					pkgerr="-1"; \
-					pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \
-					pkgskip=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \
-					if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \
-						 ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
-						 ${ECHO_MSG} "BULK> $$pkgignore" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
-						 ${ECHO_MSG} "BULK> $$pkgskip" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
-						if [ -z "`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \
+					pkgignore=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \
+					pkgskip=`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \
+					if [ ! -z "$${pkgignore}$${pkgskip}" -a ! -f ${PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \
+						 ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+						 ${ECHO_MSG} "BULK> $$pkgignore" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+						 ${ECHO_MSG} "BULK> $$pkgskip" >> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+						if [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=BROKEN)`" ]; then \
 							pkgerr="0"; \
 						else \
 							pkgerr="1"; \
 						fi; \
 					fi; \
 					${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) is broken because it depends upon ${PKGNAME} (${PKGPATH}) which is broken." \
-						>> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+						>> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
 					${ECHO_MSG} "Please view the <a href=\"../../${PKGPATH}/${BROKENFILE}\">build log for ${PKGNAME}</a>" \
-						>> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
+						>> ${PKGSRCDIR}/$$pkgdir/${BROKENFILE};\
 					nbrokenby=`expr $$nbrokenby + 1`;\
-					if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${_PKGSRCDIR}/${BROKENFILE} ; then :; else \
-						${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${_PKGSRCDIR}/${BROKENFILE} ;\
+					if ${GREP} -q " $$pkgdir/${BROKENFILE}" ${PKGSRCDIR}/${BROKENFILE} ; then :; else \
+						${ECHO} " $$pkgerr $$pkgdir/${BROKENFILE} 0 " >> ${PKGSRCDIR}/${BROKENFILE} ;\
 					fi ;\
 				done ;\
 			fi ;\
@@ -387,7 +387,7 @@ bulk-package:
 			if [ -f ${INTERACTIVE_COOKIE} ]; then \
 				nerrors="0"; \
 			fi; \
-			${ECHO_MSG} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${_PKGSRCDIR}/${BROKENFILE} \
+			${ECHO_MSG} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${PKGSRCDIR}/${BROKENFILE} \
 			) 2>&1 | ${TEE} -a ${BROKENFILE}; \
 		fi ; \
 		case ${_PRESERVE_WRKDIR} in				\
@@ -395,7 +395,7 @@ bulk-package:
 		*)	${ECHO_MSG} "BULK> Cleaning packages and its depends"; \
 		 	if [ "${USE_BULK_CACHE}" = "yes" ]; then	\
 				for pkgdir in ${PKGPATH} `${GREP} "^${PKGPATH} " ${DEPENDSFILE} | ${SED} -e 's;^.*:;;g'`; do \
-					${DO}       (cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
+					${DO}       (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
 				done;					\
 			else						\
 				${ECHO_MSG} ${MAKE} clean CLEANDEPENDS=YES;\
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 08d12e13803..d81c3bb9eb7 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.2 2004/10/06 20:59:40 jlam Exp $
+# $NetBSD: mk.conf,v 1.3 2004/10/07 02:01:39 jlam Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -218,7 +218,7 @@ BSDXSRCDIR?=	/usr/xsrc
 # Possible: any path
 # Default: /usr/xsrc
 
-DISTDIR?=	${_PKGSRCDIR}/distfiles
+DISTDIR?=	${PKGSRCDIR}/distfiles
 # Directory where original distribution
 # files are stored.
 # Possible: any path you like
@@ -284,7 +284,7 @@ RCD_SCRIPTS_DIR?= /etc/rc.d
 # Possible: any path you like
 # Default: /etc/rc.d
 
-PACKAGES?=	${_PKGSRCDIR}/packages
+PACKAGES?=	${PKGSRCDIR}/packages
 # Store generated packages on a per-architecture base
 # Possible: any path you like
 # Default: /usr/pkgsrc/packages
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 7ec8b9b22cb..b88dcf1f2a5 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.2 2004/10/07 02:01:39 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -170,7 +170,7 @@ _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
 	@echo "ERROR: pkgsrc now requires a more functional sed(1) than Solaris provides."
 	@echo "you can satisfy this requirement by running:"
 	@echo ""
-	@echo "    cd ${_PKGSRCDIR}/textproc/nbsed; ${MAKE} install"
+	@echo "    cd ${PKGSRCDIR}/textproc/nbsed; ${MAKE} install"
 	@echo ""
 	@echo "this will install ${LOCALBASE}/bin/nbsed and eliminate this message."
 	@echo "(nbsed is already installed by recent bootstrap-pkgsrc)."