Add DragonFly support. Add -rpath argument and let libtool generate

a shared library, otherwise other parts of the Makefile gets confused.

4 files changed, 54 insertions, 6 deletions

diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile
index 09e25d2a370..efc527a5cb0 100644
--- a/databases/metakit-lib/Makefile
+++ b/databases/metakit-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/11/03 20:15:44 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/31 00:53:22 joerg Exp $
 #
 
 DISTNAME=	metakit-2.4.9.3
 PKGNAME=	metakit-lib-2.4.9.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.equi4.com/pub/mk/
 
diff --git a/databases/metakit-lib/distinfo b/databases/metakit-lib/distinfo
index 710606844f0..0b0cff0c29f 100644
--- a/databases/metakit-lib/distinfo
+++ b/databases/metakit-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/11/03 20:15:44 rillig Exp $
+$NetBSD: distinfo,v 1.5 2005/12/31 00:53:22 joerg Exp $
 
 SHA1 (metakit-2.4.9.3.tar.gz) = 466f062cbe467bc06a07f47a818af9ecfe4d121f
 RMD160 (metakit-2.4.9.3.tar.gz) = ea2cbec5247dde58ff657de9908db5229ae0e5f5
 Size (metakit-2.4.9.3.tar.gz) = 894808 bytes
-SHA1 (patch-aa) = 77fd58cdceed3d77678b4a06fedb50afe0a30da1
+SHA1 (patch-aa) = 9481a92fc7996fff93fd011f730f1f4e0eba28c7
+SHA1 (patch-ab) = 564b21061d0a44d8ff64d82d6c9e1ee6dece5724
diff --git a/databases/metakit-lib/patches/patch-aa b/databases/metakit-lib/patches/patch-aa
index 62160143830..dbfe696e0c1 100644
--- a/databases/metakit-lib/patches/patch-aa
+++ b/databases/metakit-lib/patches/patch-aa
@@ -1,8 +1,42 @@
-$NetBSD: patch-aa,v 1.2 2005/11/03 20:15:44 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/31 00:53:22 joerg 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 @@
+@@ -3305,13 +3305,13 @@ darwin* | rhapsody*)
+   esac
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -5734,7 +5734,7 @@ else
+     ;;
+ 
+   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-  freebsd*)
++  freebsd*|dragonfly*)
+     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+@@ -6196,7 +6196,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++freebsd*|dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -8753,7 +8753,7 @@ case $build_os in
  	LDFLAGS="${LDFLAGS} -lstdc++"
      fi
      ;;
diff --git a/databases/metakit-lib/patches/patch-ab b/databases/metakit-lib/patches/patch-ab
new file mode 100644
index 00000000000..7f8d11f566b
--- /dev/null
+++ b/databases/metakit-lib/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/12/31 00:53:22 joerg Exp $
+
+--- unix/Makefile.in.orig	2005-12-30 18:07:35.000000000 +0000
++++ unix/Makefile.in
+@@ -147,7 +147,7 @@ $(srcdir)/configure: $(srcdir)/configure
+ 
+ libmk4.la: $(LOBJS) $(LINK_SPECIAL_FILES)
+ 	$L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_SHLIB_FLAGS) \
+-		-avoid-version $(SHLOBJS) $(LINK_SPECIAL_FLAGS)
++		-avoid-version -rpath $(libdir) $(SHLOBJS) $(LINK_SPECIAL_FLAGS)
+ 
+ Mk4tcl@SHLIB_SUFFIX@: libmk4tcl.la
+ 	cp .libs/libmk4tcl@SHLIB_SUFFIX@ $@