summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/bsd.prefs.mk78
-rw-r--r--mk/defs.Darwin.mk19
-rw-r--r--mk/defs.Linux.mk19
-rw-r--r--mk/defs.NetBSD.mk35
-rw-r--r--mk/defs.SunOS.mk44
5 files changed, 89 insertions, 106 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 1b12b12831a..a5c5719ded3 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.63 2001/11/04 19:49:56 agc Exp $
+# $NetBSD: bsd.prefs.mk,v 1.64 2001/11/21 14:10:06 agc Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -250,82 +250,6 @@ NEED_NCURSES= YES
# recursive dependency problems!)
.endif # USE_CURSES
-
-#
-# list of serial port devices commonly found on various machines and
-# which is the common default one. This is used for semi-reasonable
-# defaults on different machines. These can and should be overridden
-# on your machine in /etc/mk.conf.
-# Please help fill in the list.
-.if (${OPSYS} == "NetBSD")
-.if (${MACHINE_ARCH} == alpha)
-DEFAULT_SERIAL_DEVICE?= /dev/ttyC0
-SERIAL_DEVICES?= /dev/ttyC0 \
- /dev/ttyC1
-.elif (${MACHINE_ARCH} == "i386")
-DEFAULT_SERIAL_DEVICE?= /dev/tty00
-SERIAL_DEVICES?= /dev/tty00 \
- /dev/tty01
-.elif (${MACHINE_ARCH} == m68k)
-DEFAULT_SERIAL_DEVICE?= /dev/tty00
-SERIAL_DEVICES?= /dev/tty00 \
- /dev/tty01
-.elif (${MACHINE_ARCH} == mipsel)
-DEFAULT_SERIAL_DEVICE?= /dev/ttyC0
-SERIAL_DEVICES?= /dev/ttyC0 \
- /dev/ttyC1
-.elif (${MACHINE_ARCH} == "sparc")
-DEFAULT_SERIAL_DEVICE?= /dev/ttya
-SERIAL_DEVICES?= /dev/ttya \
- /dev/ttyb
-.else
-DEFAULT_SERIAL_DEVICE?= /dev/null
-SERIAL_DEVICES?= /dev/null
-.endif # ${MACHINE_ARCH}
-.else # ${OPSYS} != "NetBSD"
-DEFAULT_SERIAL_DEVICE?= /dev/null
-SERIAL_DEVICES?= /dev/null
-.endif # ${OPSYS} == "NetBSD"
-
-##### Some overrides of defaults below on a per-OS basis.
-.if (${OPSYS} == "NetBSD")
-PKG_TOOLS_BIN?= /usr/sbin
-.elif (${OPSYS} == "SunOS")
-# Migration aid for old /usr/local LOCALBASE on Solaris
-. if !defined(LOCALBASE) && exists(${DESTDIR}/usr/local/libexec/cgi-bin) && \
- !exists(${DESTDIR}/usr/pkg/libexec/cgi-bin)
-.BEGIN:
- @echo "On Solaris and /usr/local/libexec/cgi-bin found:"
- @echo "- If you have an existing pkgsrc installation & wish to continue"
- @echo " using /usr/local, append LOCALBASE=/usr/local to /etc/mk.conf."
- @echo "- Otherwise set LOCALBASE=/usr/pkg in your environment for the"
- @echo " first package install."
- @false
-. endif
-# end of migration aid
-LOCALBASE?= ${DESTDIR}/usr/pkg
-. if !defined(ZOULARISBASE)
-. if exists(${LOCALBASE}/bsd)
-ZOULARISBASE:= ${LOCALBASE}/bsd
-. else
-ZOULARISBASE:= ${LOCALBASE}
-. endif
-. endif
-PKG_TOOLS_BIN?= ${ZOULARISBASE}/bin
-
-. if (${X11BASE} == "/usr/openwin")
-HAVE_OPENWINDOWS= YES
-. endif
-
-.elif (${OPSYS} == "Linux")
-ZOULARISBASE?= ${DESTDIR}/usr/local/bsd
-PKG_TOOLS_BIN?= ${ZOULARISBASE}/bin
-
-.elif (${OPSYS} == "Darwin")
-ZOULARISBASE?= ${DESTDIR}/usr/pkg
-PKG_TOOLS_BIN?= ${ZOULARISBASE}/sbin
-.endif
-
LOCALBASE?= ${DESTDIR}/usr/pkg
X11BASE?= ${DESTDIR}/usr/X11R6
CROSSBASE?= ${LOCALBASE}/cross
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index cae98446554..d06a24b0528 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.13 2001/11/21 13:57:31 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.14 2001/11/21 14:10:07 agc Exp $
#
# Variable definitions for the Darwin operating system.
@@ -51,15 +51,18 @@ TYPE?= type # Shell builtin
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
-DEF_UMASK?= 0022
-GROUPADD?= ${FALSE} # XXX - Fix me!
+DEF_UMASK?= 0022
+DEFAULT_SERIAL_DEVICE?= /dev/null
+GROUPADD?= ${FALSE} # XXX - Fix me!
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
-NOLOGIN?= ${FALSE}
-USERADD?= ${FALSE} # XXX - Fix me!
-
-ROOT_USER?= root
-ROOT_GROUP?= wheel
+NOLOGIN?= ${FALSE}
+PKG_TOOLS_BIN?= ${ZOULARISBASE}/sbin
+ROOT_GROUP?= wheel
+ROOT_USER?= root
+SERIAL_DEVICES?= /dev/null
+USERADD?= ${FALSE} # XXX - Fix me!
+ZOULARISBASE?= ${DESTDIR}/usr/pkg
_DO_LIBINTL_CHECKS= yes # perform checks for valid libintl
_DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 6440c274259..5dee162a8c4 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.19 2001/11/21 13:57:31 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.20 2001/11/21 14:10:07 agc Exp $
#
# Variable definitions for the Linux operating system.
@@ -55,15 +55,18 @@ TYPE?= type
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs -r
-DEF_UMASK?= 022
-GROUPADD?= /usr/sbin/groupadd
+DEF_UMASK?= 022
+DEFAULT_SERIAL_DEVICE?= /dev/null
+GROUPADD?= /usr/sbin/groupadd
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
-NOLOGIN?= ${FALSE}
-USERADD?= /usr/sbin/useradd
-
-ROOT_USER?= root
-ROOT_GROUP?= wheel
+NOLOGIN?= ${FALSE}
+PKG_TOOLS_BIN?= ${ZOULARISBASE}/bin
+ROOT_GROUP?= wheel
+ROOT_USER?= root
+SERIAL_DEVICES?= /dev/null
+USERADD?= /usr/sbin/useradd
+ZOULARISBASE?= ${DESTDIR}/usr/local/bsd
_DO_LIBINTL_CHECKS= no # perform checks for valid libintl
_DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 1e1ee95ed09..6ce4e42de7f 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.17 2001/11/21 13:57:31 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.18 2001/11/21 14:10:07 agc Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -62,12 +62,12 @@ DEPENDS+= user>=20000313:../../sysutils/user
.endif
.endif
-DEF_UMASK?= 0022
+DEF_UMASK?= 0022
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
MOTIF12_TYPE_DEFAULT?= lesstif12 # default 1.2 compatible libs type
-NOLOGIN?= /sbin/nologin
-
-ROOT_USER?= root
+NOLOGIN?= /sbin/nologin
+PKG_TOOLS_BIN?= /usr/sbin
+ROOT_USER?= root
ROOT_GROUP?= wheel
_DO_LIBINTL_CHECKS= yes # perform checks for valid libintl
@@ -78,3 +78,28 @@ _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
_PATCH_BACKUP_ARG= -b # switch to patch(1) to provide a backup file
_PREFORMATTED_MAN_DIR= cat # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
+
+.if (${MACHINE_ARCH} == alpha)
+DEFAULT_SERIAL_DEVICE?= /dev/ttyC0
+SERIAL_DEVICES?= /dev/ttyC0 \
+ /dev/ttyC1
+.elif (${MACHINE_ARCH} == "i386")
+DEFAULT_SERIAL_DEVICE?= /dev/tty00
+SERIAL_DEVICES?= /dev/tty00 \
+ /dev/tty01
+.elif (${MACHINE_ARCH} == m68k)
+DEFAULT_SERIAL_DEVICE?= /dev/tty00
+SERIAL_DEVICES?= /dev/tty00 \
+ /dev/tty01
+.elif (${MACHINE_ARCH} == mipsel)
+DEFAULT_SERIAL_DEVICE?= /dev/ttyC0
+SERIAL_DEVICES?= /dev/ttyC0 \
+ /dev/ttyC1
+.elif (${MACHINE_ARCH} == "sparc")
+DEFAULT_SERIAL_DEVICE?= /dev/ttya
+SERIAL_DEVICES?= /dev/ttya \
+ /dev/ttyb
+.else
+DEFAULT_SERIAL_DEVICE?= /dev/null
+SERIAL_DEVICES?= /dev/null
+.endif
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index dbc78d24ad5..3433684c476 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.16 2001/11/21 13:57:31 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.17 2001/11/21 14:10:07 agc Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -62,15 +62,16 @@ TYPE?= /usr/bin/type
WC?= /usr/bin/wc
XARGS?= /usr/bin/xargs
-DEF_UMASK?= 022
-GROUPADD?= /usr/sbin/groupadd
+DEF_UMASK?= 022
+DEFAULT_SERIAL_DEVICE?= /dev/null
+GROUPADD?= /usr/sbin/groupadd
MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
MOTIF12_TYPE_DEFAULT?= dt # default 1.2 compatible libs type
-NOLOGIN?= ${FALSE}
-USERADD?= /usr/sbin/useradd
-
-ROOT_USER?= root
-ROOT_GROUP?= root
+NOLOGIN?= ${FALSE}
+ROOT_GROUP?= root
+ROOT_USER?= root
+SERIAL_DEVICES?= /dev/null
+USERADD?= /usr/sbin/useradd
_DO_LIBINTL_CHECKS= yes # perform checks for valid libintl
_DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs
@@ -80,3 +81,30 @@ _OPSYS_HAS_OSSAUDIO= no # libossaudio is available
_PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file
_PREFORMATTED_MAN_DIR= man # directory where catman pages are
_USE_RPATH= yes # add rpath to LDFLAGS
+
+# Migration aid for old /usr/local LOCALBASE
+.if !defined(LOCALBASE) && exists(${DESTDIR}/usr/local/libexec/cgi-bin) && \
+ !exists(${DESTDIR}/usr/pkg/libexec/cgi-bin)
+.BEGIN:
+ @echo "On Solaris and /usr/local/libexec/cgi-bin found:"
+ @echo "- If you have an existing pkgsrc installation & wish to continue"
+ @echo " using /usr/local, append LOCALBASE=/usr/local to /etc/mk.conf."
+ @echo "- Otherwise set LOCALBASE=/usr/pkg in your environment for the"
+ @echo " first package install."
+ @false
+.endif
+
+LOCALBASE?= ${DESTDIR}/usr/pkg
+.if !defined(ZOULARISBASE)
+. if exists(${LOCALBASE}/bsd)
+ZOULARISBASE:= ${LOCALBASE}/bsd
+. else
+ZOULARISBASE:= ${LOCALBASE}
+. endif
+.endif
+PKG_TOOLS_BIN?= ${ZOULARISBASE}/bin
+
+.if ${X11BASE} == "/usr/openwin"
+HAVE_OPENWINDOWS= YES
+.endif
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 10:21:49 +0000