Reorganize some of the files under pkgsrc/mk:

    (1) defs.${OPSYS}.mk --> platform/${OPSYS}.mk.

The "platform" subdirectory is where all of the ${OPSYS}-specific
infrastructure logic should reside.

    (2) bsd.pkg.defaults.mk --> defaults/mk.conf
        bsd.pkg.obsolete.mk --> defaults/obsolete.mk

Renaming bsd.pkg.defaults.mk to defaults/mk.conf is to mimic the way
that NetBSD has /etc/rc.conf as well as /etc/defaults/rc.conf, where
the latter is a full list of user-settable variables, and the two
files share the same name to reinforce the fact /etc/defaults/rc.conf
can be directly copied in place as /etc/rc.conf.  This is the same
relationship shared by defaults/mk.conf and /etc/mk.conf.

1 files changed, 0 insertions, 187 deletions

diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk
deleted file mode 100644
index e6295144976..00000000000
--- a/mk/defs.Interix.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-# $NetBSD: defs.Interix.mk,v 1.29 2004/10/03 00:13:01 tv Exp $
-#
-# Variable definitions for the Interix operating system.
-
-AWK?=		/usr/contrib/bin/gawk
-BASENAME?=	/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/bin/chown
-CHGRP?=		/bin/chgrp
-CMP?=		/bin/cmp
-CP?=		/bin/cp
-CUT?=		/bin/cut
-DATE?=		/bin/date
-DC?=		/bin/dc
-DIRNAME?=	/bin/dirname
-ECHO?=		echo				# Shell builtin
-ECHO_N?=	/bin/printf %s			# does not support "echo -n"
-EGREP?=		/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FGREP?=		/bin/fgrep
-FILE_CMD?=	/bin/file
-FIND?=		/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/bin/grep
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=		${LOCALBASE}/bin/gtar
-.else
-GTAR?=		${LOCALBASE}/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
-GZCAT?=		/usr/contrib/bin/gunzip -c
-GZIP?=		-9
-GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
-HEAD?=		/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/bin/id
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
-LDCONFIG?=	/bin/true
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/bin/m4
-MAIL_CMD?=	/bin/mail
-MKDIR?=		/bin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/bin/nice
-PATCH?=		${LOCALBASE}/bin/gpatch
-.if exists(${LOCALBASE}/bin/pax)
-PAX?=		${LOCALBASE}/bin/pax
-.else
-PAX?=		/bin/pax
-.endif
-PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
-SED?=		${LOCALBASE}/bin/nbsed
-SETENV?=	/bin/env
-SH?=		/bin/sh
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/bin/sort
-SU?=		/bin/su
-TAIL?=		/bin/tail
-TAR?=		${LOCALBASE}/bin/tar
-TEE?=		/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/bin/touch
-TR?=		/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/bin/tsort
-TYPE?=		type				# Shell builtin
-WC?=		/bin/wc
-XARGS?=		/bin/xargs
-
-# Default to threaded Perl, the same as is shipped with Interix itself.
-PERL5_USE_THREADS?=	yes
-
-USERADD?=		${LOCALBASE}/sbin/useradd
-GROUPADD?=		${LOCALBASE}/sbin/groupadd
-_PKG_USER_HOME?=	# empty by default
-_USER_DEPENDS=		user>=20040426:../../sysutils/user_interix
-DEPENDS+=		${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=		${USE_GROUPADD:D${_USER_DEPENDS}}
-
-CPP_PRECOMP_FLAGS?=	# unset
-DEF_UMASK?=		002
-EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
-
-MOTIF_TYPE_DEFAULT?=	openmotif	# default 2.0 compatible libs type
-NOLOGIN?=		/bin/false
-PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
-PKGDIRMODE?=		775
-ROOT_CMD?=		${SU} - ${ROOT_USER} -c
-ROOT_USER?=		${BINOWN}
-ROOT_GROUP?=		131616 # +Administrators or native language equivalent
-TOUCH_FLAGS?=
-ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
-
-# imake installs manpages in weird places
-IMAKE_MAN_SOURCE_PATH=	man/man
-IMAKE_MAN_SUFFIX=	n
-IMAKE_LIBMAN_SUFFIX=	3
-IMAKE_KERNMAN_SUFFIX=	4
-IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_MISCMAN_SUFFIX=	7
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}n
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
-IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
-
-_DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
-_IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
-.if exists(/usr/include/netinet6)
-_OPSYS_HAS_INET6=	yes	# IPv6 is standard
-.else
-_OPSYS_HAS_INET6=	no	# IPv6 is not standard
-.endif
-_OPSYS_HAS_JAVA=	no	# Java is not standard
-_OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
-_OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
-_OPSYS_PERL_REQD=	5.8.3nb1 # base version of perl required
-_OPSYS_PKGTOOLS_REQD=	20040330
-_OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_SHLIB_TYPE=	ELF	# shared lib type - not exactly true, but near enough
-_PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
-_PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
-_PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
-_USE_GNU_GETTEXT=	yes	# gettext not in base system
-_USE_RPATH=		yes	# add rpath to LDFLAGS
-
-# Ensure that USE_X11BASE programs get an xpkgwedge new enough to work.
-_OPSYS_NEEDS_XPKGWEDGE=	yes	# xpkgwedge is required for X11
-_XPKGWEDGE_DEPENDS=	xpkgwedge>=1.10:../../pkgtools/xpkgwedge
-BUILD_DEPENDS+=		${USE_X11BASE:D${_XPKGWEDGE_DEPENDS}}
-
-# flags passed to the linker to extract all symbols from static archives.
-# this is GNU ld.
-_OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,--whole-archive
-_OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,--no-whole-archive
-
-.if !defined(DEBUG_FLAGS)
-_STRIPFLAG_CC?=		-s	# cc(1) option to strip
-_STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
-.endif
-
-DEFAULT_SERIAL_DEVICE?=	/dev/tty00
-SERIAL_DEVICES?=	/dev/tty00 /dev/tty01 /dev/tty02 /dev/tty03
-
-# Interix needs -D_ALL_SOURCE everywhere; little compiles without it.
-.if ${CPPFLAGS:M-D_ALL_SOURCE} == ""
-CPPFLAGS+=		-D_ALL_SOURCE
-.endif
-
-# poll(2) is broken; try to work around it by making autoconf believe
-# it's missing.  (Packages without autoconf will need explicit fixing.)
-.ifdef GNU_CONFIGURE
-CONFIGURE_ENV+=		ac_cv_header_poll_h=no ac_cv_func_poll=no
-.endif
-
-# check for maximum command line length and set it in configure's environment,
-# to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=262144
-.endif
-
-# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
-# (it defaults to 'no' as per bsd.pkg.defaults.mk).
-# Set the group and mode to meaningful values in that case (defaults to
-# BINOWN, BINGRP and BINMODE as per bsd.pkg.defaults.mk).
-# FIXME: Adjust to work on this system and enable the lines below.
-#.if !(empty(SETGIDGAME:M[yY][eE][sS]))
-#GAMEOWN=		games
-#GAMEGRP=		games
-#GAMEMODE=		2555
-#.endif