Correct path for pkgsrc defaults. s,bsd.pkg.defaults.mk,defaults/mk.conf,

Partially addresses PR#28760

4 files changed, 12 insertions, 12 deletions

diff --git a/doc/guide/files/binary.xml b/doc/guide/files/binary.xml
index 7367d946737..927a6ceaed3 100644
--- a/doc/guide/files/binary.xml
+++ b/doc/guide/files/binary.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: binary.xml,v 1.1.1.1 2004/10/21 14:27:40 grant Exp $ -->
+<!-- $NetBSD: binary.xml,v 1.2 2004/12/23 18:57:03 ben Exp $ -->
 
 <chapter id="binary">
   <title>Creating binary packages</title>
@@ -54,7 +54,7 @@
 	<title>/etc/mk.conf</title>
 
 	<para>You may want to set things in <filename>/etc/mk.conf</filename>.
-	  Look at <filename>pkgsrc/mk/bsd.pkg.defaults.mk</filename> for
+	  Look at <filename>pkgsrc/mk/defaults/mk.conf</filename> for
 	  details of the default settings. You will want to ensure that
 	  <varname>ACCEPTABLE_LICENSES</varname> meet your local policy.
 	  As used in this example, <varname>_ACCEPTABLE=yes</varname>
diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index af660151bcf..307a1368acf 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.4 2004/12/09 18:23:27 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.5 2004/12/23 18:57:03 ben Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
   <title>Notes on fixes for packages</title>
@@ -916,7 +916,7 @@ pre-configure:
           directory as well as by looking at the list of (commented
           out) <varname>ACCEPTABLE_LICENSES</varname> variable
           settings in
-          <filename>pkgsrc/mk/bsd.pkg.defaults.mk</filename>.</para>
+          <filename>pkgsrc/mk/defaults/mk.conf</filename>.</para>
 
 	<para> Is there is a <emphasis>really</emphasis> pressing need
           to accept all licenses at once, like when trying to download
@@ -976,7 +976,7 @@ pre-configure:
         installed setgid and the score files owned by the appropriate
         group and/or owner (traditionally the "games" user/group).  The
         following variables, documented in more detail in
-        <filename>mk/bsd.pkg.defaults.mk</filename>, control this
+        <filename>mk/defaults/mk.conf</filename>, control this
         behaviour: <varname>SETGIDGAME</varname>,
         <varname>GAMEDATAMODE</varname>, <varname>GAMEGRP</varname>,
         <varname>GAMEMODE</varname>, <varname>GAMEOWN</varname>. </para>
diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index cd1b73b7a51..c9c9f0fdf9d 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.2 2004/10/22 00:24:48 hubertf Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.3 2004/12/23 18:57:03 ben Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -311,7 +311,7 @@
 
       <para>The bootstrapping process should set all the right options for programs such
 	as imake(1), but you may want to set some options depending on your local
-	setup.  Please see <filename>pkgsrc/mk/bsd.pkg.defaults.mk</filename> and, of
+	setup.  Please see <filename>pkgsrc/mk/defaults/mk.conf</filename> and, of
 	course, your compilers man pages for details.</para>
     </sect2>
 
@@ -361,7 +361,7 @@
 	    of the file with:</para>
 
 	  <programlisting>.ifdef BSD_PKG_MK
-# pkgsrc stuff, e.g. insert bsd.pkg.defaults.mk or similar here
+# pkgsrc stuff, e.g. insert defaults/mk.conf or similar here
 .else
 # OpenBSD stuff
 .endif</programlisting>
diff --git a/doc/guide/files/using.xml b/doc/guide/files/using.xml
index 7158a54aa8f..11bfa257c9f 100644
--- a/doc/guide/files/using.xml
+++ b/doc/guide/files/using.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: using.xml,v 1.3 2004/12/23 18:50:23 ben Exp $ -->
+<!-- $NetBSD: using.xml,v 1.4 2004/12/23 18:57:03 ben Exp $ -->
 
 <chapter id="using"> <?dbhtml filename="using.html"?>
   <title>Using pkgsrc</title>
@@ -101,7 +101,7 @@
 
       <para>You can overwrite some of the major distribution sites to fit to sites
         that are close to your own.  Have a look at
-        <filename>pkgsrc/mk/bsd.pkg.defaults.mk</filename> to find some examples
+        <filename>pkgsrc/mk/defaults/mk.conf</filename> to find some examples
         - in particular, look for the <varname>MASTER_SORT</varname>,
         <varname>MASTER_SORT_REGEX</varname> and
         <varname>INET_COUNTRY</varname> definitions.  This may save some of your
@@ -159,7 +159,7 @@
 
       <para>Some packages look in <filename>/etc/mk.conf</filename> to alter some
         configuration options at build time.  Have a look at
-        <filename>pkgsrc/mk/bsd.pkg.defaults.mk</filename> to
+        <filename>pkgsrc/mk/defaults/mk.conf</filename> to
         get an overview of what will be set there by default.  Environment
         variables such as <varname>LOCALBASE</varname>
         can be set in <filename>/etc/mk.conf</filename> to
@@ -205,7 +205,7 @@
         <varname>BINPKG_SITES</varname>, which defaults to
         ftp.NetBSD.org. Any flags that should be added to &man.pkg.add.1; can be put
         into <varname>BIN_INSTALL_FLAGS</varname>.
-        See <filename>pkgsrc/mk/bsd.pkg.defaults.mk</filename> for more details.</para>
+        See <filename>pkgsrc/mk/defaults/mk.conf</filename> for more details.</para>
 
       <para>A final word of warning: If you setup a system that has a non-standard
         setting for <varname>LOCALBASE</varname>, be sure to set that