From 9a433e21ca365de21afb747219b3ad07dadd6345 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 3 Sep 2010 19:20:06 +0000
Subject: [PATCH] When knocking out a MULTI_PACKAGE on some arch, keep listing
 it in MULTI_PACKAGES, and add an (ONLY|NOT)_FOR_ARCHS-subpkg=somearch, rather
 than changing contents of the MULTI_PACKAGES variable.

Fixes dpb builds on !amd64/i386, because the bsddb package was
knocked out on other arch.

'please unfuck the fucking mess people only testing on i386 and
amd64 did' landry@
---
 lang/python/Makefile.inc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc
index 36305aae242..caacc9763c5 100644
--- a/lang/python/Makefile.inc
+++ b/lang/python/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.64 2010/02/25 11:02:39 phessler Exp $
+# $OpenBSD: Makefile.inc,v 1.65 2010/09/03 19:20:06 sthen Exp $
 
 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@@ -34,13 +34,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MULTI_PACKAGES=	-main -tests -tools -gdbm -idle -tkinter
+MULTI_PACKAGES=	-main -tests -tools -gdbm -idle -tkinter -bsddb
 
 # Python 2.6 lists BSD db 4.6.x as unstable on most architectures (see
 # setup.py:allow_db_version). XXX revisit if databases/db/v4 is updated to 4.7
-.if ${VERSION} != "2.6" || \
-    ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-MULTI_PACKAGES+=-bsddb
+.if ${VERSION} == "2.6"
+ONLY_FOR_ARCHS-bsddb=	amd64 i386
 .endif
 
 # All subpackages depend on the main python package.