Update to 2.01.

Other improvements:
- make USE_LIBTOOL actually working;
- enable building of python module and make python the secondary category;
- install api documentation;
- reshape PLIST to fully use screen estate;
- replace ugly ${FILESDIR}/patch.Makefile with normal patch.

7 files changed, 210 insertions, 16 deletions

diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 03fda73a355e..90e5569c4822 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -6,22 +6,33 @@
 #
 
 PORTNAME=	metakit
-PORTVERSION=	2.0
-CATEGORIES=	databases
+PORTVERSION=	2.01
+CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rcarter@pinyon.org
 
+BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/builds
+
 USE_LIBTOOL=	yes
+CONFIGURE_SCRIPT=	../unix/configure
+LIBTOOLFILES=	${CONFIGURE_SCRIPT}
 INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	../unix/aclocal.m4
-CONFIGURE_SCRIPT= ../unix/configure
-MAKE_ARGS=	CXXFLAGS="-Dq4_STD ${CFLAGS}"
 
-post-configure:
-	@cd ${WRKSRC} ; \
-	${PATCH} < ${FILESDIR}/patch.Makefile
+CONFIGURE_ARGS=	--enable-python
+MAKE_ARGS=	CXXFLAGS="-Dq4_STD ${CFLAGS} -fpermissive"
+ALL_TARGET=	all Mk4py.so
+
+post-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so ${PREFIX}/lib/python1.5/site-packages
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/metakit
+	(cd ${WRKSRC}/../doc && ${TAR} -c -f - .) \
+		| (cd ${PREFIX}/share/doc/metakit && ${TAR} --unlink -x -f -)
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/metakit/distinfo b/databases/metakit/distinfo
index 17a76eecba59..70f98493299d 100644
--- a/databases/metakit/distinfo
+++ b/databases/metakit/distinfo
@@ -1 +1 @@
-MD5 (metakit-2.0.tar.gz) = 14795a0f84d7c32fc4765a29624f9913
+MD5 (metakit-2.01.tar.gz) = 8102ad38c8895cdec4caf89ef43b134b
diff --git a/databases/metakit/files/patch-ab b/databases/metakit/files/patch-ab
new file mode 100644
index 000000000000..4f57fbeae526
--- /dev/null
+++ b/databases/metakit/files/patch-ab
@@ -0,0 +1,41 @@
+--- ../unix/Makefile.in.orig	Fri Mar 17 18:25:27 2000
++++ ../unix/Makefile.in	Sat Jul 29 15:31:03 2000
+@@ -76,15 +76,15 @@
+ 	$(INSTALL_DATA) ../include/mk4str.h $(includedir)/mk4str.h
+ 	$(INSTALL_DATA) ../include/mk4str.inl $(includedir)/mk4str.inl
+ 	$(INSTALL_DATA) -s libmk4.a $(libdir)/libmk4.a
+-	$(INSTALL_PROGRAM) -s libmk4.la $(libdir)/libmk4.la
++	$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) -s libmk4.la $(libdir)/libmk4.la
+ 
+ install-tcl: libmk4tcl.a libmk4tcl.la
+ 	$(INSTALL_DATA) -s libmk4tcl.a $(libdir)/libmk4tcl.a
+-	$(INSTALL_PROGRAM) -s libmk4tcl.la $(libdir)/libmk4tcl.la
++	$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) -s libmk4tcl.la $(libdir)/libmk4tcl.la
+ 
+ install-python: libmk4py.a libmk4py.la
+ 	$(INSTALL_DATA) -s libmk4py.a $(libdir)/libmk4py.a
+-	$(INSTALL_PROGRAM) -s libmk4py.la $(libdir)/libmk4py.la
++	$(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) -s libmk4py.la $(libdir)/libmk4py.la
+ 
+ clean:
+ 	rm -f *.a *.la *.o *.lo *.so
+@@ -108,8 +108,8 @@
+ config.status: $(srcdir)/configure
+ 	$(SHELL) ./config.status --recheck
+ 
+-$(srcdir)/configure: $(srcdir)/configure.in
+-	cd $(srcdir) && autoconf
++#$(srcdir)/configure: $(srcdir)/configure.in
++#	cd $(srcdir) && autoconf
+ 
+ dist-tar:
+ 	rm -rf metakit-$(VERSION)
+@@ -150,7 +150,7 @@
+ 		-rpath $(libdir) $(SPYOBJS) $(SHLOBJS)
+ 
+ Mk4py.so: $(PYOBJS) libmk4.a
+-	$(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS)
++	$(CXX) -o $@ $(CXX_SWITCHES) -shared $(SPYOBJS) $(SHLOBJS) -lgcc_r
+ 
+ demo: ../demos/demo.cpp libmk4.a
+ 	$(LIBTOOL) --mode=link $(CXX) $(CXX_SWITCHES) -o $@ \
diff --git a/databases/metakit/files/patch-ac b/databases/metakit/files/patch-ac
new file mode 100644
index 000000000000..deba454c7823
--- /dev/null
+++ b/databases/metakit/files/patch-ac
@@ -0,0 +1,15 @@
+--- ../tcl/mk4tcl.cpp.orig	Fri Jul 28 19:40:17 2000
++++ ../tcl/mk4tcl.cpp	Fri Jul 28 19:40:21 2000
+@@ -565,10 +565,12 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ 
++#if !defined(__FreeBSD__)
+ #define LOCK_SH 1    /* Shared lock.  */
+ #define LOCK_EX 2    /* Exclusive lock.  */
+ #define LOCK_UN 8    /* Unlock.  */
+ #define LOCK_NB 4    /* Don't block when locking.  */
++#endif
+ 
+     static int my_flock(int fd, int type)
+     {
diff --git a/databases/metakit/files/patch-ad b/databases/metakit/files/patch-ad
new file mode 100644
index 000000000000..dd9e4cf50b44
--- /dev/null
+++ b/databases/metakit/files/patch-ad
@@ -0,0 +1,19 @@
+--- ../unix/configure.orig	Fri Mar 17 17:57:30 2000
++++ ../unix/configure	Sat Jul 29 16:00:40 2000
+@@ -652,7 +652,6 @@
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ 	TCL_BIN_DIR="# no Tcl configs found"
+ 	echo "configure: warning: Can't find Tcl configuration definitions" 1>&2
+-	exit 0
+ else
+ 	TCL_BIN_DIR=${ac_cv_c_tclconfig}
+ 	echo "$ac_t""found $TCL_BIN_DIR/tclConfig.sh" 1>&6
+@@ -2308,7 +2308,7 @@
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
diff --git a/databases/metakit/pkg-descr b/databases/metakit/pkg-descr
index e6dcde75f2d3..13eb24a327c5 100644
--- a/databases/metakit/pkg-descr
+++ b/databases/metakit/pkg-descr
@@ -1,9 +1,7 @@
-METAKIT is a curious mix of flatfile, relational and
-OODBMS features with a small footprint and a big
-following. For those who don't need a heavy-duty SQL
-solution, it's tight and fast for <100,000 items,
-with a snazzy ability to dynamically change data
-structures on the fly. Interfaces are available for
+METAKIT is a curious mix of flatfile, relational and OODBMS features with a
+small footprint and a big following. For those who don't need a heavy-duty SQL
+solution, it's tight and fast for <100,000 items, with a snazzy ability to
+dynamically change data structures on the fly. Interfaces are available for
 Tcl and Python, with Perl promised soon.
 
 WWW: http://www.equi4.com/metakit/
diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist
index d7690ddbd347..d72c086b1883 100644
--- a/databases/metakit/pkg-plist
+++ b/databases/metakit/pkg-plist
@@ -4,5 +4,115 @@ include/mk4str.h
 include/mk4str.inl
 lib/libmk4.a
 lib/libmk4.so
-lib/libmk4.la
 lib/libmk4.so.0
+lib/libmk4py.a
+lib/libmk4py.so
+lib/libmk4py.so.0
+lib/python1.5/site-packages/Mk4py.so
+share/doc/metakit/api/c4_Bytes.html
+share/doc/metakit/api/c4_BytesProp.html
+share/doc/metakit/api/c4_BytesProp_desc.html
+share/doc/metakit/api/c4_BytesProp_info.html
+share/doc/metakit/api/c4_BytesRef.html
+share/doc/metakit/api/c4_BytesRef_desc.html
+share/doc/metakit/api/c4_BytesRef_info.html
+share/doc/metakit/api/c4_Bytes___NONAME.html
+share/doc/metakit/api/c4_Bytes___NONAME_desc.html
+share/doc/metakit/api/c4_Bytes___NONAME_info.html
+share/doc/metakit/api/c4_Bytes_desc.html
+share/doc/metakit/api/c4_Bytes_info.html
+share/doc/metakit/api/c4_Cursor.html
+share/doc/metakit/api/c4_Cursor_desc.html
+share/doc/metakit/api/c4_Cursor_info.html
+share/doc/metakit/api/c4_CustomViewer.html
+share/doc/metakit/api/c4_CustomViewer_desc.html
+share/doc/metakit/api/c4_CustomViewer_info.html
+share/doc/metakit/api/c4_DoubleProp.html
+share/doc/metakit/api/c4_DoubleProp_desc.html
+share/doc/metakit/api/c4_DoubleProp_info.html
+share/doc/metakit/api/c4_DoubleRef.html
+share/doc/metakit/api/c4_DoubleRef_desc.html
+share/doc/metakit/api/c4_DoubleRef_info.html
+share/doc/metakit/api/c4_FloatProp.html
+share/doc/metakit/api/c4_FloatProp_desc.html
+share/doc/metakit/api/c4_FloatProp_info.html
+share/doc/metakit/api/c4_FloatRef.html
+share/doc/metakit/api/c4_FloatRef_desc.html
+share/doc/metakit/api/c4_FloatRef_info.html
+share/doc/metakit/api/c4_IntProp.html
+share/doc/metakit/api/c4_IntProp_desc.html
+share/doc/metakit/api/c4_IntProp_info.html
+share/doc/metakit/api/c4_IntRef.html
+share/doc/metakit/api/c4_IntRef_desc.html
+share/doc/metakit/api/c4_IntRef_info.html
+share/doc/metakit/api/c4_MemoProp.html
+share/doc/metakit/api/c4_MemoProp_desc.html
+share/doc/metakit/api/c4_MemoProp_info.html
+share/doc/metakit/api/c4_MemoRef.html
+share/doc/metakit/api/c4_MemoRef_desc.html
+share/doc/metakit/api/c4_MemoRef_info.html
+share/doc/metakit/api/c4_Property.html
+share/doc/metakit/api/c4_Property_desc.html
+share/doc/metakit/api/c4_Property_info.html
+share/doc/metakit/api/c4_Reference.html
+share/doc/metakit/api/c4_Reference_desc.html
+share/doc/metakit/api/c4_Reference_info.html
+share/doc/metakit/api/c4_Row.html
+share/doc/metakit/api/c4_RowRef.html
+share/doc/metakit/api/c4_RowRef_desc.html
+share/doc/metakit/api/c4_RowRef_info.html
+share/doc/metakit/api/c4_Row_desc.html
+share/doc/metakit/api/c4_Row_info.html
+share/doc/metakit/api/c4_Sequence.html
+share/doc/metakit/api/c4_Sequence_desc.html
+share/doc/metakit/api/c4_Sequence_info.html
+share/doc/metakit/api/c4_Storage.html
+share/doc/metakit/api/c4_Storage_desc.html
+share/doc/metakit/api/c4_Storage_info.html
+share/doc/metakit/api/c4_Strategy.html
+share/doc/metakit/api/c4_Strategy_desc.html
+share/doc/metakit/api/c4_Strategy_info.html
+share/doc/metakit/api/c4_Stream.html
+share/doc/metakit/api/c4_Stream_desc.html
+share/doc/metakit/api/c4_Stream_info.html
+share/doc/metakit/api/c4_StringProp.html
+share/doc/metakit/api/c4_StringProp_desc.html
+share/doc/metakit/api/c4_StringProp_info.html
+share/doc/metakit/api/c4_StringRef.html
+share/doc/metakit/api/c4_StringRef_desc.html
+share/doc/metakit/api/c4_StringRef_info.html
+share/doc/metakit/api/c4_View.html
+share/doc/metakit/api/c4_ViewProp.html
+share/doc/metakit/api/c4_ViewProp_desc.html
+share/doc/metakit/api/c4_ViewProp_info.html
+share/doc/metakit/api/c4_ViewRef.html
+share/doc/metakit/api/c4_ViewRef_desc.html
+share/doc/metakit/api/c4_ViewRef_info.html
+share/doc/metakit/api/c4_View_desc.html
+share/doc/metakit/api/c4_View_info.html
+share/doc/metakit/api/classes.html
+share/doc/metakit/api/doc_catfish.html
+share/doc/metakit/api/doc_catrecv.html
+share/doc/metakit/api/doc_catsend.html
+share/doc/metakit/api/doc_dbf2mk.html
+share/doc/metakit/api/doc_demo.html
+share/doc/metakit/api/doc_discat.html
+share/doc/metakit/api/doc_dump.html
+share/doc/metakit/api/doc_ftpcat.html
+share/doc/metakit/api/doc_kbind.html
+share/doc/metakit/api/doc_mkoptim.html
+share/doc/metakit/api/doc_myio.html
+share/doc/metakit/api/doc_struct.html
+share/doc/metakit/api/index.html
+share/doc/metakit/api/navbar.html
+share/doc/metakit/api/roadmap.html
+share/doc/metakit/api/samples.html
+share/doc/metakit/api/tips.html
+share/doc/metakit/e4s.gif
+share/doc/metakit/format.html
+share/doc/metakit/python.html
+share/doc/metakit/python.jpg
+share/doc/metakit/tcl.gif
+share/doc/metakit/tcl.html
+@dirrm share/doc/metakit/api
+@dirrm share/doc/metakit