From 3d6e1eba810ba3e701882b473f94a578158baf45 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 26 Nov 2006 23:39:41 +0000
Subject: [PATCH] fix so that variable definitions work even in the presence of
 subpackage=c++

---
 infrastructure/mk/bsd.port.mk | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 8b691870ee6..d5a3504deaf 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.840 2006/11/26 20:02:28 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.841 2006/11/26 23:39:41 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -710,21 +710,21 @@ _SED_SUBST+=-e 's,$${FLAVORS},${FLAVOR_EXT},g' -e 's,$$\\,$$,g'
 # find out the most appropriate PLIST  source
 .if !defined(PLIST${SUBPACKAGE})
 .  if exists(${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.${ARCH})
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.${ARCH}
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.${ARCH}
 .  elif exists(${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.${MACHINE_ARCH})
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.${MACHINE_ARCH}
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.${MACHINE_ARCH}
 .  elif ${NO_SHARED_LIBS:L} == "yes" && exists(${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.noshared)
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.noshared
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}.noshared
 .  elif exists(${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT})
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}${FLAVOR_EXT}
 .  elif exists(${PKGDIR}/PLIST${SUBPACKAGE}.${ARCH})
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}.${ARCH}
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}.${ARCH}
 .  elif exists(${PKGDIR}/PLIST${SUBPACKAGE}.${MACHINE_ARCH})
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}.${MACHINE_ARCH}
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}.${MACHINE_ARCH}
 .  elif ${NO_SHARED_LIBS:L} == "yes" && exists(${PKGDIR}/PLIST${SUBPACKAGE}.noshared)
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}.noshared
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}.noshared
 .  else
-PLIST${SUBPACKAGE}=		${PKGDIR}/PLIST${SUBPACKAGE}
+PLIST${SUBPACKAGE} =		${PKGDIR}/PLIST${SUBPACKAGE}
 .  endif
 .endif
 
@@ -742,7 +742,7 @@ MESSAGE${SUBPACKAGE}?= ${PKGDIR}/MESSAGE${SUBPACKAGE}
 UNMESSAGE${SUBPACKAGE}?= ${PKGDIR}/UNMESSAGE${SUBPACKAGE}
 .endif
 
-DESCR${SUBPACKAGE}?=		${PKGDIR}/DESCR${SUBPACKAGE}
+DESCR${SUBPACKAGE} ?=		${PKGDIR}/DESCR${SUBPACKAGE}
 
 MTREE_FILE?=
 MTREE_FILE+=${PORTSDIR}/infrastructure/db/fake.mtree
@@ -1197,12 +1197,12 @@ _REGRESS_DEP=	${_REGRESS_DEP2:C/[^:]*://}
 
 .if defined(MULTI_PACKAGES)
 .  for _S in ${MULTI_PACKAGES}
-_BUILD_DEP3${_S}=${_BUILD_DEP3}
-_RUN_DEP3${_S}=	 	${RUN_DEPENDS${_S}:C/^[^:]*:([^:]*:[^:]*).*$/\1/}
+_BUILD_DEP3${_S} =${_BUILD_DEP3}
+_RUN_DEP3${_S} =	 	${RUN_DEPENDS${_S}:C/^[^:]*:([^:]*:[^:]*).*$/\1/}
 .    if ${NO_SHARED_LIBS:L} != "yes"
-_LIB_DEP3${_S}=		${LIB_DEPENDS${_S}}
+_LIB_DEP3${_S} =		${LIB_DEPENDS${_S}}
 .    else
-_LIB_DEP3${_S}=
+_LIB_DEP3${_S} =
 .    endif
 .  endfor
 .endif