[pkgsrc/trunk]: pkgsrc/mk Cleanup: wrapper-defs.mk is no longer optional; rem...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4082711e7dc8
branches:  trunk
changeset: 488280:4082711e7dc8
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Jan 27 04:16:47 2005 +0000

description:
Cleanup: wrapper-defs.mk is no longer optional; remove its conditional.
(...and if it were optional, it should have been an .sinclude anyway.)

Sanity: If mk/platform/${OPSYS}.mk is missing, don't assume NetBSD is it.
pkgsrc now depends on a valid platform file for an OS, so require it.
(Still includes NetBSD.mk, but sets PKG_FAIL_REASON.)

diffstat:

 mk/bsd.prefs.mk |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r 726ea1c23053 -r 4082711e7dc8 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Jan 27 04:15:10 2005 +0000
+++ b/mk/bsd.prefs.mk   Thu Jan 27 04:16:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.178 2005/01/27 04:05:08 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.179 2005/01/27 04:16:47 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -280,8 +280,9 @@
 # the NetBSD ones if an OS-specific file doesn't exist.
 .if exists(${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk)
 .  include "${_PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk"
-.elif exists(${_PKGSRC_TOPDIR}/mk/platform/NetBSD.mk)
+.else
 .  include "${_PKGSRC_TOPDIR}/mk/platform/NetBSD.mk"
+PKG_FAIL_REASON+=      "missing mk/platform/${OPSYS}.mk"
 .endif
 
 PKGDIRMODE?=           755
@@ -540,8 +541,6 @@
 PREPEND_PATH+=         ${LOCALBASE}/bin ${USE_IMAKE:D${X11BASE}/bin}
 
 # Wrapper framework definitions
-.if exists(${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk)
-.  include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
-.endif
+.include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
 
 .endif # BSD_PKG_MK