Index: head/databases/metakit/Makefile =================================================================== --- head/databases/metakit/Makefile (revision 431070) +++ head/databases/metakit/Makefile (revision 431071) @@ -1,85 +1,78 @@ # Created by: Russell L. Carter # $FreeBSD$ PORTNAME= metakit PORTVERSION= 2.4.9.7 PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.equi4.com/pub/mk/ MAINTAINER= ports@FreeBSD.org COMMENT= C++ embedded database engine with Python and Tcl support LICENSE= MIT GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../unix/configure USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds BROKEN_aarch64= Fails to build: error: typedef redefinition with different types BROKEN_mips64= Fails to build: error: conflicting declaration typedef long int t4_i32 OPTIONS_DEFINE= PYTHON TCL DOCS OPTIONS_DEFAULT= PYTHON +OPTIONS_SUB= yes .include .if ${PORT_OPTIONS:MPYTHON} USES+= python CONFIGURE_ARGS+= --with-python=${LOCALBASE} CATEGORIES+= python -PLIST_SUB+= WITH_PYTHON="" -.else -PLIST_SUB+= WITH_PYTHON="@comment " .endif .if ${PORT_OPTIONS:MTCL} USES+= tcl:85 CATEGORIES+= tcl CONFIGURE_ARGS+=--with-tcl=${TCL_INCLUDEDIR} CONFIGURE_ENV+= TCL_LIBDIR=${TCL_LIBDIR} PLIST_SUB+= TCL_V="${TCL_VER}" -PLIST_SUB+= WITH_TCL="" -.else -PLIST_SUB+= WITH_TCL="@comment " .endif pre-patch: - ${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html - ${REINPLACE_CMD} -e "s|= tclsh|=${TCLSH}|" \ + @${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html + @${REINPLACE_CMD} -e "s|= tclsh|=${TCLSH}|" \ ${WRKSRC}/../unix/Makefile.in - ${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \ + @${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \ ${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure -post-build: -.if ${PORT_OPTIONS:MPYTHON} +post-build-PYTHON-on: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ ${WRKSRC}/../python ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ ${WRKSRC}/../python -.endif pre-install: @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} post-install: ${INSTALL_PROGRAM} ${WRKSRC}/libmk4.so \ ${STAGEDIR}${PREFIX}/lib/libmk4.so.0 ${LN} -sf libmk4.so.0 ${STAGEDIR}${PREFIX}/lib/libmk4.so @${MKDIR} ${STAGEDIR}${DOCSDIR} ${TAR} -C ${WRKSRC}/../doc --exclude "*CVS" -cf - . | \ ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf - ${INSTALL_DATA} ${WRKSRC}/../Metakit.html ${WRKSRC}/../CHANGES \ ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR} -test: +do-test: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) -.if ${PORT_OPTIONS:MTCL} + +do-test-TCL-on: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl) -.endif .include Index: head/databases/metakit/pkg-plist =================================================================== --- head/databases/metakit/pkg-plist (revision 431070) +++ head/databases/metakit/pkg-plist (revision 431071) @@ -1,121 +1,121 @@ include/mk4.h include/mk4.inl include/mk4str.h include/mk4str.inl lib/libmk4.so lib/libmk4.so.0 -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo -%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so -%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl +%%PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/metakit.pyo +%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so +%%TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl %%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_BytesRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes___NONAME.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes___NONAME_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes___NONAME_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Bytes_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Cursor.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Cursor_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Cursor_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_CustomViewer.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_CustomViewer_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_CustomViewer_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_DoubleProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_DoubleProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_DoubleProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_DoubleRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_DoubleRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_DoubleRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_FloatProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_FloatProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_FloatProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_FloatRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_FloatRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_FloatRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_IntProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_IntProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_IntProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_IntRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_IntRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_IntRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_MemoProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_MemoProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_MemoProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_MemoRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_MemoRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_MemoRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Property.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Property_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Property_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Reference.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Reference_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Reference_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Row.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_RowRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_RowRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_RowRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Row_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Row_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Sequence.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Sequence_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Sequence_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Storage.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Storage_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Storage_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Strategy.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Strategy_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Strategy_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Stream.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Stream_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_Stream_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_StringProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_StringProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_StringProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_StringRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_StringRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_StringRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_View.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_ViewProp.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_ViewProp_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_ViewProp_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_ViewRef.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_ViewRef_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_ViewRef_info.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_View_desc.html %%PORTDOCS%%%%DOCSDIR%%/api/c4_View_info.html %%PORTDOCS%%%%DOCSDIR%%/api/classes.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_catfish.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_catrecv.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_catsend.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_dbf2mk.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_demo.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_discat.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_dump.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_ftpcat.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_kbind.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_mkoptim.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_myio.html %%PORTDOCS%%%%DOCSDIR%%/api/doc_struct.html %%PORTDOCS%%%%DOCSDIR%%/api/index.html %%PORTDOCS%%%%DOCSDIR%%/api/navbar.html %%PORTDOCS%%%%DOCSDIR%%/api/roadmap.html %%PORTDOCS%%%%DOCSDIR%%/api/samples.html %%PORTDOCS%%%%DOCSDIR%%/api/tips.html %%PORTDOCS%%%%DOCSDIR%%/e4s.gif %%PORTDOCS%%%%DOCSDIR%%/format.html %%PORTDOCS%%%%DOCSDIR%%/metakit.png %%PORTDOCS%%%%DOCSDIR%%/python.html %%PORTDOCS%%%%DOCSDIR%%/python.jpg %%PORTDOCS%%%%DOCSDIR%%/tcl.gif %%PORTDOCS%%%%DOCSDIR%%/tcl.html %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/Metakit.html %%PORTDOCS%%%%DOCSDIR%%/README