diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-01-10 21:57:00 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-01-10 21:57:00 +0000 |
| commit | 4bf1dd2da23c4f0401d0f80464230b7140fbd542 (patch) | |
| tree | 95beae2a99cf7ae85c10bd789080e62814325dd4 /databases/metakit | |
| parent | 0a2e4e1feea5908c43053ca85161729362206e64 (diff) | |
| download | ports-4bf1dd2da23c4f0401d0f80464230b7140fbd542.tar.gz ports-4bf1dd2da23c4f0401d0f80464230b7140fbd542.zip | |
Notes
Diffstat (limited to 'databases/metakit')
| -rw-r--r-- | databases/metakit/Makefile | 30 | ||||
| -rw-r--r-- | databases/metakit/pkg-plist | 4 |
2 files changed, 15 insertions, 19 deletions
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile index f8268c5c368c..d9405a631b92 100644 --- a/databases/metakit/Makefile +++ b/databases/metakit/Makefile @@ -14,10 +14,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTREVISION} MAINTAINER= dinoex@FreeBSD.org -.if defined(METAKIT_WITH_TCL) +.if defined(METAKIT_WITH_TCL83) LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 .endif -.if defined(METAKIT_WITH_TCLKIT) +.if defined(METAKIT_WITH_TCL84) LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 .endif @@ -29,8 +29,9 @@ LIBTOOLFILES= ${CONFIGURE_SCRIPT} INSTALLS_SHLIB= yes MAKE_ARGS= CXXFLAGS="-Dq4_INLINE ${CFLAGS} -fpermissive" -.if !defined(METAKIT_WITHOUT_PYTHON) -USE_PYTHON= yes +.if defined(METAKIT_WITH_PYTHON) +# BROKEN for python 2.2 +PYTHON_VERSION= python2.1 CONFIGURE_ARGS+= --enable-python CATEGORIES+= python PLIST_SUB+= WITH_PYTHON="" @@ -38,24 +39,23 @@ PLIST_SUB+= WITH_PYTHON="" PLIST_SUB+= WITH_PYTHON="@comment " .endif -.if defined(METAKIT_WITH_TCL) -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/include/tcl${TCL_V} +.if defined(METAKIT_WITH_TCL83) CATEGORIES+= tcl83 TCL_V= 8.3 TCL_SHORT_V= 83 -PLIST_SUB+= WITH_TCL="" -.else -PLIST_SUB+= WITH_TCL="@comment " .endif -.if defined(METAKIT_WITH_TCLKIT) -CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/include/tcl${TCL_V} +.if defined(METAKIT_WITH_TCL84) TCL_V= 8.4 TCL_SHORT_V= 84 +.endif + +.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84) +CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/include/tcl${TCL_V} MAKE_ENV+= V=${TCL_V} SHORT_V=${TCL_SHORT_V} -PLIST_SUB+= WITH_TCLKIT="" +PLIST_SUB+= WITH_TCL="" .else -PLIST_SUB+= WITH_TCLKIT="@comment " +PLIST_SUB+= WITH_TCL="@comment " .endif pre-patch: @@ -64,7 +64,7 @@ pre-patch: @${PERL5} -pi -e "s=doc/==" ${WRKSRC}/../MetaKit.html post-install: -.if !defined(METAKIT_WITHOUT_PYTHON) +.if defined(METAKIT_WITH_PYTHON) @${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so ${PYTHON_SITELIBDIR}/ .endif .if !defined(NOPORTDOCS) @@ -78,7 +78,7 @@ post-install: test: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) -.if defined(METAKIT_WITH_TCL) || defined(METAKIT_WITH_TCLKIT) +.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84) @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl) .endif diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist index a7b748ef1cfb..5579e425da96 100644 --- a/databases/metakit/pkg-plist +++ b/databases/metakit/pkg-plist @@ -15,10 +15,6 @@ lib/libmk4.la %%WITH_TCL%%lib/libmk4tcl.so %%WITH_TCL%%lib/libmk4tcl.so.0 %%WITH_TCL%%lib/libmk4tcl.la -%%WITH_TCLKIT%%lib/libmk4tcl.a -%%WITH_TCLKIT%%lib/libmk4tcl.so -%%WITH_TCLKIT%%lib/libmk4tcl.so.0 -%%WITH_TCLKIT%%lib/libmk4tcl.la %%PORTDOCS%%share/doc/metakit/api/c4_Bytes.html %%PORTDOCS%%share/doc/metakit/api/c4_BytesProp.html %%PORTDOCS%%share/doc/metakit/api/c4_BytesProp_desc.html |