summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bootstrap/README.IRIX4
-rw-r--r--mk/platform/AIX.mk8
-rw-r--r--mk/platform/BSDOS.mk8
-rw-r--r--mk/platform/Darwin.mk8
-rw-r--r--mk/platform/DragonFly.mk6
-rw-r--r--mk/platform/FreeBSD.mk6
-rw-r--r--mk/platform/IRIX.mk6
-rw-r--r--mk/platform/Interix.mk6
-rw-r--r--mk/platform/Linux.mk8
-rw-r--r--mk/platform/NetBSD.mk6
-rw-r--r--mk/platform/OpenBSD.mk8
-rw-r--r--mk/platform/SunOS.mk8
-rw-r--r--mk/platform/UnixWare.mk8
-rw-r--r--net/md-whois/Makefile4
-rw-r--r--security/audit-packages/files/audit-packages.02
-rw-r--r--security/audit-packages/files/audit-packages.84
16 files changed, 50 insertions, 50 deletions
diff --git a/bootstrap/README.IRIX b/bootstrap/README.IRIX
index a0085818018..2ead04504fc 100644
--- a/bootstrap/README.IRIX
+++ b/bootstrap/README.IRIX
@@ -1,4 +1,4 @@
-$NetBSD: README.IRIX,v 1.4 2005/04/10 22:03:35 jschauma Exp $
+$NetBSD: README.IRIX,v 1.5 2005/08/02 00:23:31 reed Exp $
You will need a working C compiler, either gcc or SGI's MIPS and MIPSpro
compiler (cc/c89). Please set the CC environment variable according to your
@@ -26,7 +26,7 @@ mounted filesystem.
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
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index cbd9fe47566..224162e6072 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.18 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: AIX.mk,v 1.19 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the AIX operating system.
@@ -7,7 +7,7 @@ ECHO_N?= ${ECHO} -n
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 @@ SERIAL_DEVICES?= /dev/tty0 \
#_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
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 4bd6fd52518..057443c15e0 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.13 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.14 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -11,7 +11,7 @@ ECHO_N?= ${ECHO} -n
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 @@ PKG_CREATE_USERGROUP= NO # until it works
#_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
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 26e2a8df411..48d2182509e 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.12 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.13 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the Darwin operating system.
@@ -10,7 +10,7 @@ LDD?= /usr/bin/otool -L
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 @@ CONFIGURE_ENV+= ac_cv_func_poll=no
.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
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index ecdcfbc9735..4689c508b25 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.17 2005/06/05 18:05:54 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.18 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the DragonFly operating system.
@@ -83,9 +83,9 @@ PKG_HAVE_KQUEUE= # defined
_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
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index f70627270ac..5cc2796d321 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.12 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.13 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -81,9 +81,9 @@ PKG_HAVE_KQUEUE= # defined
_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
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 4c9b78db176..645f4cb516a 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.15 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.16 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the IRIX operating system.
@@ -87,9 +87,9 @@ LIBABISUFFIX?= ${ABI}
_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
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 0d6532f9e16..63ce131eb32 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.37 2005/07/03 19:04:10 tv Exp $
+# $NetBSD: Interix.mk,v 1.38 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the Interix operating system.
@@ -130,9 +130,9 @@ CONFIGURE_ENV+= ${GNU_CONFIGURE:Dac_cv_header_poll_h=no ac_cv_func_poll=no}
_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
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 3de349dab6a..8a9cdf3ec21 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.16 2005/06/14 07:12:23 jlam Exp $
+# $NetBSD: Linux.mk,v 1.17 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the Linux operating system.
@@ -7,7 +7,7 @@ IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
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 @@ LOCALBASE?= ${DESTDIR}/usr/pkg
#_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
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 2bb5c01c4d6..3b033519f86 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.15 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.16 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -134,9 +134,9 @@ PKG_HAVE_KQUEUE= # defined
_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
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 1cb8a94222a..25af567f772 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.17 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.18 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -6,7 +6,7 @@ ECHO_N?= ${ECHO} -n
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 @@ SERIAL_DEVICES?= /dev/null
_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
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index a16f16dbc5a..38639d8f54e 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.17 2005/06/04 23:33:50 markd Exp $
+# $NetBSD: SunOS.mk,v 1.18 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -6,7 +6,7 @@ ECHO_N?= ${ECHO} -n
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 @@ PKG_TOOLS_BIN?= ${LOCALBASE}/bin
#_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
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 99a4681c188..3d08765a6af 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.14 2005/06/04 23:33:50 markd Exp $
+# $NetBSD: UnixWare.mk,v 1.15 2005/08/02 00:23:31 reed Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -6,7 +6,7 @@ ECHO_N?= ${ECHO} -n
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 @@ PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
#_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
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index 6e41f103eaa..3fd9fa55909 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/02 00:23:31 reed Exp $
#
# 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}
diff --git a/security/audit-packages/files/audit-packages.0 b/security/audit-packages/files/audit-packages.0
index 64e00c78202..f39933a1a3c 100644
--- a/security/audit-packages/files/audit-packages.0
+++ b/security/audit-packages/files/audit-packages.0
@@ -123,7 +123,7 @@ DDIIAAGGNNOOSSTTIICCSS
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
diff --git a/security/audit-packages/files/audit-packages.8 b/security/audit-packages/files/audit-packages.8
index 96ac9da13d5..fc58ec4ce97 100644
--- a/security/audit-packages/files/audit-packages.8
+++ b/security/audit-packages/files/audit-packages.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: audit-packages.8,v 1.13 2005/06/09 15:34:52 dillo Exp $
+.\" $NetBSD: audit-packages.8,v 1.14 2005/08/02 00:23:31 reed Exp $
.\"
.\" Copyright (c) 2003 Jeremy C. Reed. All rights reserved.
.\"
@@ -235,7 +235,7 @@ package.
.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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 02:37:31 +0000