diff options
| author | tv <tv> | 2005-01-27 04:16:47 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-01-27 04:16:47 +0000 |
| commit | cc9f161abe843c1f51ee317be020cc4827377802 (patch) | |
| tree | e2af828ce911dfb60ef7fc53477fbe06f6d1e56a /mk | |
| parent | c702b774aee6c05b7f2d66d8999a087d1fb47dff (diff) | |
| download | pkgsrc-cc9f161abe843c1f51ee317be020cc4827377802.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index c283dc1e57a..c78988bee8a 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ SHAREMODE?= ${DOCMODE} # 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 @@ PKG_OPTIONS?= # empty 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 |