- Update to 2.4.8

5 files changed, 44 insertions, 20 deletions

diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index d1b29157dffd..375fec8328b2 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	metakit
-PORTVERSION=	2.4.7
-PORTREVISION=	37
+PORTVERSION=	2.4.8
 CATEGORIES=	databases
 MASTER_SITES=	http://www.equi4.com/pub/mk/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${PORTREVISION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${KITREVISION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 
@@ -22,6 +21,7 @@ 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
@@ -52,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}
 MAKE_ENV+=	V=${TCL_V} SHORT_V=${TCL_SHORT_V}
+PLIST_SUB+=	TCL_V="${TCL_V}"
 PLIST_SUB+=	WITH_TCL=""
 .else
 PLIST_SUB+=	WITH_TCL="@comment "
@@ -65,7 +66,7 @@ pre-patch:
 		${WRKSRC}/../MetaKit.html.sed > ${WRKSRC}/../MetaKit.html
 .if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84)
 	@${MV} ${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/Makefile.in.sed
-	${SED} -e "s/= tclsh/=tclsh${TCL_V}/" \
+	${SED} -e "s/= tclsh/=tclsh${TCL_V}/" -e "s/tcl8.4/tcl${TCL_V}/" \
 		${WRKSRC}/../unix/Makefile.in.sed \
 		> ${WRKSRC}/../unix/Makefile.in
 .endif
@@ -78,7 +79,12 @@ pre-patch:
 
 post-install:
 .if defined(METAKIT_WITH_PYTHON)
-	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4py.so ${PYTHON_SITELIBDIR}/
+	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4py.a ${PREFIX}/lib
+	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4py.so ${PREFIX}/lib
+.endif
+.if defined(METAKIT_WITH_TCL83) || defined(METAKIT_WITH_TCL84)
+	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4tcl.a ${PREFIX}/lib
+	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/libmk4tcl.so ${PREFIX}/lib
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/databases/metakit/distinfo b/databases/metakit/distinfo
index 36cd320133f8..653201aa6d78 100644
--- a/databases/metakit/distinfo
+++ b/databases/metakit/distinfo
@@ -1 +1 @@
-MD5 (metakit-2.4.7-37.tar.gz) = 341eedb34a44c4242bac9b18b1a3a72e
+MD5 (metakit-2.4.8-38.tar.gz) = 806b7693276c173c97ca761212e9dfa4
diff --git a/databases/metakit/files/patch-Makefile.in b/databases/metakit/files/patch-Makefile.in
new file mode 100644
index 000000000000..2ba3c27f45a9
--- /dev/null
+++ b/databases/metakit/files/patch-Makefile.in
@@ -0,0 +1,28 @@
+--- ../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 @@
+ 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 @@
+ 
+ install-python: Mk4py@SHLIB_SUFFIX@
+ 	$(INSTALL_PROGRAM) Mk4py@SHLIB_SUFFIX@ $(DESTDIR)$(pylibdir)
+-	$(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $$(DESTDIR)(pylibdir)
++	$(INSTALL_SCRIPT) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
+ 
+ clean:
+ 	$L rm -f *.la *.o *.lo
diff --git a/databases/metakit/files/patch-configure b/databases/metakit/files/patch-configure
deleted file mode 100644
index f8690d886c29..000000000000
--- a/databases/metakit/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../unix/configure.orig	Thu Mar 14 22:49:33 2002
-+++ ../unix/configure	Mon May  6 22:28:50 2002
-@@ -4408,7 +4408,7 @@
- lt_simple_compile_test_code="int some_variable = 0;"
- 
- # Code to be used in simple link tests
--lt_simple_link_test_code='main(){return(0);}'
-+lt_simple_link_test_code='int main(void) { return(0); }'
- 
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist
index f3fd52e800ca..588579600463 100644
--- a/databases/metakit/pkg-plist
+++ b/databases/metakit/pkg-plist
@@ -7,11 +7,12 @@ lib/libmk4.so
 lib/libmk4.la
 %%WITH_PYTHON%%lib/libmk4py.a
 %%WITH_PYTHON%%lib/libmk4py.so
-%%WITH_PYTHON%%lib/libmk4py.la
-%%WITH_PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/libmk4py.so
+%%WITH_PYTHON%%lib/%%PYTHON_VERSION%%/site-packages/Mk4py.so
 %%WITH_TCL%%lib/libmk4tcl.a
 %%WITH_TCL%%lib/libmk4tcl.so
-%%WITH_TCL%%lib/libmk4tcl.la
+%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/Mk4tcl.so
+%%WITH_TCL%%lib/tcl%%TCL_V%%/Mk4tcl/pkgIndex.tcl
+%%WITH_TCL%%@dirrm lib/tcl%%TCL_V%%/Mk4tcl
 %%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