diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2001-12-19 14:18:08 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2001-12-19 14:18:08 +0000 |
| commit | d7e5af9aa2fb6d986ec670576f9df595ceaa27d2 (patch) | |
| tree | 01e01b63d9f58ba95a52b655bb77650152bbbdb7 /databases/metakit | |
| parent | - Update Netatalk 1.5pre8 to 1.5rc1. (diff) | |
- Use standard USE_PYTHON=yes instead of hardcoded path.
- Fix an problem installion on a clean system.
Notes
Notes:
svn path=/head/; revision=51839
Diffstat (limited to 'databases/metakit')
| -rw-r--r-- | databases/metakit/Makefile | 8 | ||||
| -rw-r--r-- | databases/metakit/pkg-plist | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile index 933bbd2b6e35..ce009a792fe8 100644 --- a/databases/metakit/Makefile +++ b/databases/metakit/Makefile @@ -14,10 +14,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTREVISION} MAINTAINER= dinoex@FreeBSD.org -.if !defined(METAKIT_WITHOUT_PYTHON) -BUILD_DEPENDS= python2.1:${PORTSDIR}/lang/python -RUN_DEPENDS= python2.1:${PORTSDIR}/lang/python -.endif .if defined(METAKIT_WITH_TCL) LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 .endif @@ -34,6 +30,7 @@ INSTALLS_SHLIB= yes MAKE_ARGS= CXXFLAGS="-Dq4_INLINE ${CFLAGS} -fpermissive" .if !defined(METAKIT_WITHOUT_PYTHON) +USE_PYTHON= yes CONFIGURE_ARGS+= --enable-python CATEGORIES+= python PLIST_SUB+= WITH_PYTHON="" @@ -68,8 +65,7 @@ pre-patch: post-install: .if !defined(METAKIT_WITHOUT_PYTHON) - @${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so \ - ${PREFIX}/lib/python1.5/site-packages + @${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so ${PYTHON_SITELIBDIR}/ .endif .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/metakit diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist index 6a1eb66e7453..a7b748ef1cfb 100644 --- a/databases/metakit/pkg-plist +++ b/databases/metakit/pkg-plist @@ -10,7 +10,7 @@ lib/libmk4.la %%WITH_PYTHON%%lib/libmk4py.so %%WITH_PYTHON%%lib/libmk4py.so.0 %%WITH_PYTHON%%lib/libmk4py.la -%%WITH_PYTHON%%lib/python1.5/site-packages/Mk4py.so +%%WITH_PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/Mk4py.so %%WITH_TCL%%lib/libmk4tcl.a %%WITH_TCL%%lib/libmk4tcl.so %%WITH_TCL%%lib/libmk4tcl.so.0 |