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@
This commit is contained in:
kurt 2006-11-04 12:27:19 +00:00
parent e5cb9c9cf4
commit 0ecfdcc032

View File

@ -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}" COMMENT-java= "Java bindings for Berkeley DB, revision ${REVISION}"
@ -21,34 +21,33 @@ CONFIGURE_STYLE=gnu
DEST_SUBDIR= ${REVISION} DEST_SUBDIR= ${REVISION}
WANTLIB= c WANTLIB= c
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" PSEUDO_FLAVORS= java
PSEUDO_FLAVORS= no_java
FLAVOR?= FLAVOR?=
. if !${FLAVOR:L:Mno_java} .if ${FLAVOR:L:Mjava}
MULTI_PACKAGES+=-java MULTI_PACKAGES+=-java
SUBPACKAGE?= SUBPACKAGE?=
CONFIGURE_ARGS+=--enable-java CONFIGURE_ARGS+=--enable-java
. if defined(PACKAGING) . if defined(PACKAGING)
. if ${SUBPACKAGE} == "-java" . if ${SUBPACKAGE} == "-java"
MODULES+= java MODULES+= java
MODJAVA_VER= 1.3+ MODJAVA_VER= 1.3+
MODJAVA_JRERUN= Yes MODJAVA_JRERUN= Yes
RUN_DEPENDS+= :db-${REVISION}.*:databases/db/v${REVISION} RUN_DEPENDS+= :db-${REVISION}.*:databases/db/v${REVISION}
WANTLIB= WANTLIB=
. endif . endif
. else . else
MODULES+= java MODULES+= java
MODJAVA_VER= 1.3+ MODJAVA_VER= 1.3+
CONFIGURE_ENV+= JAVAC=${JAVA_HOME}/bin/javac \ CONFIGURE_ENV+= JAVAC=${JAVA_HOME}/bin/javac \
JAR=${JAVA_HOME}/bin/jar \ JAR=${JAVA_HOME}/bin/jar \
JAVA=${JAVA_HOME}/bin/java JAVA=${JAVA_HOME}/bin/java
. endif . endif
MAKE_FLAGS+= DBJVERSION=${LIBdb_java_VERSION} MAKE_FLAGS+= DBJVERSION=${LIBdb_java_VERSION}
. endif
.endif .endif
.include <bsd.port.mk> .include <bsd.port.mk>