Don't try to link against libc_r on DragonFly.

3 files changed, 24 insertions, 14 deletions

diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index 38b7fae69d8..0bdb25f63bb 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2009/03/18 00:08:40 abs Exp $
+# $NetBSD: Makefile.common,v 1.34 2009/05/02 07:51:03 hasso Exp $
 # used by www/firefox/Makefile-firefox.common
 # used by mail/thunderbird/Makefile-thunderbird.common
 # used by www/seamonkey/Makefile-seamonkey.common
@@ -24,8 +24,8 @@ BUILDLINK_TRANSFORM+=	rm:-fomit-frame-pointer
 
 INSTALL_TEMPLATES+=	${.CURDIR}/../../www/seamonkey/INSTALL
 
-CONFIG_GUESS_OVERRIDE+=	*/*/*/config.guess */*/*/*/config.guess
-CONFIG_SUB_OVERRIDE+=	*/*/*/config.sub */*/*/*/config.sub
+CONFIG_GUESS_OVERRIDE+=	*/*/config.guess */*/*/config.guess */*/*/*/config.guess
+CONFIG_SUB_OVERRIDE+=	*/*/config.sub */*/*/config.sub */*/*/*/config.sub
 CONFIG_STATUS_OVERRIDE=		build/config.status
 CONFIG_STATUS_OVERRIDE+=	nsprpub/config.status
 CONFIG_STATUS_OVERRIDE+=	directory/c-sdk/config.status
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index fcd300f339d..7f5809873b8 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.39 2009/04/11 09:14:11 ghen Exp $
+$NetBSD: distinfo,v 1.40 2009/05/02 07:51:03 hasso Exp $
 
 SHA1 (seamonkey-1.1.16.source.tar.bz2) = 1dd4a6cda98bb9f86f233ae1cc3bdd49f7361b8e
 RMD160 (seamonkey-1.1.16.source.tar.bz2) = 171bd64f2c3296d0aa92b71794093c1d7e03f36a
 Size (seamonkey-1.1.16.source.tar.bz2) = 38086247 bytes
 SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a
-SHA1 (patch-ab) = b83dc786559d010f9bbb1adde697975166e0735e
+SHA1 (patch-ab) = 598039b566d03d87ba89001aa644e034eee40999
 SHA1 (patch-ac) = 393920aabf9476b668510a88af041d9a54c6019d
 SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab
index 99a7fc36bcc..0658d3d3a65 100644
--- a/www/seamonkey/patches/patch-ab
+++ b/www/seamonkey/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2007/04/15 12:17:06 rillig Exp $
+$NetBSD: patch-ab,v 1.8 2009/05/02 07:51:03 hasso Exp $
 
---- configure.in.orig	2007-01-11 19:45:06.000000000 +0100
-+++ configure.in
-@@ -1433,7 +1433,6 @@ case "$target" in
+--- configure.in.orig	2008-10-31 00:05:31 +0200
++++ configure.in	2009-05-02 00:41:14 +0300
+@@ -1532,7 +1532,6 @@ case "$target" in
      DSO_LDOPTS=''
      STRIP="$STRIP -x -S"
      _PLATFORM_DEFAULT_TOOLKIT='mac'
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.7 2007/04/15 12:17:06 rillig Exp $
      TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      # set MACOSX to generate lib/mac/MoreFiles/Makefile
      MACOSX=1
-@@ -1452,7 +1451,7 @@ case "$target" in
+@@ -1551,7 +1550,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.7 2007/04/15 12:17:06 rillig Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1466,6 +1465,9 @@ case "$target" in
+@@ -1565,6 +1564,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.7 2007/04/15 12:17:06 rillig Exp $
      ;; 
  
  *-hpux*)
-@@ -1898,6 +1900,13 @@ case "$target" in
+@@ -1997,6 +1999,13 @@ case "$target" in
      fi
      MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.7 2007/04/15 12:17:06 rillig Exp $
      ;;
  
  *-nto*) 
-@@ -2136,7 +2145,7 @@ dnl the qsort routine under solaris is f
+@@ -2235,7 +2244,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -52,7 +52,17 @@ $NetBSD: patch-ab,v 1.7 2007/04/15 12:17:06 rillig Exp $
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -5638,7 +5647,7 @@ dnl ====================================
+@@ -2749,6 +2758,9 @@ dnl ====================================
+ case $target in
+ *-hpux11.*)
+ 	;;
++*-dragonfly*)
++	AC_CHECK_LIB(c, gethostbyname_r)
++	;;
+ *)
+ 	AC_CHECK_LIB(c_r, gethostbyname_r)
+ 	;;
+@@ -5714,7 +5726,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then