Update to Metakit 2.4.9.7:

- better UTF8 support in file & property names
- bugfixes
- Python 2.5 support for 64bit platforms

3 files changed, 8 insertions, 67 deletions

diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile
index 871ce89769d..4c2e76839f1 100644
--- a/databases/py-metakit/Makefile
+++ b/databases/py-metakit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/12/02 13:04:08 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/02/11 21:00:49 joerg Exp $
 #
 
-DISTNAME=	metakit-2.4.9.5
+DISTNAME=	metakit-2.4.9.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://www.equi4.com/pub/mk/ \
@@ -11,8 +11,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.equi4.com/metakit/
 COMMENT=	Embedded database library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PATCHDIR=	${.CURDIR}/../metakit-lib/patches
 DISTINFO_FILE=	${.CURDIR}/../metakit-lib/distinfo
+
 GNU_CONFIGURE=	yes
 CONFIGURE_DIRS=	builds
 CONFIGURE_SCRIPT= ../unix/configure
@@ -26,11 +29,13 @@ PY_PATCHPLIST=	yes
 
 PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
+INSTALLATION_DIRS+=	${PYSITELIB}
+
 post-build:
 	cd ${WRKSRC}/python && ${PYTHONBIN} ${PYCOMPILEALL} .
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/python/metakit.pyc ${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA} ${WRKSRC}/python/metakit.pyc ${DESTDIR}${PREFIX}/${PYSITELIB}
 
 .include "../../databases/metakit-lib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/databases/py-metakit/patches/patch-aa b/databases/py-metakit/patches/patch-aa
deleted file mode 100644
index 3c3fc6fdcb0..00000000000
--- a/databases/py-metakit/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/04/16 15:39:27 drochner Exp $
-
---- ../unix/Makefile.in.orig	2004-01-26 10:54:45.000000000 +0100
-+++ ../unix/Makefile.in	2004-04-16 16:45:19.000000000 +0200
-@@ -76,7 +76,6 @@
- 			-I$(tclincludedir)/generic \
- 			-I$(tclincludedir)
- CXX_SWITCHES_PY   = $(CPPFLAGS) $(CXXFLAGS) \
--			-I$(srcdir)/../include \
- 			-I$(srcdir)/../python/scxx \
- 			-I$(pyincludedir)
- CXX_SWITCHES_LUA  = $(CPPFLAGS) $(CXXFLAGS) \
-@@ -124,7 +123,7 @@
- 
- install-python: Mk4py@MODULE_SUFFIX@
- 	$(INSTALL_PROGRAM) Mk4py@MODULE_SUFFIX@ $(DESTDIR)$(pylibdir)
--	$(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
-+	$(INSTALL_DATA) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
- 
- clean:
- 	$L rm -f *.la *.o *.lo
-@@ -162,10 +161,10 @@
- 	cp .libs/libmk4py@MODULE_SUFFIX@ $@
- 	-strip $(STRIP_FLAGS) $@ 2>/dev/null
- 
--libmk4py.la: $(PYOBJS) $(LOBJS)
-+libmk4py.la: $(PYOBJS)
- 	$L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_MODULE_FLAGS) \
- 		-avoid-version -rpath $(libdir) \
--		$(SPYOBJS) $(SHLOBJS)
-+		$(SPYOBJS) -L${prefix}/lib -lmk4
- 
- Mk4lua@SHLIB_SUFFIX@: mk4lua.o libmk4.la
- 	$(CXX) -o $@ $(CXX_SWITCHES) -shared mk4lua.lo $(SHLOBJS) \
diff --git a/databases/py-metakit/patches/patch-ab b/databases/py-metakit/patches/patch-ab
deleted file mode 100644
index 1e8cec19d36..00000000000
--- a/databases/py-metakit/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/05/10 14:31:08 joerg Exp $
-
---- ../unix/configure.orig	2006-05-10 14:21:36.000000000 +0000
-+++ ../unix/configure
-@@ -3414,13 +3414,13 @@ else
-   LIBEXT=$LIB_SUFFIX
- fi
- 
--echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
--echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3479,7 +3479,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
- if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
--  LIBS="$LIBS -lpthread"
-+  LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
- 
-