diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-02-23 12:24:02 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-02-23 12:24:02 +0000 |
commit | b6b313785595385740e04aaee7c70cc78ea2ab4e (patch) | |
tree | f03ef60dd328bf36871a8e3d86a0806de3c14ea0 | |
parent | Update to version 1.2.9 and de-pkg-comment. (diff) |
- Update to 2.4.9
Notes
Notes:
svn path=/head/; revision=76265
-rw-r--r-- | databases/metakit/Makefile | 8 | ||||
-rw-r--r-- | databases/metakit/distinfo | 2 | ||||
-rw-r--r-- | databases/metakit/files/patch-Makefile.in | 27 | ||||
-rw-r--r-- | databases/metakit/files/patch-configure | 11 | ||||
-rw-r--r-- | databases/metakit/pkg-plist | 1 |
5 files changed, 26 insertions, 23 deletions
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile index c134ea0fb29e..8d1663adc631 100644 --- a/databases/metakit/Makefile +++ b/databases/metakit/Makefile @@ -6,10 +6,10 @@ # PORTNAME= metakit -PORTVERSION= 2.4.8 +PORTVERSION= 2.4.9 CATEGORIES= databases MASTER_SITES= http://www.equi4.com/pub/mk/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-${KITREVISION} +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= C++ embedded database engine, supports Python and Tcl @@ -22,7 +22,6 @@ LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 .endif -KITREVISION= 38 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds USE_LIBTOOL= yes CONFIGURE_SCRIPT= ../unix/configure @@ -33,7 +32,7 @@ ONLY_FOR_ARCHS= i386 alpha .if defined(METAKIT_WITH_PYTHON) USE_PYTHON= yes -CONFIGURE_ARGS+= --enable-python +CONFIGURE_ARGS+= --with-python=${LOCALBASE} CATEGORIES+= python PLIST_SUB+= WITH_PYTHON="" .else @@ -53,6 +52,7 @@ TCL_SHORT_V= 84 .if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84) CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/include/tcl${TCL_V} +CONFIGURE_ENV+= V=${TCL_V} SHORT_V=${TCL_SHORT_V} MAKE_ENV+= V=${TCL_V} SHORT_V=${TCL_SHORT_V} PLIST_SUB+= TCL_V="${TCL_V}" PLIST_SUB+= WITH_TCL="" diff --git a/databases/metakit/distinfo b/databases/metakit/distinfo index 653201aa6d78..9fa9efd76b15 100644 --- a/databases/metakit/distinfo +++ b/databases/metakit/distinfo @@ -1 +1 @@ -MD5 (metakit-2.4.8-38.tar.gz) = 806b7693276c173c97ca761212e9dfa4 +MD5 (metakit-2.4.9.tar.gz) = f31fdb693c8c7ec1157dcaac6805e962 diff --git a/databases/metakit/files/patch-Makefile.in b/databases/metakit/files/patch-Makefile.in index 2ba3c27f45a9..97f2a69b41ef 100644 --- a/databases/metakit/files/patch-Makefile.in +++ b/databases/metakit/files/patch-Makefile.in @@ -1,27 +1,18 @@ ---- ../unix/Makefile.in.orig Tue Nov 5 21:21:10 2002 -+++ ../unix/Makefile.in Tue Nov 5 21:37:12 2002 -@@ -39,7 +39,7 @@ - - tclsh =tclsh8.4 - tclincludedir = @TCL_INCLUDE_DIR@ --tcllibdir = @TCL_INCLUDE_DIR@/../lib -+tcllibdir = @TCL_INCLUDE_DIR@/../../lib/tcl8.4 - - # Compiling without frame pointers can play tricks with exception handling - # (e.g. in Mk4py). This does not affect standard operation, *only* errors. -@@ -54,6 +54,7 @@ +--- ../unix/Makefile.in.orig Sun Feb 23 12:24:55 2003 ++++ ../unix/Makefile.in Sun Feb 23 12:26:32 2003 +@@ -58,6 +58,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = $L --mode=install @INSTALL_DATA@ INSTALL_PROGRAM = $L --mode=install @INSTALL_PROGRAM@ +INSTALL_SCRIPT = $L --mode=install @INSTALL_SCRIPT@ - LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ - -@@ -116,7 +117,7 @@ + LIBTOOL_SHLIB_FLAGS = $(LDFLAGS) @LIBTOOL_SHLIB_FLAGS@ + LIBTOOL_MODULE_FLAGS = $(LDFLAGS) @LIBTOOL_MODULE_FLAGS@ +@@ -124,7 +125,7 @@ - install-python: Mk4py@SHLIB_SUFFIX@ - $(INSTALL_PROGRAM) Mk4py@SHLIB_SUFFIX@ $(DESTDIR)$(pylibdir) -- $(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $$(DESTDIR)(pylibdir) + install-python: Mk4py@MODULE_SUFFIX@ + $(INSTALL_PROGRAM) Mk4py@MODULE_SUFFIX@ $(DESTDIR)$(pylibdir) +- $(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir) + $(INSTALL_SCRIPT) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir) clean: diff --git a/databases/metakit/files/patch-configure b/databases/metakit/files/patch-configure new file mode 100644 index 000000000000..37e417218acf --- /dev/null +++ b/databases/metakit/files/patch-configure @@ -0,0 +1,11 @@ +--- ../unix/configure.orig Sun Feb 23 12:46:00 2003 ++++ ../unix/configure Sun Feb 23 12:48:43 2003 +@@ -1526,7 +1526,7 @@ + ;; + * ) + TCL_INCLUDE_DIR="$with_tcl" +- TCL_LIB_DIR="$with_tcl/../lib" ++ TCL_LIB_DIR="$with_tcl/../../lib/tcl${V}" + ;; + esac + diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist index 588579600463..e7336197a696 100644 --- a/databases/metakit/pkg-plist +++ b/databases/metakit/pkg-plist @@ -8,6 +8,7 @@ lib/libmk4.la %%WITH_PYTHON%%lib/libmk4py.a %%WITH_PYTHON%%lib/libmk4py.so %%WITH_PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/Mk4py.so +%%WITH_PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/metakit.py %%WITH_TCL%%lib/libmk4tcl.a %%WITH_TCL%%lib/libmk4tcl.so %%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so |