From 0ecfdcc0323b56ee2b4b230f83d964fbafa7a7fd Mon Sep 17 00:00:00 2001
From: kurt <kurt@openbsd.org>
Date: Sat, 4 Nov 2006 12:27:19 +0000
Subject: [PATCH] instead of building with java by default and a no_java pseudo
 flavor, go with a a java pseudo flavor to enable the java build and
 subpackage. no pkg bumps. as discussed with naddy@, pval@ & nikolay@

---
 databases/db/v4/Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index b99df85c1a7..5e6b2df65ba 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2006/11/03 04:50:39 kurt Exp $
+# $OpenBSD: Makefile,v 1.26 2006/11/04 12:27:19 kurt Exp $
 
 COMMENT-java=	"Java bindings for Berkeley DB, revision ${REVISION}"
 
@@ -21,34 +21,33 @@ CONFIGURE_STYLE=gnu
 DEST_SUBDIR=	${REVISION}
 WANTLIB=	c
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-PSEUDO_FLAVORS=	no_java
+PSEUDO_FLAVORS=	java
 FLAVOR?=
 
-. if !${FLAVOR:L:Mno_java}
+.if ${FLAVOR:L:Mjava}
 MULTI_PACKAGES+=-java
 SUBPACKAGE?=
 CONFIGURE_ARGS+=--enable-java
 
-.  if defined(PACKAGING)
-.   if ${SUBPACKAGE} == "-java"
+. if defined(PACKAGING)
+.  if ${SUBPACKAGE} == "-java"
 MODULES+=	java
 MODJAVA_VER=	1.3+
 MODJAVA_JRERUN=	Yes
 RUN_DEPENDS+=	:db-${REVISION}.*:databases/db/v${REVISION}
 WANTLIB=
-.   endif
-.  else
+.  endif
+. else
+
 MODULES+=	java
 MODJAVA_VER=	1.3+
 CONFIGURE_ENV+=	JAVAC=${JAVA_HOME}/bin/javac \
 		JAR=${JAVA_HOME}/bin/jar \
 		JAVA=${JAVA_HOME}/bin/java
-.  endif
+. endif
 
 MAKE_FLAGS+=	DBJVERSION=${LIBdb_java_VERSION}
 
-. endif
 .endif
 
 .include <bsd.port.mk>