View | Details | Raw Unified | Return to bug 208740 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-44 / +30 lines)
Lines 3-11 Link Here
3
3
4
PORTNAME=	db6
4
PORTNAME=	db6
5
PORTVERSION=	6.1.26
5
PORTVERSION=	6.1.26
6
PORTREVISION=	1
6
CATEGORIES=	databases java
7
CATEGORIES=	databases java
7
MASTER_SITES=	http://download.oracle.com/berkeley-db/
8
MASTER_SITES=	http://download.oracle.com/berkeley-db/
8
PKGNAMEPREFIX?=
9
PKGNAMEPREFIX?=
10
#
9
# the distfiles aren't named db6-* but db-*:
11
# the distfiles aren't named db6-* but db-*:
10
DISTNAME=	db-${PORTVERSION}
12
DISTNAME=	db-${PORTVERSION}
11
DIST_SUBDIR=	bdb
13
DIST_SUBDIR=	bdb
Lines 19-25 Link Here
19
BDBMAJ=		${BDBVER:R}
21
BDBMAJ=		${BDBVER:R}
20
CONFIGURE_ARGS=	--enable-cxx --enable-stl \
22
CONFIGURE_ARGS=	--enable-cxx --enable-stl \
21
		--enable-compat185 --enable-dump185 \
23
		--enable-compat185 --enable-dump185 \
22
		--disable-tcl \
23
		--includedir=${PREFIX}/include/${PORTNAME} \
24
		--includedir=${PREFIX}/include/${PORTNAME} \
24
		--libdir=${PREFIX}/lib/${PORTNAME} \
25
		--libdir=${PREFIX}/lib/${PORTNAME} \
25
		--bindir=${PREFIX}/bin/${PORTNAME}
26
		--bindir=${PREFIX}/bin/${PORTNAME}
Lines 32-43 Link Here
32
PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
33
PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
33
MAKE_ARGS+=	docdir=${DOCSDIR}
34
MAKE_ARGS+=	docdir=${DOCSDIR}
34
35
35
OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA DOCS
36
OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA TCL DOCS
36
OPTIONS_DEFAULT=CRYPTO
37
OPTIONS_DEFAULT=CRYPTO
38
OPTIONS_SUB=	yes
37
CRYPTO_DESC=	Cryptography support
39
CRYPTO_DESC=	Cryptography support
38
L10N_DESC=	Localization support (EXPERIMENTAL)
40
L10N_DESC=	Localization support (EXPERIMENTAL)
39
SQL_DESC=	Enable SQL API (EXPERIMENTAL)
41
SQL_DESC=	Enable SQL API (EXPERIMENTAL)
40
42
43
PORTDOCS=	*
44
45
DBLIBS=	libdb libdb_cxx libdb_stl
46
47
DEBUG_CONFIGURE_ENABLE=	debug umrw
48
CRYPTO_CONFIGURE_WITH=	cryptography=yes
49
L10N_CONFIGURE_ENABLE=	localization
50
SQL_CONFIGURE_ENABLE=	sql sql_codegen
51
SQL_VARS=		DBLIBS+=libdb_sql
52
JAVA_USE=		java
53
JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION=1.6+
54
JAVA_CONFIGURE_ENABLE=	java
55
JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
56
JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
57
TCL_CONFIGURE_ENABLE=	tcl
58
TCL_USES=		tcl:85+
59
TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
60
TCL_VARS=		DBLIBS+=libdb_tcl
61
DOCS_INSTALL_TARGET=	install_docs
62
41
.include <bsd.port.options.mk>
63
.include <bsd.port.options.mk>
42
64
43
.if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
65
.if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
Lines 46-92 Link Here
46
CONFIGURE_ARGS+=	--enable-posixmutexes
68
CONFIGURE_ARGS+=	--enable-posixmutexes
47
.endif
69
.endif
48
70
49
.if ${PORT_OPTIONS:MDOCS}
50
INSTALL_TARGET+=install_docs
51
PORTDOCS=	*
52
.endif
53
54
.if ${PORT_OPTIONS:MSQL}
55
CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
56
PLIST_SUB+=	SQL=""
57
libdb_sql=	libdb_sql
58
.else
59
PLIST_SUB+=	SQL="@comment "
60
libdb_sql=
61
.endif
62
63
.if ${PORT_OPTIONS:MJAVA}
64
USE_JAVA=	yes
65
JAVA_VERSION=	1.6+
66
CONFIGURE_ARGS+=	--enable-java
67
CPPFLAGS+=	"-I${JAVA_HOME}/include"
68
CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
69
PLIST_SUB+=	JAVA=""
70
libdb_java=	libdb_java
71
.else
72
PLIST_SUB+=	JAVA="@comment "
73
libdb_java=
74
.endif
75
76
.if ${PORT_OPTIONS:MCRYPTO}
77
CONFIGURE_ARGS+=	--with-cryptography=yes
78
.else
79
CONFIGURE_ARGS+=	--with-cryptography=no
80
.endif
81
82
.if ${PORT_OPTIONS:ML10N}
83
CONFIGURE_ARGS+=	--enable-localization
84
.endif
85
86
.if ${PORT_OPTIONS:MDEBUG}
87
CONFIGURE_ARGS+=	--enable-debug --enable-umrw
88
.endif
89
90
post-patch:
71
post-patch:
91
	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
72
	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
92
	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
73
	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
Lines 94-100 Link Here
94
	    ${WRKSRC}/../src/dbinc/atomic.h
75
	    ${WRKSRC}/../src/dbinc/atomic.h
95
76
96
post-install:
77
post-install:
97
.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
78
.for i in ${DBLIBS}
98
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
79
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
99
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib
80
	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib
100
	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
81
	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
Lines 115-119 Link Here
115
	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
96
	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
116
.endif
97
.endif
117
.endif
98
.endif
99
.if !empty(PORT_OPTIONS:MTCL)
100
	echo "package ifneeded Db_tcl ${BDBVER} \
101
	      [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \
102
	     " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl
103
.endif
118
104
119
.include <bsd.port.mk>
105
.include <bsd.port.mk>
(-)pkg-plist (+7 lines)
Lines 81-83 Link Here
81
%%JAVA%%lib/libdb_java-%%BDBVER%%.so
81
%%JAVA%%lib/libdb_java-%%BDBVER%%.so
82
%%SQL%%lib/libdb_sql-%%BDBVER%%.so
82
%%SQL%%lib/libdb_sql-%%BDBVER%%.so
83
lib/libdb_stl-%%BDBVER%%.so
83
lib/libdb_stl-%%BDBVER%%.so
84
%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.a
85
%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.so
86
%%TCL%%lib/db6/libdb_tcl-6.so
87
%%TCL%%lib/db6/libdb_tcl.a
88
%%TCL%%lib/db6/libdb_tcl.so
89
%%TCL%%lib/db6/pkgIndex.tcl
90
%%TCL%%lib/libdb_tcl-%%BDBVER%%.so

Return to bug 208740