pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases update to 2.4.9.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4824254ff76
branches:  trunk
changeset: 473128:c4824254ff76
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Apr 16 15:39:26 2004 +0000

description:
update to 2.4.9.3
changes: bugfixes

diffstat:

 databases/metakit-lib/Makefile         |  14 +++++-----
 databases/metakit-lib/distinfo         |   7 +++--
 databases/metakit-lib/patches/patch-aa |  13 ++++++++++
 databases/py-metakit/Makefile          |  10 +++---
 databases/py-metakit/distinfo          |   8 +++---
 databases/py-metakit/patches/patch-aa  |  44 +++++++++++++--------------------
 6 files changed, 50 insertions(+), 46 deletions(-)

diffs (167 lines):

diff -r 34eef307e894 -r c4824254ff76 databases/metakit-lib/Makefile
--- a/databases/metakit-lib/Makefile    Fri Apr 16 15:33:52 2004 +0000
+++ b/databases/metakit-lib/Makefile    Fri Apr 16 15:39:26 2004 +0000
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/16 15:39:26 drochner Exp $
 #
 
-DISTNAME=      metakit-2.4.8-38
-PKGNAME=       metakit-lib-2.4.8
+DISTNAME=      metakit-2.4.9.3
+PKGNAME=       metakit-lib-2.4.9.3
 CATEGORIES=    databases
-MASTER_SITES=  http://www.equi4.com/pub/mk/older/
+MASTER_SITES=  http://www.equi4.com/pub/mk/
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.equi4.com/metakit/
 COMMENT=       Embedded database library
 
-WRKSRC=                ${WRKDIR}/metakit-2.4.8/builds
+WRKSRC=                ${WRKDIR}/metakit-2.4.9.3/builds
 GNU_CONFIGURE= yes
 CONFIGURE_SCRIPT= ../unix/configure
-CONFIGURE_ARGS+=       --with-tcl=
+CONFIGURE_ARGS+=       --without-tcl
 USE_LIBTOOL=   yes
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/../include/mk4io.h ${PREFIX}/include
diff -r 34eef307e894 -r c4824254ff76 databases/metakit-lib/distinfo
--- a/databases/metakit-lib/distinfo    Fri Apr 16 15:33:52 2004 +0000
+++ b/databases/metakit-lib/distinfo    Fri Apr 16 15:39:26 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/04 18:47:15 drochner Exp $
+$NetBSD: distinfo,v 1.2 2004/04/16 15:39:26 drochner Exp $
 
-SHA1 (metakit-2.4.8-38.tar.gz) = f0da401517f19019eda075175fcc724c2d568acd
-Size (metakit-2.4.8-38.tar.gz) = 840732 bytes
+SHA1 (metakit-2.4.9.3.tar.gz) = 466f062cbe467bc06a07f47a818af9ecfe4d121f
+Size (metakit-2.4.9.3.tar.gz) = 894808 bytes
+SHA1 (patch-aa) = 8a3b735519ca02f260065520bcd75fe15218add1
diff -r 34eef307e894 -r c4824254ff76 databases/metakit-lib/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/metakit-lib/patches/patch-aa    Fri Apr 16 15:39:26 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/04/16 15:39:27 drochner Exp $
+
+--- ../unix/configure.orig     2004-04-16 16:37:20.000000000 +0200
++++ ../unix/configure  2004-04-16 16:38:11.000000000 +0200
+@@ -8753,7 +8753,7 @@
+       LDFLAGS="${LDFLAGS} -lstdc++"
+     fi
+     ;;
+-  linux*)
++  linux*|netbsd*)
+     LDFLAGS="${LDFLAGS} -lstdc++"
+     LINK_SPECIAL_FLAGS="-rpath ${libdir}"
+     ;;
diff -r 34eef307e894 -r c4824254ff76 databases/py-metakit/Makefile
--- a/databases/py-metakit/Makefile     Fri Apr 16 15:33:52 2004 +0000
+++ b/databases/py-metakit/Makefile     Fri Apr 16 15:39:26 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/16 15:39:27 drochner Exp $
 #
 
-DISTNAME=      metakit-2.4.8-38
-PKGNAME=       ${PYPKGPREFIX}-metakit-2.4.8
+DISTNAME=      metakit-2.4.9.3
+PKGNAME=       ${PYPKGPREFIX}-metakit-2.4.9.3
 CATEGORIES=    databases
 MASTER_SITES=  http://www.equi4.com/pub/mk/
 
@@ -10,10 +10,10 @@
 HOMEPAGE=      http://www.equi4.com/metakit/
 COMMENT=       Embedded database library
 
-WRKSRC=                ${WRKDIR}/metakit-2.4.8/builds
+WRKSRC=                ${WRKDIR}/metakit-2.4.9.3/builds
 GNU_CONFIGURE= yes
 CONFIGURE_SCRIPT= ../unix/configure
-CONFIGURE_ARGS+=       --with-tcl= --enable-python
+CONFIGURE_ARGS+= --with-python=${LOCALBASE}/${PYINC},${LOCALBASE}/${PYSITELIB}
 USE_LIBTOOL=   yes
 USE_BUILDLINK2=        yes
 ALL_TARGET=    python
diff -r 34eef307e894 -r c4824254ff76 databases/py-metakit/distinfo
--- a/databases/py-metakit/distinfo     Fri Apr 16 15:33:52 2004 +0000
+++ b/databases/py-metakit/distinfo     Fri Apr 16 15:39:26 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/04 18:48:09 drochner Exp $
+$NetBSD: distinfo,v 1.2 2004/04/16 15:39:27 drochner Exp $
 
-SHA1 (metakit-2.4.8-38.tar.gz) = f0da401517f19019eda075175fcc724c2d568acd
-Size (metakit-2.4.8-38.tar.gz) = 840732 bytes
-SHA1 (patch-aa) = 77e6acc797e6c620f7c02277ed94cac91229022e
+SHA1 (metakit-2.4.9.3.tar.gz) = 466f062cbe467bc06a07f47a818af9ecfe4d121f
+Size (metakit-2.4.9.3.tar.gz) = 894808 bytes
+SHA1 (patch-aa) = fd920ac75e8112fcb5652c10ed378f47246e0aed
diff -r 34eef307e894 -r c4824254ff76 databases/py-metakit/patches/patch-aa
--- a/databases/py-metakit/patches/patch-aa     Fri Apr 16 15:33:52 2004 +0000
+++ b/databases/py-metakit/patches/patch-aa     Fri Apr 16 15:39:26 2004 +0000
@@ -1,44 +1,34 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/04 18:48:09 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/16 15:39:27 drochner Exp $
 
---- ../unix/Makefile.in.orig   Sat Nov  2 23:29:13 2002
-+++ ../unix/Makefile.in        Wed Dec  4 17:51:17 2002
-@@ -34,8 +34,8 @@
- srcdir = @srcdir@
- top_builddir = .
- 
--pyincludedir = @includedir@/python2.2
--pylibdir = @libdir@/python2.2/site-packages
-+pyincludedir = ${PYINC}
-+pylibdir = ${PYSITELIB}
- 
- tclsh = tclsh
- tclincludedir = @TCL_INCLUDE_DIR@
-@@ -71,7 +71,6 @@
+--- ../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   = $(CXXFLAGS) \
+ CXX_SWITCHES_PY   = $(CPPFLAGS) $(CXXFLAGS) \
 -                      -I$(srcdir)/../include \
                        -I$(srcdir)/../python/scxx \
                        -I$(pyincludedir)
- CXX_SWITCHES_LUA  = $(CXXFLAGS) \
-@@ -116,7 +115,7 @@
+ CXX_SWITCHES_LUA  = $(CPPFLAGS) $(CXXFLAGS) \
+@@ -124,7 +123,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_DATA) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
  
  clean:
        $L rm -f *.la *.o *.lo
-@@ -153,9 +152,9 @@
-       cp .libs/libmk4py@SHLIB_SUFFIX@ $@
+@@ -162,10 +161,10 @@
+       cp .libs/libmk4py@MODULE_SUFFIX@ $@
        -strip $(STRIP_FLAGS) $@ 2>/dev/null
  
--libmk4py.la: $(PYOBJS) $(LIBOBJS)
+-libmk4py.la: $(PYOBJS) $(LOBJS)
 +libmk4py.la: $(PYOBJS)
-       $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_FLAGS) -avoid-version \
--              -rpath $(libdir) $(SPYOBJS) $(SHLOBJS)
-+              -rpath $(libdir) $(SPYOBJS) -L${prefix}/lib -lmk4
+       $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) \



Home | Main Index | Thread Index | Old Index