Implement some parts of proposals posted to tech-pkg:

- Define OS_VERSION in bsd.prefs.mk (...if not already defined).  Previously
  was only set in a conditional block in bsd.pkg.mk.

- Define new values, MACHINE_PLATFORM and MACHINE_GNU_PLATFORM, which
  default to ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} and
  ${LOWER_OPSYS}-${LOWER_VENDOR}-${LOWER_ARCH} respectively.
  (Probably should nuke LOWER_ARCH and rename LOWER_VENDOR to something
  like MACHINE_GNU_VENDOR.)

- Use ${MACHINE_GNU_PLATFORM} as the argument to `--host' in GNU_CONFIGURE
  packages.

- Allow for ONLY_FOR_PLATFORM and NOT_FOR_PLATFORM, lists of patterns
  in csh(1) glob style which are matched against MACHINE_PLATFORM above
  and take the place of {ONLY,NOT}_FOR_{ARCHS,OPSYS}.  (For now, until
  all pkgs are converted, provide backwards compatibility.)  *Both* may
  be defined, in which case NOT_FOR_PLATFORM takes precedence.

- Also do some significant aesthetic cleanup, based on the idea
  `define platform-specific overrides first, then define a generic case
  with the ?= operator'.  Lots more of this to do yet.

2 files changed, 91 insertions, 124 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index e7f0cb9ab23..77a659caaa8 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.271 1999/05/23 22:10:01 tv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.272 1999/05/24 18:42:00 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -17,69 +17,56 @@
 # NEVER override the "regular" targets unless you want to open
 # a major can of worms.
 
-# Include any preferences, if not already included, and common definitions
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(ONLY_FOR_ARCHS)
-.for __ARCH in ${ONLY_FOR_ARCHS}
-.if ${MACHINE_ARCH:M${__ARCH}} != ""
-__ARCH_OK?=	1
-.endif
+##### Transitional compatibility: #####
+ONLY_FOR_OPSYS?=	*
+ONLY_FOR_ARCHS?=	*
+.for __opsys__ in ${ONLY_FOR_OPSYS}
+.for __arch__ in ${ONLY_FOR_ARCHS}
+ONLY_FOR_PLATFORM+=	${__opsys__}-*-${__arch__}
 .endfor
-.else
-__ARCH_OK?=	1
-.endif
-
-.if defined(NOT_FOR_ARCHS)
-.for __NARCH in ${NOT_FOR_ARCHS}
-.if ${MACHINE_ARCH:M${__NARCH}} != ""
-.undef __ARCH_OK
-.endif
 .endfor
-.endif
+NOT_FOR_PLATFORM+=	${NOT_FOR_OPSYS:S/$/-*-*/} ${NOT_FOR_ARCHS:S/^/*-*-/}
+
+##### Include any preferences, if not already included, and common definitions
+.include "../../mk/bsd.prefs.mk"
 
-.if defined(ONLY_FOR_OPSYS)
-.for __OPSYS in ${ONLY_FOR_OPSYS}
-.if ${OPSYS:M${__OPSYS}} != ""
-__OPSYS_OK?=	1
+##### Define __PLATFORM_OK only if the OS matches the pkg's allowed list.
+.if !empty(ONLY_FOR_PLATFORM)
+.for __tmp__ in ${ONLY_FOR_PLATFORM}
+.if ${MACHINE_PLATFORM:M${__tmp__}} != ""
+__PLATFORM_OK?=
 .endif
 .endfor
 .else
-__OPSYS_OK?=	1
+__PLATFORM_OK?=
 .endif
 
-.if defined(NOT_FOR_OPSYS)
-.for __NOPSYS in ${NOT_FOR_OPSYS}
-.if ${OPSYS:M${__NOPSYS}} != ""
-.undef __OPSYS_OK
+.for __tmp__ in ${NOT_FOR_PLATFORM}
+.if ${MACHINE_PLATFORM:M${__tmp__}} != ""
+.undef __PLATFORM_OK
 .endif
 .endfor
-.endif
 
-.if exists(${.CURDIR}/../Makefile.inc)
-.include "${.CURDIR}/../Makefile.inc"
+.if !defined(__PLATFORM_OK)
+IGNORE=			"does not work on ${MACHINE_PLATFORM}"
 .endif
 
+##### Some overrides of defaults below on a per-OS basis.
 .if (${OPSYS} == "NetBSD")
-DEF_UMASK?=		0022
-CLEANDEPENDS?=		NO
-DEINSTALLDEPENDS?=	NO
+LOCALBASE?=		${DESTDIR}/usr/pkg
 .elif (${OPSYS} == "SunOS")
 DEF_UMASK?=		022
-CLEANDEPENDS?=		NO
-DEINSTALLDEPENDS?=	NO
+X11BASE?=		${DESTDIR}/usr/openwin
 .elif (${OPSYS} == "OpenBSD")
-NOMANCOMPRESS?=	yes
 DEF_UMASK?=		022
-.else
-DEF_UMASK?=		0022
+NOMANCOMPRESS?=		yes
 .endif
 
-.if (${OPSYS} == "NetBSD")
-LOCALBASE?=		${DESTDIR}/usr/pkg
-.else
+DEF_UMASK?=		0022
+CLEANDEPENDS?=		NO
+DEINSTALLDEPENDS?=	NO
+
 LOCALBASE?=		${DESTDIR}/usr/local
-.endif
 X11BASE?=		${DESTDIR}/usr/X11R6
 CROSSBASE?=		${LOCALBASE}/cross
 
@@ -112,18 +99,23 @@ PREFIX=			${LOCALBASE}
 .if defined(USE_GMAKE)
 BUILD_DEPENDS+=		${GMAKE}:${PKGSRCDIR}/devel/gmake
 MAKE_PROGRAM=		${GMAKE}
+GMAKE?=			gmake
 .else
 MAKE_PROGRAM=		${MAKE}
 .endif
+
 .if defined(USE_PERL5)
 DEPENDS+=		perl-5.00404:${PKGSRCDIR}/lang/perl5
 .endif
+
 .if defined(INFO_FILES)
 USE_GTEXINFO=		yes
 .endif
+
 .if defined(USE_GTEXINFO) && !exists(/usr/bin/install-info)
 DEPENDS+=		gtexinfo-3.12:${PKGSRCDIR}/devel/gtexinfo
 .endif
+
 .if defined(USE_MOTIF)
 .if exists(${X11BASE}/include/Xm/Xm.h)
 RUN_DEPENDS+=		${X11BASE}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif
@@ -132,6 +124,7 @@ RUN_DEPENDS+=		${PREFIX}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif
 BUILD_DEPENDS+=		${PREFIX}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif
 .endif
 .endif
+
 .if defined(USE_LIBTOOL)
 LIBTOOL=		${LOCALBASE}/bin/pkglibtool-1.2p1
 BUILD_DEPENDS+=		${LIBTOOL}:${PKGSRCDIR}/pkgtools/pkglibtool
@@ -139,10 +132,6 @@ CONFIGURE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 .endif
 
-.if exists(${PKGSRCDIR}/../Makefile.inc)
-.include "${PKGSRCDIR}/../Makefile.inc"
-.endif
-
 # Don't change these!!!  These names are built into the _TARGET_USE macro,
 # there is no way to refer to them cleanly from within the macro AFAIK.
 EXTRACT_COOKIE?=	${WRKDIR}/.extract_done
@@ -153,7 +142,6 @@ PATCH_COOKIE?=		${WRKDIR}/.patch_done
 PACKAGE_COOKIE?=	${WRKDIR}/.package_done
 
 # Miscellaneous overridable commands:
-GMAKE?=			gmake
 XMKMF?=			xmkmf -a
 .if exists(/sbin/md5)
 MD5?=			/sbin/md5
@@ -187,22 +175,22 @@ FETCH_CMD?=		/usr/bin/ftp
 MIRROR_DISTFILE?=	yes
 
 TOUCH?=			/usr/bin/touch
-TOUCH_FLAGS?=	-f
+TOUCH_FLAGS?=		-f
 
 .if (${OPSYS} == "SunOS")
 PATCH?=			${LOCALBASE}/bin/patch -b
 .else
 PATCH?=			/usr/bin/patch
 .endif
-PATCH_STRIP?=	-p0
+PATCH_STRIP?=		-p0
 PATCH_DIST_STRIP?=	-p0
 .if defined(PATCH_DEBUG) || defined(PKG_VERBOSE)
 PATCH_DEBUG_TMP=	yes
-PATCH_ARGS?=	-d ${WRKSRC} -E ${PATCH_STRIP}
+PATCH_ARGS?=		-d ${WRKSRC} -E ${PATCH_STRIP}
 PATCH_DIST_ARGS?=	-d ${WRKSRC} -E ${PATCH_DIST_STRIP}
 .else
 PATCH_DEBUG_TMP=	no
-PATCH_ARGS?=	-d ${WRKSRC} --forward --quiet -E ${PATCH_STRIP}
+PATCH_ARGS?=		-d ${WRKSRC} --forward --quiet -E ${PATCH_STRIP}
 PATCH_DIST_ARGS?=	-d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
 .if defined(BATCH)
@@ -211,7 +199,7 @@ PATCH_DIST_ARGS+=	--batch
 .endif
 
 .if defined(PATCH_CHECK_ONLY)
-PATCH_ARGS+=	-C
+PATCH_ARGS+=		-C
 PATCH_DIST_ARGS+=	-C
 .endif
 
@@ -345,7 +333,7 @@ SCRIPTS_ENV+=	${INSTALL_MACROS}
 
 COMMENT?=		${PKGDIR}/COMMENT
 DESCR_SRC?=		${PKGDIR}/DESCR
-DESCR?=			${WRKDIR}/.DESCR
+DESCR=			${WRKDIR}/.DESCR
 PLIST=			${WRKDIR}/.PLIST
 
 # Set INSTALL_FILE to be the name of any INSTALL file
@@ -639,30 +627,8 @@ PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
 CONFIGURE_SCRIPT?=	configure
 CONFIGURE_ENV+=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin
 
-# 1.3.[012] did not define all of these in bsd.own.mk.  Preload those
-# for architectures available in those releases.
-GNU_ARCH.alpha?=	alpha
-GNU_ARCH.arm32?=	arm
-GNU_ARCH.i386?=		i386
-GNU_ARCH.m68k?=		m68k
-GNU_ARCH.mips?=		mipsel
-GNU_ARCH.ns32k?=	ns32k
-GNU_ARCH.sparc?=	sparc
-GNU_ARCH.vax?=		vax
-MACHINE_GNU_ARCH?=	${GNU_ARCH.${MACHINE_ARCH}}
-
-.if (${OPSYS} == "NetBSD")
-LOWER_OPSYS?=		netbsd
-LOWER_VENDOR?=		
-LOWER_ARCH?=		${MACHINE_GNU_ARCH}
-.elif (${OPSYS} == "SunOS")
-LOWER_OPSYS?=		solaris
-LOWER_VENDOR?=		sun
-LOWER_ARCH?=		${MACHINE_GNU_ARCH}
-.endif
-
 .if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=	--host=${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS} --prefix=${PREFIX}
+CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}
 HAS_CONFIGURE=		yes
 .endif
 
@@ -772,22 +738,6 @@ BUILD_DEFS+=	OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH
 BUILD_DEFS+=	CPPFLAGS CFLAGS LDFLAGS LICENSE
 BUILD_DEFS+=	CONFIGURE_ENV CONFIGURE_ARGS
 
-.if !defined(__ARCH_OK) || !defined(__OPSYS_OK)
-.MAIN:	all
-
-fetch fetch-list extract patch configure build install reinstall package checkpatch checksum makesum all:
-.if defined(ONLY_FOR_ARCHS)
-	@${ECHO} "This package is only for ${ONLY_FOR_ARCHS},"
-.endif
-.if defined(NOT_FOR_OPSYS)
-	@${ECHO} "This package does not run on ${NOT_FOR_OPSYS},"
-.endif
-.if defined(NOT_FOR_ARCHS)
-	@${ECHO} "This package does not run on ${NOT_FOR_ARCHS},"
-.endif
-	@${ECHO} "and you are running ${OPSYS} on ${MACHINE_ARCH}."
-.else
-
 .if defined(ALL_HOOK)
 all:
 	${_PKG_SILENT}${_PKG_DEBUG} \
@@ -1505,11 +1455,6 @@ root-deinstall:
 	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif						# target(deinstall)
 
-
-.endif # __ARCH_OK
-       # The functions below may be useful even if _ARCH_OK is not set
-
-
 ################################################################
 # Some more targets supplied for users' convenience
 ################################################################
@@ -1519,7 +1464,7 @@ root-deinstall:
 # re-distributed freely
 mirror-distfiles:
 .if (${MIRROR_DISTFILE} == "yes")
-	${_PKG_SILENT}${_PKG_DEBUG}${MAKE} fetch __ARCH_OK=1 __OPSYS_OK=1 NO_IGNORE=yes
+	${_PKG_SILENT}${_PKG_DEBUG}${MAKE} fetch NO_IGNORE=yes
 .endif
 
 
@@ -1903,11 +1848,6 @@ depends-list:
 # The PKG_URL is set from FTP_PKG_URL_* or CDROM_PKG_URL_*, depending on
 # the target used to generate the README.html file.
 .if !target(binpkg-list)
-
-.ifndef OS_VERSION
-OS_VERSION!=	/usr/bin/uname -r
-.endif
-
 binpkg-list:
 	@cd ${PACKAGES};						\
 	case `/bin/pwd` in						\
@@ -2265,6 +2205,7 @@ ${PLIST}: ${PLIST_SRC}
 				-e 's|\$${OS_VERSION}|${OS_VERSION}|g'	\
 				-e 's|\$${MACHINE_ARCH}|${MACHINE_ARCH}|g' \
 				-e 's|\$${MACHINE_GNU_ARCH}|${MACHINE_GNU_ARCH}|g' \
+				-e 's|\$${MACHINE_GNU_PLATFORM}|${MACHINE_GNU_PLATFORM}|g' \
 				-e 's|\$${LOWER_VENDOR}|${LOWER_VENDOR}|g'\
 				-e 's|\$${LOWER_OPSYS}|${LOWER_OPSYS}|g'\
 			> ${PLIST}; 					\
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 7755b3c227b..553e362c3c6 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,39 +1,63 @@
-# $NetBSD: bsd.prefs.mk,v 1.6 1999/05/24 11:17:05 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.7 1999/05/24 18:42:01 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
-# statements, to make sure any variables defined in /etc/mk.conf or
-# $MAKECONF are used.
+# statements or modifications to "passed" variables (CFLAGS, LDFLAGS, ...),
+# to make sure any variables defined in /etc/mk.conf, $MAKECONF, or
+# the system defaults (sys.mk and bsd.own.mk) are used.
 
 # Do not recursively include mk.conf, redefine OPSYS, include bsd.own.mk, etc.
 .ifndef BSD_PKG_MK
 
-# Let people know this is bsd.pkg.mk, so they can set up their
-# /etc/mk.conf accordingly  
+# Let mk.conf know that this is pkgsrc.
 BSD_PKG_MK=1 
+__PREFIX_SET__:=${PREFIX}
 
-.if !defined(OPSYS)
-OPSYS!= /usr/bin/uname -s
+.ifndef OPSYS
+OPSYS!=			/usr/bin/uname -s
+.endif
+.ifndef OS_VERSION
+OS_VERSION!=		/usr/bin/uname -r
 .endif
 
-# Don't complain about environment settings on recursive makes.
-__PREFIX_SET__=${PREFIX}
+# Preload these for architectures not in all variations of bsd.own.mk.
+GNU_ARCH.alpha?=	alpha
+GNU_ARCH.arm32?=	arm
+GNU_ARCH.i386?=		i386
+GNU_ARCH.m68k?=		m68k
+GNU_ARCH.mips?=		mipsel
+GNU_ARCH.ns32k?=	ns32k
+GNU_ARCH.sparc?=	sparc
+GNU_ARCH.vax?=		vax
+MACHINE_GNU_ARCH?=	${GNU_ARCH.${MACHINE_ARCH}}
 
 .if (${OPSYS} == "NetBSD")
-NEED_OWN_INSTALL_TARGET=	no
-.include <bsd.own.mk>
-SHAREOWN = ${DOCOWN}
-SHAREGRP = ${DOCGRP}
-SHAREMODE = ${DOCMODE}
+LOWER_OPSYS?=		netbsd
 .elif (${OPSYS} == "SunOS")
-NEED_OWN_INSTALL_TARGET=	no
+LOWER_OPSYS?=		solaris
+LOWER_VENDOR?=		sun
+.elif !defined(LOWER_OPSYS)
+LOWER_OPSYS!=		echo ${OPSYS} | tr A-Z a-z
+.endif
+
+LOWER_VENDOR?=
+LOWER_ARCH?=		${MACHINE_GNU_ARCH}
+
+MACHINE_PLATFORM?=	${OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
+MACHINE_GNU_PLATFORM?=	${LOWER_OPSYS}-${LOWER_VENDOR}-${LOWER_ARCH}
+
+# Needed on NetBSD and SunOS (zoularis) to prevent an "install:" target
+# from being created in bsd.own.mk.
+NEED_OWN_INSTALL_TARGET=no
+
 .include <bsd.own.mk>
-SHAREOWN = ${DOCOWN}
-SHAREGRP = ${DOCGRP}
-SHAREMODE = ${DOCMODE}
+
+.if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS")
+SHAREOWN?=		${DOCOWN}
+SHAREGRP?=		${DOCGRP}
+SHAREMODE?=		${DOCMODE}
 .elif (${OPSYS} == "OpenBSD")
-.include <bsd.own.mk>
-MAKE_ENV+=	EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>"
+MAKE_ENV+=		EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>"
 .endif
 
 .if defined(PREFIX) && (${PREFIX} != ${__PREFIX_SET__})
@@ -43,6 +67,8 @@ MAKE_ENV+=	EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>"
 	@${FALSE}
 .endif
 
+# Preload all default values for CFLAGS, LDFLAGS, etc. before bsd.pkg.mk
+# or a pkg Makefile modifies them.
 .include <sys.mk>
 
 .endif