Attachment 169236 Details for Bug 208740 – enable Tcl extension, modernize Makefile

enable Tcl extension, modernize Makefile

db6.diff.txt (text/plain), 3.46 KB, created by Pietro Cerutti on 2016-04-12 10:04:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2016-04-12 10:04:50 UTC

Size: 3.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 413104)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	db6
> PORTVERSION=	6.1.26
>+PORTREVISION=	1
> CATEGORIES=	databases java
> MASTER_SITES=	http://download.oracle.com/berkeley-db/
> PKGNAMEPREFIX?=
>@@ -19,7 +20,6 @@
> BDBMAJ=		${BDBVER:R}
> CONFIGURE_ARGS=	--enable-cxx --enable-stl \
> 		--enable-compat185 --enable-dump185 \
>-		--disable-tcl \
> 		--includedir=${PREFIX}/include/${PORTNAME} \
> 		--libdir=${PREFIX}/lib/${PORTNAME} \
> 		--bindir=${PREFIX}/bin/${PORTNAME}
>@@ -32,12 +32,34 @@
> PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
> MAKE_ARGS+=	docdir=${DOCSDIR}
> 
>-OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA DOCS
>+OPTIONS_DEFINE=	CRYPTO L10N SQL JAVA TCL DOCS
> OPTIONS_DEFAULT=CRYPTO
>+OPTIONS_SUB=	yes
> CRYPTO_DESC=	Cryptography support
> L10N_DESC=	Localization support (EXPERIMENTAL)
> SQL_DESC=	Enable SQL API (EXPERIMENTAL)
> 
>+PORTDOCS=	*
>+
>+DBLIBS=	libdb libdb_cxx libdb_stl
>+
>+DEBUG_CONFIGURE_ENABLE=	debug umrw
>+CRYPTO_CONFIGURE_WITH=	cryptography=yes
>+L10N_CONFIGURE_ENABLE=	localization
>+SQL_CONFIGURE_ENABLE=	sql sql_codegen
>+SQL_VARS=		DBLIBS+=libdb_sql
>+JAVA_USE=		java
>+JAVA_VARS=		JAVA_VERSION=1.6+
>+JAVA_CONFIGURE_ENABLE=	java
>+JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
>+JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
>+JAVA_VARS=		DBLIBS+=libdb_java
>+TCL_CONFIGURE_ENABLE=	tcl
>+TCL_USES=		tcl
>+TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
>+TCL_VARS=		DBLIBS+=libdb_tcl
>+DOCS_INSTALL_TARGET=	install_docs
>+
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == "aarch64" || ${ARCH:Marmv6*}
>@@ -46,47 +68,6 @@
> CONFIGURE_ARGS+=	--enable-posixmutexes
> .endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-INSTALL_TARGET+=install_docs
>-PORTDOCS=	*
>-.endif
>-
>-.if ${PORT_OPTIONS:MSQL}
>-CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
>-PLIST_SUB+=	SQL=""
>-libdb_sql=	libdb_sql
>-.else
>-PLIST_SUB+=	SQL="@comment "
>-libdb_sql=
>-.endif
>-
>-.if ${PORT_OPTIONS:MJAVA}
>-USE_JAVA=	yes
>-JAVA_VERSION=	1.6+
>-CONFIGURE_ARGS+=	--enable-java
>-CPPFLAGS+=	"-I${JAVA_HOME}/include"
>-CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
>-PLIST_SUB+=	JAVA=""
>-libdb_java=	libdb_java
>-.else
>-PLIST_SUB+=	JAVA="@comment "
>-libdb_java=
>-.endif
>-
>-.if ${PORT_OPTIONS:MCRYPTO}
>-CONFIGURE_ARGS+=	--with-cryptography=yes
>-.else
>-CONFIGURE_ARGS+=	--with-cryptography=no
>-.endif
>-
>-.if ${PORT_OPTIONS:ML10N}
>-CONFIGURE_ARGS+=	--enable-localization
>-.endif
>-
>-.if ${PORT_OPTIONS:MDEBUG}
>-CONFIGURE_ARGS+=	--enable-debug --enable-umrw
>-.endif
>-
> post-patch:
> 	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
> 	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
>@@ -94,7 +75,7 @@
> 	    ${WRKSRC}/../src/dbinc/atomic.h
> 
> post-install:
>-.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
>+.for i in ${DBLIBS}
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so
> 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so ${STAGEDIR}${PREFIX}/lib
> 	${LN} -s -f ${i}-${BDBVER}.a ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}.a
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 413104)
>+++ pkg-plist	(working copy)
>@@ -81,3 +81,9 @@
> %%JAVA%%lib/libdb_java-%%BDBVER%%.so
> %%SQL%%lib/libdb_sql-%%BDBVER%%.so
> lib/libdb_stl-%%BDBVER%%.so
>+%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.a
>+%%TCL%%lib/db6/libdb_tcl-%%BDBVER%%.so
>+%%TCL%%lib/db6/libdb_tcl-6.so
>+%%TCL%%lib/db6/libdb_tcl.a
>+%%TCL%%lib/db6/libdb_tcl.so
>+%%TCL%%lib/libdb_tcl-%%BDBVER%%.so

Actions: View

Attachments on bug 208740: 169236 | 169239 | 169276 | 169277