[137805] trunk/dports/databases/metakit

Sat Jun 20 05:42:51 PDT 2015

Revision: 137805
          https://trac.macports.org/changeset/137805
Author:   ryandesign at macports.org
Date:     2015-06-20 05:42:51 -0700 (Sat, 20 Jun 2015)
Log Message:
-----------
metakit: update to 2.4.9.8, now hosted at github; fixes build failure (#48055); use MacPorts Tcl instead of the system version; update homepage; enable tests; install documentation files; take over as maintainer

Modified Paths:
--------------
    trunk/dports/databases/metakit/Portfile

Added Paths:
-----------
    trunk/dports/databases/metakit/files/
    trunk/dports/databases/metakit/files/patch-unix-Makefile.in.diff
    trunk/dports/databases/metakit/files/patch-unix-configure.diff

Modified: trunk/dports/databases/metakit/Portfile
===================================================================

--- trunk/dports/databases/metakit/Portfile	2015-06-20 12:09:15 UTC (rev 137804)
+++ trunk/dports/databases/metakit/Portfile	2015-06-20 12:42:51 UTC (rev 137805)
@@ -1,26 +1,40 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup           github 1.0
 
-name			metakit
-version			2.4.9.3
+github.setup        jcw metakit 2.4.9.8
 categories		databases
 license			MIT
-maintainers		nomaintainer
+maintainers         ryandesign openmaintainer
 description		an efficient embedded database library with a small footprint
-homepage		http://www.equi4.com/metakit.html
 platforms		darwin
 long_description	Metakit is an efficient embedded database library with a small footprint. It fills the gap between flat-file, relational, object-oriented, and tree-structured databases, supporting relational joins, serialization, nested structures, and instant schema evolution.
-master_sites		http://www.equi4.com/pub/mk/
-checksums		md5 89a25775fee5db536937f36deb5223f6
-worksrcdir		${name}-${version}/builds
+
+homepage            http://equi4.com/metakit/
+
+checksums           rmd160  822e134600de16f62f5aaba30b33246c964c6e2e \
+                    sha256  09ea3802ab7382d90b6fc67e3607f87194951d91c24444ab1b5eba267d3b9c00
+
+depends_lib         port:tcl
+
+patchfiles          patch-unix-configure.diff \
+                    patch-unix-Makefile.in.diff
+
+configure.dir       ${worksrcpath}/builds
 configure.cmd		../unix/configure
-configure.args		--with-tcl=${prefix}
-post-build {
-	system "cp /usr/bin/glibtool ${worksrcpath}/libtool"
-	system "cp ${worksrcpath}/.libs/{libmk4.la,libmk4.lai}"
-}
+configure.args      --with-tcl=${prefix}/include,${prefix}/lib
 
-platform darwin {
-	configure.args		--with-tcl=/System/Library/Frameworks/Tcl.framework/Headers
+build.dir           ${configure.dir}
+
+test.run            yes
+
+post-destroot {
+    set docdir ${prefix}/share/doc/${subport}
+    xinstall -d ${destroot}${docdir}
+    xinstall -m 644 -W ${worksrcpath} \
+        CHANGES \
+        README \
+        license.terms \
+        ${destroot}${docdir}
 }

Added: trunk/dports/databases/metakit/files/patch-unix-Makefile.in.diff
===================================================================
--- trunk/dports/databases/metakit/files/patch-unix-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/databases/metakit/files/patch-unix-Makefile.in.diff	2015-06-20 12:42:51 UTC (rev 137805)
@@ -0,0 +1,53 @@
+--- unix/Makefile.in.orig	2015-06-18 13:37:38.000000000 -0500
++++ unix/Makefile.in	2015-06-20 07:30:10.000000000 -0500
+@@ -38,6 +38,7 @@
+ 
+ CXX_FLAGS = @CPPFLAGS@ @CXXFLAGS@ @MK_THREADS@ @SHLIB_CFLAGS@ \
+ 		-I$(srcdir)/../include
++LD_FLAGS = @LDFLAGS@
+ 
+ # Compiling without frame pointers can play tricks with exception handling
+ # (e.g. in Mk4py).  This does not affect standard operation, *only* errors.
+@@ -46,6 +47,7 @@
+ CXXFLAGS = $(CXX_FLAGS)
+ #CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS)
+ #CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS)
++LDFLAGS = $(LD_FLAGS)
+ 
+ CXX = @CXX@
+ INSTALL = @INSTALL@
+@@ -80,7 +82,7 @@
+ 	test -d tests || mkdir tests
+ 	-test -d ../tests/ok/CVS && (test -d tests/CVS || mkdir tests/CVS)
+ 	test -f reversed || cp $(srcdir)/reversed .
+-	./regress
++	DYLD_LIBRARY_PATH=$(top_builddir) ./regress
+ 	diff --exclude=.svn $(srcdir)/../tests/ok tests
+ 
+ test-tcl: tcl
+@@ -135,7 +137,7 @@
+ 	$(RANLIB) $@
+ 
+ libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
+-	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS)
++	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS) -install_name $(libdir)/$@
+ 
+ Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
+ 	$(AR) rcu $@ mk4tcl.o mk4too.o $(LOBJS)
+@@ -143,14 +145,14 @@
+ 
+ Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
+ 	$(SHLIB_LD) -o $@ mk4tcl.o mk4too.o \
+-			$(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS)
++			$(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS) -install_name $(tcllibdir)/Mk4tcl/$@
+ 
+ Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
+ 	$(AR) cru $@ $(PYOBJS) $(LOBJS)
+ 	$(RANLIB) $@
+ 
+ Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
+-	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS)
++	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS) -install_name $(pylibdir)/$@
+ 
+ demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
+ 	$(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \

Added: trunk/dports/databases/metakit/files/patch-unix-configure.diff
===================================================================
--- trunk/dports/databases/metakit/files/patch-unix-configure.diff	                        (rev 0)
+++ trunk/dports/databases/metakit/files/patch-unix-configure.diff	2015-06-20 12:42:51 UTC (rev 137805)
@@ -0,0 +1,11 @@
+--- unix/configure.orig	2015-06-18 13:37:38.000000000 -0500
++++ unix/configure	2015-06-20 06:25:32.000000000 -0500
+@@ -3651,7 +3651,7 @@
+ case $build_os in
+   Darwin*)
+     SHLIB_SUFFIX=".dylib"
+-    SHLIB_LD="${CXX} -dynamiclib -flat_namespace -undefined suppress"
++    SHLIB_LD="${CXX} -dynamiclib -undefined dynamic_lookup"
+     STRIP_FLAGS=-S
+     ;;
+   HP-UX*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150620/cb1f2417/attachment.html>
