cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert databases/db to bsd.port.arch.mk, a bit more complicated since

Browse Source 
there is a Makefile.inc.

Since the BUILD_PACKAGES tests have to happen there, put the java one there
as well, it won't trigger for db/v3, obviously.

Allows the removal of the ,java pseudo-flavor, since the ONLY_FOR_ARCH-* part
will take care of it.
This commit is contained in:
espie 2011-10-17 10:10:59 +00:00
parent f49ad17ddb
commit 2795b45115
5 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
databases/db/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.36 2010/02/01 17:00:12 espie Exp $
# $OpenBSD: Makefile,v 1.37 2011/10/17 10:10:59 espie Exp $
SUBDIR =
SUBDIR += v3
SUBDIR += v4,java
SUBDIR += v4
.include <bsd.port.subdir.mk>

24
databases/db/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.30 2010/10/30 23:14:15 steven Exp $
# $OpenBSD: Makefile.inc,v 1.31 2011/10/17 10:10:59 espie Exp $
COMMENT-main= Berkeley DB package, revision ${REV}
COMMENT-tcl= TCL bindings for Berkeley DB, revision ${REV}
@ -36,15 +36,18 @@ WRKBUILD= ${WRKDIST}/build_unix
PSEUDO_FLAVORS+= no_tcl
FLAVOR?=
MULTI_PACKAGES+= -main
MULTI_PACKAGES += -main -tcl
LIB_DEPENDS-main?=
RUN_DEPENDS-main?=
NOT_FOR_ARCHS-tcl = ${NO_SHARED_ARCHS}
#ONLY_FOR_ARCHS = ${ALL_ARCHS}
ONLY_FOR_ARCHS-java = i386 amd64
.if !${FLAVOR:L:Mno_tcl}
MULTI_PACKAGES+=-tcl
.include <bsd.port.arch.mk>
.if ${BUILD_PACKAGES:M-tcl}
MODULES+= lang/tcl
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
WANTLIB-tcl?=
RUN_DEPENDS-tcl+= ${MODTCL_RUN_DEPENDS}
@ -66,6 +69,17 @@ CONFIGURE_ARGS+=--disable-tcl
NO_REGRESS= Yes
.endif
.if ${BUILD_PACKAGES:M-java}
CONFIGURE_ARGS+=--enable-java
MODULES+= java
MODJAVA_VER= 1.4+
MODJAVA_JRERUN= Yes
CONFIGURE_ENV+= JAVAC=${JAVA_HOME}/bin/javac \
JAR=${JAVA_HOME}/bin/jar \
JAVA=${JAVA_HOME}/bin/java
MAKE_FLAGS+= DBJVERSION=${LIBdb_java_VERSION}
.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/db${DEST_SUBDIR}
cd ${WRKSRC}/examples_c; ${INSTALL_DATA} *.c \

4
databases/db/v3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2011/09/25 14:40:32 naddy Exp $
# $OpenBSD: Makefile,v 1.27 2011/10/17 10:10:59 espie Exp $
REV= 3
DBLIBDIR= lib/db
@ -20,7 +20,7 @@ WANTLIB=c
WANTLIB-tcl = m ${MODTCL_WANTLIB}
LIB_DEPENDS-tcl = ${MODTCL_LIB_DEPENDS}
RUN_DEPENDS-tcl = databases/db/v${REV}
RUN_DEPENDS-tcl = ${BUILD_PKGPATH}
pre-configure:
@${SUBST_CMD} ${WRKSRC}/test/include.tcl

23
databases/db/v4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2011/10/07 13:54:30 kurt Exp $
# $OpenBSD: Makefile,v 1.55 2011/10/17 10:10:59 espie Exp $
COMMENT-java= Java bindings for Berkeley DB, revision ${REV}
@ -36,26 +36,15 @@ CONFIGURE_STYLE=gnu
DEST_SUBDIR= ${REV}
WANTLIB= c m stdc++
PSEUDO_FLAVORS= java
FLAVOR?=
PSEUDO_FLAVORS= no_java
FLAVOR?=
MULTI_PACKAGES = -java
RUN_DEPENDS-java= databases/db/v${REV} \
RUN_DEPENDS-java= ${BUILD_PKGPATH} \
${MODJAVA_RUN_DEPENDS}
RUN_DEPENDS-tcl= databases/db/v${REV}
RUN_DEPENDS-tcl= ${BUILD_PKGPATH}
WANTLIB-java=
.if ${FLAVOR:L:Mjava}
MULTI_PACKAGES+=-java
CONFIGURE_ARGS+=--enable-java
MODULES+= java
MODJAVA_VER= 1.4+
MODJAVA_JRERUN= Yes
CONFIGURE_ENV+= JAVAC=${JAVA_HOME}/bin/javac \
JAR=${JAVA_HOME}/bin/jar \
JAVA=${JAVA_HOME}/bin/java
MAKE_FLAGS+= DBJVERSION=${LIBdb_java_VERSION}
.endif
SUBST_VARS= LIBdb_tcl_VERSION
pre-configure:

4
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.48 2011/10/10 09:01:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.49 2011/10/17 10:10:59 espie Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -184,7 +184,7 @@ MODULES+= java
MODJAVA_VER= 1.4+
MODJAVA_JRERUN= Yes
.endif
LIB_DEPENDS-java= databases/db/v4,-java,java \
LIB_DEPENDS-java= databases/db/v4,-java \
devel/apache-ant>=1.8.2
RUN_DEPENDS-java= ${MODJAVA_RUN_DEPENDS} \
editors/libreoffice \