[pkgsrc/trunk]: pkgsrc/time/sunbird Add DragonFly support. Override config.gu...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b18518483eb0
branches:  trunk
changeset: 515197:b18518483eb0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 27 11:11:52 2006 +0000

description:
Add DragonFly support. Override config.guess/config.sub scripts deeper
in the hierachy.

diffstat:

 time/sunbird/Makefile-sunbird.common |   7 ++-
 time/sunbird/distinfo                |  53 ++++++++++++++++++---
 time/sunbird/patches/patch-ab        |  43 +++++++++++++++--
 time/sunbird/patches/patch-ac        |  14 ++++-
 time/sunbird/patches/patch-af        |  16 +++++-
 time/sunbird/patches/patch-aq        |  52 ++++++++++++++++++++-
 time/sunbird/patches/patch-bo        |  54 ++++++++++++++++++++--
 time/sunbird/patches/patch-br        |  15 +++++-
 time/sunbird/patches/patch-bs        |  14 +++++-
 time/sunbird/patches/patch-da        |  13 +++++
 time/sunbird/patches/patch-db        |  26 ++++++++++
 time/sunbird/patches/patch-dc        |  13 +++++
 time/sunbird/patches/patch-dd        |  13 +++++
 time/sunbird/patches/patch-de        |  85 +++++++++++++++++++++++++++++++++++
 time/sunbird/patches/patch-df        |  49 ++++++++++++++++++++
 time/sunbird/patches/patch-dg        |  14 +++++
 time/sunbird/patches/patch-dh        |  13 +++++
 time/sunbird/patches/patch-di        |  14 +++++
 time/sunbird/patches/patch-dj        |  13 +++++
 time/sunbird/patches/patch-dk        |  13 +++++
 time/sunbird/patches/patch-dl        |  13 +++++
 time/sunbird/patches/patch-dm        |  13 +++++
 time/sunbird/patches/patch-dn        |  72 ++++++++++++++++++++++++++++++
 time/sunbird/patches/patch-do        |  13 +++++
 time/sunbird/patches/patch-dp        |  14 +++++
 time/sunbird/patches/patch-dq        |  23 +++++++++
 time/sunbird/patches/patch-dr        |  40 ++++++++++++++++
 time/sunbird/patches/patch-ds        |  49 ++++++++++++++++++++
 time/sunbird/patches/patch-dt        |  13 +++++
 time/sunbird/patches/patch-du        |  13 +++++
 time/sunbird/patches/patch-dv        |  13 +++++
 time/sunbird/patches/patch-dw        |  14 +++++
 time/sunbird/patches/patch-dx        |  14 +++++
 time/sunbird/patches/patch-dy        |  13 +++++
 time/sunbird/patches/patch-dz        |  13 +++++
 time/sunbird/patches/patch-ea        |  13 +++++
 time/sunbird/patches/patch-eb        |  22 +++++++++
 time/sunbird/patches/patch-ec        |  13 +++++
 time/sunbird/patches/patch-ed        |  22 +++++++++
 time/sunbird/patches/patch-ee        |  13 +++++
 time/sunbird/patches/patch-ef        |  13 +++++
 time/sunbird/patches/patch-eg        |  13 +++++
 time/sunbird/patches/patch-eh        |  13 +++++
 time/sunbird/patches/patch-ei        |  13 +++++
 time/sunbird/patches/patch-ej        |  86 ++++++++++++++++++++++++++++++++++++
 time/sunbird/patches/patch-ek        |  14 +++++
 46 files changed, 1064 insertions(+), 35 deletions(-)

diffs (truncated from 1424 to 300 lines):

diff -r bf1da31ab997 -r b18518483eb0 time/sunbird/Makefile-sunbird.common
--- a/time/sunbird/Makefile-sunbird.common      Tue Jun 27 11:07:12 2006 +0000
+++ b/time/sunbird/Makefile-sunbird.common      Tue Jun 27 11:11:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-sunbird.common,v 1.5 2006/06/07 19:29:59 ghen Exp $
+# $NetBSD: Makefile-sunbird.common,v 1.6 2006/06/27 11:11:52 joerg Exp $
 
 MOZILLA_BIN=           sunbird-bin
 MOZ_VER=               0.3alpha2
@@ -23,6 +23,11 @@
 CHECK_FILES_SKIP+=     ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
 CHECK_FILES_SKIP+=     ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
 
+.include "../../mk/bsd.prefs.mk"
+
+CONFIG_GUESS_OVERRIDE+=        */*/*/*/config.guess
+CONFIG_SUB_OVERRIDE+=  */*/*/*/config.sub
+
 post-install:
        cd ${PREFIX}/lib/${MOZILLA} && \
        ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \
diff -r bf1da31ab997 -r b18518483eb0 time/sunbird/distinfo
--- a/time/sunbird/distinfo     Tue Jun 27 11:07:12 2006 +0000
+++ b/time/sunbird/distinfo     Tue Jun 27 11:11:52 2006 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2006/06/07 19:29:59 ghen Exp $
+$NetBSD: distinfo,v 1.3 2006/06/27 11:11:52 joerg Exp $
 
 SHA1 (sunbird-0.3a2-source.tar.bz2) = fdda423b8a36c8c4808dbc8694abe7902227616e
 RMD160 (sunbird-0.3a2-source.tar.bz2) = 4dcfd6e72e614bf85cdd4aa972bd248a87d43588
 Size (sunbird-0.3a2-source.tar.bz2) = 62630647 bytes
 SHA1 (patch-aa) = b9c9f28e3c2d9ff5e3b982dda6d1332e2c025570
-SHA1 (patch-ab) = 8473d68c1e26729b244323f6ce84f095c9ebaba0
-SHA1 (patch-ac) = 39bfbd27cf75d5c68a171bbcda76060d753a4537
+SHA1 (patch-ab) = 8665353e9f1d98474c5d923f76b1ea1a333c2783
+SHA1 (patch-ac) = b3566f3a9e767cda3d9557079244e440e0c4da75
 SHA1 (patch-ad) = efca5ab6ad16fbc7a16f20ca181b23add7dd6f78
 SHA1 (patch-ae) = 8e31ede283ba33528f825ab6dd794eb4e17b78d9
-SHA1 (patch-af) = 1d682936b1cf1d4cd063920ca4b24ba3f993525d
+SHA1 (patch-af) = e86348a51e27173b78dc524403e268ca450d71a0
 SHA1 (patch-ah) = 6d39a2f657a91741fcfe30977510244d576a1406
 SHA1 (patch-ai) = 0480ece8f321243a374c1ab42f22245eb59a1a34
 SHA1 (patch-aj) = 279b54da26dae06118856ffbac3ed2fce793d3e9
@@ -17,16 +17,16 @@
 SHA1 (patch-an) = ece4b8f63b40b7284fdde840c45310e791a4b3a9
 SHA1 (patch-ao) = c7859e18c9fbd583be11de5b87dcf638121913cb
 SHA1 (patch-ap) = 7aa03607d77c39612e6d48771e7c514c4b2a6243
-SHA1 (patch-aq) = 675d420e205b616171aec02095331461c3ceeab0
+SHA1 (patch-aq) = 9e7ba653cb7beaa2d8e74797e89dc5fc1ef15b4b
 SHA1 (patch-aw) = 65d44e92ece767ac56b8a9ffe4ab4eadf61c0cb7
 SHA1 (patch-ax) = 761c47168cadc8fcfedc98ec89a09aa82473f6a0
 SHA1 (patch-ba) = dc4b09d9be363345b4a0b15d49442686de8ac4fd
 SHA1 (patch-bb) = e9d6fb2fd23765963fa69685d40189c6a810db07
 SHA1 (patch-bm) = 99276d866a1b9ae108fcde5d198f80231fdffd2b
-SHA1 (patch-bo) = ac2051136cd2f06e634ded14182d26962831987b
+SHA1 (patch-bo) = 05b13cec917445eb9e99c1619ae89e86e660d945
 SHA1 (patch-bq) = c178922beb612f8ff659c909b8873bf6a0077916
-SHA1 (patch-br) = 62177554eb0146d55352abcdb15f415be6a36234
-SHA1 (patch-bs) = caeda4d4c0747119bb77cbd467792b8af8c063b3
+SHA1 (patch-br) = 17bb5d7ceaa31ed78fb4003e4763adcd07517a15
+SHA1 (patch-bs) = b1e929f13bec6525a251203328b3e5e35ec45f1e
 SHA1 (patch-bu) = 76e0f7b3789ecdfda0a92d969efaec82fa36d283
 SHA1 (patch-bv) = aa54e6552c9a25eb17a0aa9f500980853d076853
 SHA1 (patch-bw) = b000b8291c875708c51d0267497f4f234a9578e5
@@ -34,3 +34,40 @@
 SHA1 (patch-bz) = 487538b422f62a0f06477f0bf3c8a95e108f91b6
 SHA1 (patch-ca) = 9a79c7f188652e1c7ae359d20cdab999e90c6647
 SHA1 (patch-cb) = 075dc07861343bfe4aee77c9295794eb88a91bfa
+SHA1 (patch-da) = 4eaf577ac0ac5e656cfec2fe9d87f8a13c876c60
+SHA1 (patch-db) = 895f85ae169bd7a20ca108a11bc071053367cd68
+SHA1 (patch-dc) = 688aa10ecfdf6124745de3f951bd1ed57a12edea
+SHA1 (patch-dd) = d6fd84665098f9ff186d10a20e61c88a0acf4cd6
+SHA1 (patch-de) = 1f6e18de3aecf33c81dd86cd054de9f31d10ef6c
+SHA1 (patch-df) = 4d3f910383adda9119742b9058b42b1b26c0c39e
+SHA1 (patch-dg) = c2b41b55228f85fb0284f957e1c8de96fe09b968
+SHA1 (patch-dh) = 83bb03edc9b69bf6abc8a162239bde2651bfdf7b
+SHA1 (patch-di) = b1780bb0a6ba5ffddb4b98cc20a4dc396531ec43
+SHA1 (patch-dj) = 959b3a124955db5eb76eda545d81907ac7eb0db7
+SHA1 (patch-dk) = decaadea5a9d1bb04d07ba3a279cc9b0535037eb
+SHA1 (patch-dl) = 064b9c7c123a6be560f70d2fe08b1236768eb16c
+SHA1 (patch-dm) = cb01bc786cb375b2133dd86fa182c90d0ed86e48
+SHA1 (patch-dn) = 18fd32e620bf13e43574249c768340d5f86b5a61
+SHA1 (patch-do) = 72a44d5d2e6e22b2473a93de56512d1730ccd32d
+SHA1 (patch-dp) = f10187cf9de4466e49a967b79875eb01c5afd69f
+SHA1 (patch-dq) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
+SHA1 (patch-dr) = 7c730bf66a25697e71286c85bc531cb5c79b2364
+SHA1 (patch-ds) = 19bd30df8edacacec93ba4703cc334ed8d50846f
+SHA1 (patch-dt) = 755021d5309407f8708e68ab46df87e617a574dc
+SHA1 (patch-du) = 203b753bb931157c09fc02fc392cbb35ac941103
+SHA1 (patch-dv) = 5af0f9091f0acdf31c71c38964a3a0969bc9a144
+SHA1 (patch-dw) = 5c9eaae8b2e6b2c1a52cd6b53906fec94248fa63
+SHA1 (patch-dx) = dc5794ac4293c957e8c45e8dc15b0a6122bb33f2
+SHA1 (patch-dy) = 013c6dbc75abb71da2f490d384c0aec93c25100f
+SHA1 (patch-dz) = 9217e3b97a0fc4ad49d3e5a1b021aee3eea1cd45
+SHA1 (patch-ea) = e9998b9d97d2d2cdebca65d999cb7efecd20808f
+SHA1 (patch-eb) = ef12390d2f0cfdae249d30f8554146de9013eea1
+SHA1 (patch-ec) = de00e4082cbf7898cc0ce3aef3902e30c161fbdf
+SHA1 (patch-ed) = 54623e821570546cde89aa540ed0efc95f2ed314
+SHA1 (patch-ee) = 0a209b1cae6bcb1adba9215cbce023e78e00955f
+SHA1 (patch-ef) = 0730e715e22f5838c306a1d09fa4a6379c7e3a47
+SHA1 (patch-eg) = f5b7b62c26ea747602cdb17f82e6fd502ef0bdc7
+SHA1 (patch-eh) = 2eca0d714a88eac56732424c70f4049f667bdd6a
+SHA1 (patch-ei) = b42438f95e68bb761bf69b5c5b7c0edfda462e2c
+SHA1 (patch-ej) = 2fa7456d555af1914e5368dec611685c433dd6eb
+SHA1 (patch-ek) = 663dc7b550ee5ee8fae36ed0a3fd33cf648424a9
diff -r bf1da31ab997 -r b18518483eb0 time/sunbird/patches/patch-ab
--- a/time/sunbird/patches/patch-ab     Tue Jun 27 11:07:12 2006 +0000
+++ b/time/sunbird/patches/patch-ab     Tue Jun 27 11:11:52 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2006/06/07 19:29:59 ghen Exp $
+$NetBSD: patch-ab,v 1.3 2006/06/27 11:11:52 joerg Exp $
 
---- configure.in.orig  2006-06-07 17:51:37.000000000 +0200
+--- configure.in.orig  2006-05-06 17:53:27.000000000 +0000
 +++ configure.in
 @@ -1489,7 +1489,6 @@ case "$target" in
      DSO_LDOPTS=''
@@ -10,17 +10,26 @@
      TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      # set MACOSX to generate lib/mac/MoreFiles/Makefile
      MACOSX=1
-@@ -1522,6 +1521,9 @@ case "$target" in
+@@ -1522,6 +1521,18 @@ case "$target" in
  #     MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #     MKSHLIB_UNFORCE_ALL=''
  #    fi
 +    if test "$LIBRUNPATH"; then
 +      DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
 +    fi
++    ;; 
++
++*-dragonfly*)
++    if test ! "$GNU_CC"; then
++      DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
++    fi
++    if test "$LIBRUNPATH"; then
++      DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
++    fi
      ;; 
  
  *-hpux*)
-@@ -1705,7 +1707,6 @@ case "$target" in
+@@ -1705,7 +1716,6 @@ case "$target" in
      BIN_SUFFIX='.exe'
      USE_SHORT_LIBNAME=1
      MOZ_ENABLE_COREXFONTS=
@@ -28,7 +37,7 @@
      MOZ_USER_DIR="Mozilla"
  ;;
  
-@@ -1952,6 +1953,14 @@ case "$target" in
+@@ -1952,6 +1962,14 @@ 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 +52,7 @@
      ;;
  
  *-nto*) 
-@@ -1992,6 +2001,13 @@ case "$target" in
+@@ -1992,6 +2010,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
        DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -57,7 +66,27 @@
      ;;
  
  *-openvms*) 
-@@ -5929,7 +5945,7 @@ dnl ====================================
+@@ -2688,7 +2713,7 @@ dnl Checks for header files.
+ dnl ========================================================
+ AC_HEADER_DIRENT
+ case "$target_os" in
+-freebsd*)
++freebsd* | dragonfly*)
+ # for stuff like -lXshm
+     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+     ;;
+@@ -2948,6 +2973,10 @@ then
+                       fi
+                       ;;
+ 
++          *-*-dragonfly*)
++                      _PTHREAD_LDFLAGS="-pthread"
++                      ;;
++
+           *-*-openbsd*|*-*-bsdi*)
+                       AC_DEFINE(_REENTRANT)
+                       AC_DEFINE(_THREAD_SAFE)
+@@ -5929,7 +5958,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff -r bf1da31ab997 -r b18518483eb0 time/sunbird/patches/patch-ac
--- a/time/sunbird/patches/patch-ac     Tue Jun 27 11:07:12 2006 +0000
+++ b/time/sunbird/patches/patch-ac     Tue Jun 27 11:11:52 2006 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2006/06/07 19:29:59 ghen Exp $
+$NetBSD: patch-ac,v 1.3 2006/06/27 11:11:52 joerg Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2006-06-07 17:51:56.000000000 +0200
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2006-03-28 20:03:49.000000000 +0000
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -69,6 +69,9 @@ ifeq (Darwin,$(OS_ARCH))
+@@ -62,13 +62,16 @@ include $(topsrcdir)/config/config.mk
+ #
+ # Lots of Unixish x86 flavors
+ #
+-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
+ ifeq (86,$(findstring 86,$(OS_TEST)))
+ CPPSRCS               := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+ ifeq (Darwin,$(OS_ARCH))
  DEFINES               += -DKEEP_STACK_16_BYTE_ALIGNED
  endif
  endif
diff -r bf1da31ab997 -r b18518483eb0 time/sunbird/patches/patch-af
--- a/time/sunbird/patches/patch-af     Tue Jun 27 11:07:12 2006 +0000
+++ b/time/sunbird/patches/patch-af     Tue Jun 27 11:11:52 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/02/05 21:56:25 ghen Exp $
+$NetBSD: patch-af,v 1.2 2006/06/27 11:11:52 joerg Exp $
 
---- security/nss/lib/freebl/unix_rand.c.orig   2006-02-02 16:57:57.000000000 +0100
+--- security/nss/lib/freebl/unix_rand.c.orig   2006-04-04 01:01:51.000000000 +0000
 +++ security/nss/lib/freebl/unix_rand.c
 @@ -35,6 +35,7 @@
   * ***** END LICENSE BLOCK ***** */
@@ -10,7 +10,17 @@
  #include <string.h>
  #include <signal.h>
  #include <unistd.h>
-@@ -694,7 +695,11 @@ safe_popen(char *cmd)
+@@ -81,7 +82,8 @@ static size_t CopyLowBits(void *dst, siz
+ }
+ 
+ #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
+-    || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD)
++    || defined(NETBSD) || defined(NTO) || defined(DARWIN) || defined(OPENBSD) \
++    || defined(DRAGONFLY)
+ #include <sys/times.h>
+ 
+ #define getdtablesize() sysconf(_SC_OPEN_MAX)
+@@ -694,7 +696,11 @@ safe_popen(char *cmd)
        /* dup write-side of pipe to stderr and stdout */
        if (p[1] != 1) dup2(p[1], 1);
        if (p[1] != 2) dup2(p[1], 2);
diff -r bf1da31ab997 -r b18518483eb0 time/sunbird/patches/patch-aq
--- a/time/sunbird/patches/patch-aq     Tue Jun 27 11:07:12 2006 +0000
+++ b/time/sunbird/patches/patch-aq     Tue Jun 27 11:11:52 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1.1.1 2006/02/05 21:56:26 ghen Exp $
+$NetBSD: patch-aq,v 1.2 2006/06/27 11:11:52 joerg Exp $
 
---- directory/c-sdk/configure.in.orig  2006-02-02 16:57:57.000000000 +0100
+--- directory/c-sdk/configure.in.orig  2006-04-11 21:12:58.000000000 +0000
 +++ directory/c-sdk/configure.in
-@@ -54,7 +54,7 @@ USE_64=
+@@ -58,7 +58,7 @@ USE_64=
  USE_CPLUS=
  USE_IPV6=
  USE_MDUPDATE=
@@ -11,3 +11,49 @@
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
+@@ -1183,6 +1183,24 @@ tools are selected during the Xcode/Deve
+     DSO_LDOPTS=-Bshareable
+     ;;
+ 
++*-*-dragonfly*)
++    if test -z "$USE_NSPR_THREADS"; then
++        USE_PTHREADS=1
++    fi
++    AC_DEFINE(XP_UNIX)
++    AC_DEFINE(DRAGONFLY)
++    AC_DEFINE(HAVE_BSD_FLOCK)
++    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
++    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    if test "$MOZ_OBJFORMAT" = "elf"; then
++        DLL_SUFFIX=so
++    else
++        DLL_SUFFIX=so.1.0
++    fi
++    DSO_CFLAGS=-fPIC
++    DSO_LDOPTS=-Bshareable
++    ;;
++
+ *-hpux*)
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(HPUX)
+@@ -2270,7 +2288,7 @@ if test -n "$USE_PTHREADS"; then
+             _PTHREAD_LDFLAGS=
+         fi
+           ;;
+-    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
++    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-*-dragonfly*)
+           AC_DEFINE(_THREAD_SAFE)
+           dnl -pthread links in -lc_r, so don't specify it explicitly.
+           if test "$ac_cv_have_dash_pthread" = "yes"; then