pkg/30741: [PATCH] bsd.pkg.defaults.mk -> defaults/mk.conf

[anonymous%example.net@localhost]

>Number:         30741
>Category:       pkg
>Synopsis:       [PATCH] bsd.pkg.defaults.mk -> defaults/mk.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          doc-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 13 13:53:00 +0000 2005
>Originator:     anonymous
>Release:        N/A
>Organization:
>Environment:
N/A
>Description:
There are description about pkgsrc/mk/bsd.pkg.defaults.mk
which was moved to pkgsrc/mk/defaults/mk.conf.
>How-To-Repeat:
Read documents.
>Fix:
Apply following patch:

Index: bootstrap/README.IRIX
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/README.IRIX,v
retrieving revision 1.4
diff -u -r1.4 README.IRIX
--- bootstrap/README.IRIX       10 Apr 2005 22:03:35 -0000      1.4
+++ bootstrap/README.IRIX       13 Jul 2005 13:32:55 -0000
@@ -26,7 +26,7 @@
 
 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 pkgsrc/mk/bsd.pkg.defaults.mk and, of course,
+local setup.  Please see pkgsrc/mk/defaults/mk.conf and, of course,
 your compilers man pages for details.
 
 If you are using SGI's MIPSPro compiler, please set
Index: mk/platform/AIX.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/AIX.mk,v
retrieving revision 1.18
diff -u -r1.18 AIX.mk
--- mk/platform/AIX.mk  1 Jun 2005 18:14:23 -0000       1.18
+++ mk/platform/AIX.mk  13 Jul 2005 13:32:56 -0000
@@ -7,7 +7,7 @@
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 # AIX strip fails too easily.  Use a wrapper script instead
@@ -83,9 +83,9 @@
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/BSDOS.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/BSDOS.mk,v
retrieving revision 1.13
diff -u -r1.13 BSDOS.mk
--- mk/platform/BSDOS.mk        1 Jun 2005 18:14:23 -0000       1.13
+++ mk/platform/BSDOS.mk        13 Jul 2005 13:32:56 -0000
@@ -11,7 +11,7 @@
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 SU?=           /usr/bin/su
@@ -85,9 +85,9 @@
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/Darwin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Darwin.mk,v
retrieving revision 1.12
diff -u -r1.12 Darwin.mk
--- mk/platform/Darwin.mk       1 Jun 2005 18:14:23 -0000       1.12
+++ mk/platform/Darwin.mk       13 Jul 2005 13:32:56 -0000
@@ -10,7 +10,7 @@
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 SU?=           /usr/bin/su
@@ -95,9 +95,9 @@
 .endif
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/DragonFly.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/DragonFly.mk,v
retrieving revision 1.17
diff -u -r1.17 DragonFly.mk
--- mk/platform/DragonFly.mk    5 Jun 2005 18:05:54 -0000       1.17
+++ mk/platform/DragonFly.mk    13 Jul 2005 13:32:56 -0000
@@ -83,9 +83,9 @@
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 .if !(empty(SETGIDGAME:M[yY][eE][sS]))
 GAMEOWN=               games
 GAMEGRP=               games
Index: mk/platform/FreeBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/FreeBSD.mk,v
retrieving revision 1.12
diff -u -r1.12 FreeBSD.mk
--- mk/platform/FreeBSD.mk      1 Jun 2005 18:14:23 -0000       1.12
+++ mk/platform/FreeBSD.mk      13 Jul 2005 13:32:56 -0000
@@ -81,9 +81,9 @@
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 .if !(empty(SETGIDGAME:M[yY][eE][sS]))
 GAMEOWN=               games
 GAMEGRP=               games
Index: mk/platform/IRIX.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/IRIX.mk,v
retrieving revision 1.15
diff -u -r1.15 IRIX.mk
--- mk/platform/IRIX.mk 1 Jun 2005 18:14:23 -0000       1.15
+++ mk/platform/IRIX.mk 13 Jul 2005 13:32:56 -0000
@@ -87,9 +87,9 @@
 _OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysconf ARG_MAX
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/Interix.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Interix.mk,v
retrieving revision 1.37
diff -u -r1.37 Interix.mk
--- mk/platform/Interix.mk      3 Jul 2005 19:04:10 -0000       1.37
+++ mk/platform/Interix.mk      13 Jul 2005 13:32:57 -0000
@@ -130,9 +130,9 @@
 _OPSYS_MAX_CMDLEN_CMD= ${ECHO} 262144
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/Linux.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/Linux.mk,v
retrieving revision 1.16
diff -u -r1.16 Linux.mk
--- mk/platform/Linux.mk        14 Jun 2005 07:12:23 -0000      1.16
+++ mk/platform/Linux.mk        13 Jul 2005 13:32:57 -0000
@@ -7,7 +7,7 @@
 IMAKEOPTS+=    -DBuildHtmlManPages=NO
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 SU?=           /bin/su
@@ -80,9 +80,9 @@
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/NetBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/NetBSD.mk,v
retrieving revision 1.15
diff -u -r1.15 NetBSD.mk
--- mk/platform/NetBSD.mk       1 Jun 2005 18:14:23 -0000       1.15
+++ mk/platform/NetBSD.mk       13 Jul 2005 13:32:57 -0000
@@ -134,9 +134,9 @@
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 .if !(empty(SETGIDGAME:M[yY][eE][sS]))
 GAMEOWN=               games
 GAMEGRP=               games
Index: mk/platform/OpenBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/OpenBSD.mk,v
retrieving revision 1.17
diff -u -r1.17 OpenBSD.mk
--- mk/platform/OpenBSD.mk      1 Jun 2005 18:14:23 -0000       1.17
+++ mk/platform/OpenBSD.mk      13 Jul 2005 13:32:57 -0000
@@ -6,7 +6,7 @@
 IMAKE_MAKE?=   ${MAKE}         # program which gets invoked by imake
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 SU?=           /usr/bin/su
@@ -101,9 +101,9 @@
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/SunOS.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/SunOS.mk,v
retrieving revision 1.17
diff -u -r1.17 SunOS.mk
--- mk/platform/SunOS.mk        4 Jun 2005 23:33:50 -0000       1.17
+++ mk/platform/SunOS.mk        13 Jul 2005 13:32:57 -0000
@@ -6,7 +6,7 @@
 IMAKE_MAKE?=   /usr/ccs/bin/make       # program which gets invoked by imake
 PKGLOCALEDIR?= lib
 PS?=           /bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 SU?=           /usr/bin/su
@@ -121,9 +121,9 @@
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: mk/platform/UnixWare.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/platform/UnixWare.mk,v
retrieving revision 1.14
diff -u -r1.14 UnixWare.mk
--- mk/platform/UnixWare.mk     4 Jun 2005 23:33:50 -0000       1.14
+++ mk/platform/UnixWare.mk     13 Jul 2005 13:32:57 -0000
@@ -6,7 +6,7 @@
 IMAKE_MAKE?=   /usr/ccs/bin/make       # program which gets invoked by imake
 PKGLOCALEDIR?= lib
 PS?=           /usr/bin/ps
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# XXX: default from defaults/mk.conf.  Verify/corerct for this platform
 # and remove this comment.
 RSH?=          /usr/bin/rsh
 SU?=           /usr/bin/su
@@ -85,9 +85,9 @@
 #_OPSYS_MAX_CMDLEN_CMD=        /sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
+# (it defaults to 'no' as per defaults/mk.conf).
 # Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
+# BINOWN, BINGRP and BINMODE as per defaults/mk.conf).
 # FIXME: Adjust to work on this system and enable the lines below.
 #.if !(empty(SETGIDGAME:M[yY][eE][sS]))
 #GAMEOWN=              games
Index: net/md-whois/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/md-whois/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net/md-whois/Makefile       22 May 2005 20:08:25 -0000      1.14
+++ net/md-whois/Makefile       13 Jul 2005 13:32:57 -0000
@@ -2,7 +2,7 @@
 #
 # todo: set location of [md-]whois.conf and fix in man page too
 # todo: build and install the po/ files and add to PLIST
-# todo: add choice for mk/bsd.pkg.defaults.mk to define name prefix
+# todo: add choice for mk/defaults/mk.conf to define name prefix
 # (defaults to "md-" to distinguish from other whois clients) and adjust PLIST
 
 DISTNAME=      whois_${VERSION}
Index: security/audit-packages/files/audit-packages.0
===================================================================
RCS file: /cvsroot/pkgsrc/security/audit-packages/files/audit-packages.0,v
retrieving revision 1.9
diff -u -r1.9 audit-packages.0
--- security/audit-packages/files/audit-packages.0      12 Jun 2005 13:57:24 
-0000      1.9
+++ security/audit-packages/files/audit-packages.0      13 Jul 2005 13:32:58 
-0000
@@ -123,7 +123,7 @@
                  Update the 
_p_k_g_t_o_o_l_s_/_p_k_g___i_n_s_t_a_l_l package.
 
 SSEEEE AALLSSOO
-     pkg_info(1), mk.conf(5), packages(7), @PKGSRCDIR@/mk/bsd.pkg.defaults.mk
+     pkg_info(1), mk.conf(5), packages(7), @PKGSRCDIR@/mk/defaults/mk.conf
      and
 
      _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e 
_N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m.  
@PKGSRCDIR@/doc/pkgsrc.txt
Index: security/audit-packages/files/audit-packages.8
===================================================================
RCS file: /cvsroot/pkgsrc/security/audit-packages/files/audit-packages.8,v
retrieving revision 1.13
diff -u -r1.13 audit-packages.8
--- security/audit-packages/files/audit-packages.8      9 Jun 2005 15:34:52 
-0000       1.13
+++ security/audit-packages/files/audit-packages.8      13 Jul 2005 13:32:59 
-0000
@@ -235,7 +235,7 @@
 .Xr pkg_info 1 ,
 .Xr mk.conf 5 ,
 .Xr packages 7 ,
-@PKGSRCDIR@/mk/bsd.pkg.defaults.mk
+@PKGSRCDIR@/mk/defaults/mk.conf
 and
 .Rs
 .%T "Documentation on the NetBSD Package System"