* 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, 14 insertions, 14 deletions

diff --git a/pkgtools/pkg_regress/Makefile b/pkgtools/pkg_regress/Makefile
index 03174c55a95..eec099930ef 100644
--- a/pkgtools/pkg_regress/Makefile
+++ b/pkgtools/pkg_regress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/08/28 00:26:57 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/07 02:01:38 jlam Exp $
 
 DISTNAME=	pkg_regress-0.0
 CATEGORIES=	pkgtools
@@ -22,7 +22,7 @@ INSTALLATION_DIRS=	sbin
 
 do-build:
 	${SED} -e 's#@MAKE@#${MAKE}#g' \
-	  -e 's#@PKGSRCDIR@#${_PKGSRCDIR}#g' \
+	  -e 's#@PKGSRCDIR@#${PKGSRCDIR}#g' \
 	  -e 's#@SH@#${SH}#g' \
 	  -e 's#@EGREP@#${EGREP}#g' \
 	  ${FILESDIR}/pkg_regress.sh >${WRKSRC}/pkg_regress.sh
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index 7a07d7fc781..ec3484bcfd0 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/22 20:02:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/07 02:01:38 jlam Exp $
 
 DISTNAME=	pkgclean-20040622
 CATEGORIES=	pkgtools
@@ -33,7 +33,7 @@ do-install:
 SUBST_CLASSES=          path
 SUBST_STAGE.path=       post-patch
 SUBST_FILES.path=       pkgclean.c pkgclean.1
-SUBST_SED.path=         -e "s,@PKGSRCDIR@,${_PKGSRCDIR},g"
+SUBST_SED.path=         -e "s,@PKGSRCDIR@,${PKGSRCDIR},g"
 SUBST_MESSAGE.path=     "Adjusting pkgsrc directory."
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index 8d10320e339..3b5b8d32662 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:23:57 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/07 02:01:38 jlam Exp $
 #
 
 DISTNAME=	pkgdep-1.0
@@ -18,7 +18,7 @@ NO_CONFIGURE=	yes
 
 do-build:
 	${CP} ${FILESDIR}/pkgdep.pl ${WRKDIR}/pkgdep
-#	${SED} -e 's|/usr/pkgsrc|${_PKGSRCDIR}|' \
+#	${SED} -e 's|/usr/pkgsrc|${PKGSRCDIR}|' \
 #		${FILESDIR}/pkgdep.pl > ${WRKDIR}/pkgdep
 
 do-install:
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index 5a3fe84a156..f920f29ac50 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/07/28 01:42:43 atatat Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/07 02:01:38 jlam Exp $
 #
 
 DISTNAME=	pkgdepgraph-2.7
@@ -33,14 +33,14 @@ do-build:
 .for FILE in pkgdepgraph
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
 		-e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'	\
-		-e 's|@PKGSRCDIR@|${_PKGSRCDIR}|g'	\
+		-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'	\
 		-e 's|@DISTVER@|${DISTVER}|g'		\
 		< ${WRKSRC}/${FILE}.pl 		\
 		> ${WRKSRC}/${FILE}
 .endfor
 .for FILE in pkgdepgraph.1 pkgdepgraph.0
 	${SED} -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'	\
-		-e 's|@PKGSRCDIR@|${_PKGSRCDIR}|g'	\
+		-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'	\
 		< ${WRKSRC}/${FILE}.in		\
 		> ${WRKSRC}/${FILE}
 .endfor
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index 53633829e88..abfed65cf7d 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/22 20:01:01 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/07 02:01:38 jlam Exp $
 
 DISTNAME=	pkgfind-20040622
 CATEGORIES=	pkgtools
@@ -33,7 +33,7 @@ do-install:
 SUBST_CLASSES=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	pkgfind.c pkgfind.1
-SUBST_SED.path=		-e "s,/usr/pkgsrc,${_PKGSRCDIR},g"
+SUBST_SED.path=		-e "s,/usr/pkgsrc,${PKGSRCDIR},g"
 SUBST_MESSAGE.path=	"Adjusting pkgsrc directory."
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 3f26c635f56..157e4dd6075 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.204 2004/09/24 15:33:26 wiz Exp $
+# $NetBSD: Makefile,v 1.205 2004/10/07 02:01:38 jlam Exp $
 #
 
 DISTNAME=	pkglint-3.91
@@ -22,7 +22,7 @@ NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 USE_LANGUAGES=	# empty
 
-MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
+MAKE_ENV=	PKGSRCDIR=${PKGSRCDIR:Q}
 
 DISTVER=	${DISTNAME:S/pkglint-//}
 
@@ -42,7 +42,7 @@ do-extract:
 do-build:
 .for FILE in ${SUBST_FILES}
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
-		-e 's|@PORTSDIR@|${_PKGSRCDIR}|g'	\
+		-e 's|@PORTSDIR@|${PKGSRCDIR}|g'	\
 		-e 's|@DISTVER@|${DISTVER}|g'		\
 		-e 's|@MAKE@|${MAKE}|g'			\
 		-e 's|@PERL@|${PERL5}|g'		\