summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgtools/digest/Makefile8
-rw-r--r--pkgtools/pkg_install/Makefile8
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgtools/digest/Makefile b/pkgtools/digest/Makefile
index 5d1a3d6ecea..bab748a44a8 100644
--- a/pkgtools/digest/Makefile
+++ b/pkgtools/digest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/03/13 19:38:26 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2004/03/13 21:00:19 jlam Exp $
#
# When adding new digest algorithms, please use rmd160 as the template,
# and bump the VERSION definition.
@@ -20,10 +20,10 @@ GNU_CONFIGURE= # defined
NO_PKGTOOLS_REQD_CHECK= # defined
NO_CHECKSUM= # defined
-# XXX Remove the following line after digest-handling is changed to be
-# XXX done by BUILD_DEPENDS.
-# XXX
+# XXX Remove the following two lines after pkgsrc/bootstrap is up and
+# XXX running.
USE_NATIVE_GCC= yes
+USE_DIGEST= no
.include "../../mk/bsd.prefs.mk"
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index 8058561d563..e84302de3ca 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2004/03/13 19:12:26 jlam Exp $
+# $NetBSD: Makefile,v 1.97 2004/03/13 21:00:19 jlam Exp $
# Notes to package maintainers:
#
@@ -33,13 +33,15 @@ NO_PACKAGE= Deinstallation is not permitted
NO_TOOLS= # defined
PKG_PRESERVE= # defined
-# This is needed to solve a chicken-and-egg problem where pkgsrc uses
+# These are needed to solve a chicken-and-egg problem where pkgsrc uses
# newer features of pkg_install, but older NetBSD installations won't
# support them. In this case, we explicitly use the native GCC
# compiler to avoid problems with depending on pkgsrc GCC for building
-# pkg_install.
+# pkg_install. We also avoid building digest as that would involve
+# using the newer pkg_install tools.
#
USE_NATIVE_GCC= yes
+USE_DIGEST= no
PLIST_SUBST+= MANDIR=${MANDIR}
PLIST_SUBST+= PKG_TOOLS_BIN=${PKG_TOOLS_BIN}