diff options
author | joerg <joerg> | 2009-02-11 21:00:13 +0000 |
---|---|---|
committer | joerg <joerg> | 2009-02-11 21:00:13 +0000 |
commit | 50bdd5197f0c7257dd4e611cb1eb86ac204435f1 (patch) | |
tree | 4ed97e65a66c59b2edd2a5c464498e4a157adb45 /databases | |
parent | dc250b7d5d86ef53ff83c1c16c4d395502032d50 (diff) | |
download | pkgsrc-50bdd5197f0c7257dd4e611cb1eb86ac204435f1.tar.gz |
Update to Metakit 2.4.9.7:
- better UTF8 support in file & property names
- bugfixes
- Python 2.5 support for 64bit platforms
Diffstat (limited to 'databases')
-rw-r--r-- | databases/metakit-lib/Makefile | 11 | ||||
-rw-r--r-- | databases/metakit-lib/distinfo | 12 | ||||
-rw-r--r-- | databases/metakit-lib/patches/patch-aa | 23 | ||||
-rw-r--r-- | databases/metakit-lib/patches/patch-ab | 6 | ||||
-rw-r--r-- | databases/metakit-lib/patches/patch-ac | 19 | ||||
-rw-r--r-- | databases/py-metakit/Makefile | 11 | ||||
-rw-r--r-- | databases/py-metakit/patches/patch-aa | 34 | ||||
-rw-r--r-- | databases/py-metakit/patches/patch-ab | 30 |
8 files changed, 23 insertions, 123 deletions
diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile index c13d2e80a01..793a98456ae 100644 --- a/databases/metakit-lib/Makefile +++ b/databases/metakit-lib/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2007/12/02 13:04:08 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2009/02/11 21:00:13 joerg Exp $ # -DISTNAME= metakit-2.4.9.5 -PKGNAME= metakit-lib-2.4.9.5 +VERSION= 2.4.9.7 +DISTNAME= metakit-${VERSION} +PKGNAME= metakit-lib-${VERSION} CATEGORIES= databases MASTER_SITES= http://www.equi4.com/pub/mk/ @@ -10,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.equi4.com/metakit/ COMMENT= Embedded database library +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes CONFIGURE_DIRS= builds CONFIGURE_SCRIPT= ../unix/configure @@ -20,6 +23,6 @@ USE_LIBTOOL= yes TEST_TARGET= test post-install: - ${INSTALL_DATA} ${WRKSRC}/include/mk4io.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/include/mk4io.h ${DESTDIR}${PREFIX}/include .include "../../mk/bsd.pkg.mk" diff --git a/databases/metakit-lib/distinfo b/databases/metakit-lib/distinfo index 514701a11b9..41d38552a15 100644 --- a/databases/metakit-lib/distinfo +++ b/databases/metakit-lib/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.7 2008/08/02 21:32:30 dholland Exp $ +$NetBSD: distinfo,v 1.8 2009/02/11 21:00:13 joerg Exp $ -SHA1 (metakit-2.4.9.5.tar.gz) = 26f693c857ef530988a927bd3c964a4e9e60ce9b -RMD160 (metakit-2.4.9.5.tar.gz) = 330cd3e096b7492bd6eda1b1682277dfe06311f0 -Size (metakit-2.4.9.5.tar.gz) = 877426 bytes -SHA1 (patch-aa) = 07b31ce305aeececb5403f1707d54f2a2a87f338 -SHA1 (patch-ab) = 920485d14cfac6f10d1cb52332c54b1800d22d97 -SHA1 (patch-ac) = f16a3fd5c1e8ac435c49c5e1c430978b1e29a6bb +SHA1 (metakit-2.4.9.7.tar.gz) = 1b75400038fcad941886deb0748e669c224bc995 +RMD160 (metakit-2.4.9.7.tar.gz) = e563c2187e66ed7a8ea0e9a16971e6ce777e3088 +Size (metakit-2.4.9.7.tar.gz) = 868310 bytes +SHA1 (patch-ab) = 74a987a807844460cee9b13cd06578529911c68e diff --git a/databases/metakit-lib/patches/patch-aa b/databases/metakit-lib/patches/patch-aa deleted file mode 100644 index 03eed58fa32..00000000000 --- a/databases/metakit-lib/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD - ---- python/PyView.cpp~ 2005-04-15 02:27:22.000000000 -0400 -+++ python/PyView.cpp 2008-08-02 17:32:18.000000000 -0400 -@@ -977,15 +977,15 @@ static void PyView_dealloc(PyView *o) { - } - - static int PyView_print(PyView *o, FILE *f, int) { -- fprintf(f, "<PyView object at %x>", (int)o); -+ fprintf(f, "<PyView object at %p>", o); - return 0; - } - static int PyViewer_print(PyView *o, FILE *f, int) { -- fprintf(f, "<PyViewer object at %x>", (int)o); -+ fprintf(f, "<PyViewer object at %p>", o); - return 0; - } - static int PyROViewer_print(PyView *o, FILE *f, int) { -- fprintf(f, "<PyROViewer object at %x>", (int)o); -+ fprintf(f, "<PyROViewer object at %p>", o); - return 0; - } - diff --git a/databases/metakit-lib/patches/patch-ab b/databases/metakit-lib/patches/patch-ab index 3e2d6684ea8..fc90807a9b4 100644 --- a/databases/metakit-lib/patches/patch-ab +++ b/databases/metakit-lib/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2006/03/02 19:19:43 drochner Exp $ +$NetBSD: patch-ab,v 1.3 2009/02/11 21:00:13 joerg Exp $ ---- unix/Makefile.in.orig 2005-11-22 20:12:28.000000000 +0100 +--- unix/Makefile.in.orig 2007-06-16 02:23:25.000000000 +0200 +++ unix/Makefile.in @@ -36,8 +36,7 @@ tclsh = tclsh tclincludedir = @TCL_INCLUDE_DIR@ @@ -54,7 +54,7 @@ $NetBSD: patch-ab,v 1.2 2006/03/02 19:19:43 drochner Exp $ test -d tests || mkdir tests @@ -106,9 +107,9 @@ install-tcl: Mk4tcl$(LIBEXT) if [ '${LIBEXT}' = '.a' ]; then ranlib $(DESTDIR)$(tcllibdir)/Mk4tcl/Mk4tcl.a; fi - echo 'package ifneeded Mk4tcl 2.4.9.5 [list load [file join $$dir Mk4tcl$(LIBEXT)] Mk4tcl]' >$(DESTDIR)$(tcllibdir)/Mk4tcl/pkgIndex.tcl + echo 'package ifneeded Mk4tcl 2.4.9.7 [list load [file join $$dir Mk4tcl$(LIBEXT)] Mk4tcl]' >$(DESTDIR)$(tcllibdir)/Mk4tcl/pkgIndex.tcl -install-python: Mk4py$(LIBEXT) - $(INSTALL_PROGRAM) Mk4py$(LIBEXT) $(DESTDIR)$(pylibdir) diff --git a/databases/metakit-lib/patches/patch-ac b/databases/metakit-lib/patches/patch-ac deleted file mode 100644 index 1c6c73d6724..00000000000 --- a/databases/metakit-lib/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/08/02 21:32:30 dholland Exp $ - ---- python/PyRowRef.cpp~ 2004-04-26 06:18:13.000000000 -0400 -+++ python/PyRowRef.cpp 2008-08-02 17:28:54.000000000 -0400 -@@ -24,12 +24,12 @@ static void PyRowRef_dealloc(PyRowRef *o - } - - static int PyRowRef_print(PyRowRef *o, FILE *f, int) { -- fprintf(f, "<PyRowRef object at %x>", (int)o); -+ fprintf(f, "<PyRowRef object at %p>", o); - return 0; - } - - static int PyRORowRef_print(PyRowRef *o, FILE *f, int) { -- fprintf(f, "<PyRORowRef object at %x>", (int)o); -+ fprintf(f, "<PyRORowRef object at %p>", o); - return 0; - } - 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 - - |