pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/tcl-itcl-current Handle FreeBSD and DragonFly lik...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f328b9dd127e
branches:  trunk
changeset: 512444:f328b9dd127e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue May 09 18:20:18 2006 +0000

description:
Handle FreeBSD and DragonFly like NetBSD when it comes to library naming.

diffstat:

 lang/tcl-itcl-current/distinfo         |    8 +-
 lang/tcl-itcl-current/patches/patch-aa |  151 +++++++++++++++++++-------------
 lang/tcl-itcl-current/patches/patch-ac |  138 ++++++++++++++++++------------
 lang/tcl-itcl-current/patches/patch-af |   36 ++++++-
 4 files changed, 209 insertions(+), 124 deletions(-)

diffs (truncated from 1159 to 300 lines):

diff -r 68322dfe472a -r f328b9dd127e lang/tcl-itcl-current/distinfo
--- a/lang/tcl-itcl-current/distinfo    Tue May 09 18:13:32 2006 +0000
+++ b/lang/tcl-itcl-current/distinfo    Tue May 09 18:20:18 2006 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2005/04/05 01:42:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2006/05/09 18:20:18 joerg Exp $
 
 SHA1 (tcl-itcl-20040920.tar.gz) = 469d8df8d7b506e7d175eb5a15fe68b5a60e95c6
 RMD160 (tcl-itcl-20040920.tar.gz) = 3c992eb5aba9f1e8d21d57b854fe782d0e2ca1f5
 Size (tcl-itcl-20040920.tar.gz) = 1133945 bytes
-SHA1 (patch-aa) = 62af242070cdf36b222a4e2d91d5d2ae4abbdd5b
+SHA1 (patch-aa) = 82728f23602d5a276e1fdf4de5e4fc93816032db
 SHA1 (patch-ab) = 05a86eb12eb9bf5b1d2b5cc0349fb919263dedcb
-SHA1 (patch-ac) = 9ab2f96a523c3a92e4263a0d216341b16de57e4b
+SHA1 (patch-ac) = b0d8f2bdefcc8fda090ebbd6a47e51567b5e329c
 SHA1 (patch-ad) = 8eb6769fb919ba51ee72664818c5e31e45e518d9
 SHA1 (patch-ae) = 595d5fa2c322a6726af21f87cb5a74feadb9d515
-SHA1 (patch-af) = e023d077b63357d482d3baec3b34efc328f3a648
+SHA1 (patch-af) = af719ce70c2791621cd24cbae5f84bc2cd3ff979
 SHA1 (patch-ag) = 5b21951b82de53875efd5289dd87abae8bb11073
 SHA1 (patch-ah) = 58985a1b21625fc00dbbfe4e793dcbb2f7ef2929
 SHA1 (patch-ai) = 706151bc08f654aec1d2cce39fa794e516eae9a5
diff -r 68322dfe472a -r f328b9dd127e lang/tcl-itcl-current/patches/patch-aa
--- a/lang/tcl-itcl-current/patches/patch-aa    Tue May 09 18:13:32 2006 +0000
+++ b/lang/tcl-itcl-current/patches/patch-aa    Tue May 09 18:20:18 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/04/05 01:42:46 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2006/05/09 18:20:18 joerg Exp $
 
 --- itcl/configure.orig        2004-09-08 01:23:50.000000000 +0000
 +++ itcl/configure
@@ -2280,19 +2280,20 @@
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +  (eval $ac_compile) 2>conftest.er1
-   ac_status=$?
++  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
 +       { ac_try='test -z "$ac_c_werror_flag"
 +                       || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
 +  (exit $ac_status); }; } &&
 +       { ac_try='test -s conftest.$ac_objext'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -3370,7 +3371,35 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7687,6 +8155,9 @@ echo "$as_me: WARNING: \"64bit mode only
+@@ -7426,7 +7894,7 @@ rm -f conftest*
+           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+           TCL_LIB_VERSIONS_OK=nodots
+           ;;
+-      FreeBSD-*)
++      FreeBSD-*|DragonFly-*)
+           # FreeBSD 3.* and greater have ELF.
+           SHLIB_CFLAGS="-fPIC"
+           SHLIB_LD="ld -Bshareable -x"
+@@ -7442,14 +7910,10 @@ rm -f conftest*
+               CFLAGS="$CFLAGS -pthread"
+               LDFLAGS="$LDFLAGS -pthread"
+           fi
+-          case $system in
+-          FreeBSD-3.*)
+-              # FreeBSD-3 doesn't handle version numbers with dots.
+-              UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+-              SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+-              TCL_LIB_VERSIONS_OK=nodots
+-              ;;
+-          esac
++
++          SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0.0'
++          UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++          TCL_LIB_VERSIONS_OK=nodots
+           ;;
+       Rhapsody-*|Darwin-*)
+           SHLIB_CFLAGS="-fno-common"
+@@ -7687,6 +8151,9 @@ echo "$as_me: WARNING: \"64bit mode only
                SHLIB_LD="/usr/ccs/bin/ld -G -z text"
                LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
            fi
@@ -3380,7 +3409,7 @@
            ;;
        ULTRIX-4.*)
            SHLIB_CFLAGS="-G 0"
-@@ -7715,7 +8186,6 @@ echo "$as_me: WARNING: \"64bit mode only
+@@ -7715,7 +8182,6 @@ echo "$as_me: WARNING: \"64bit mode only
  echo $ECHO_N "checking for ld accepts -Bexport flag... $ECHO_C" >&6
            LDFLAGS="$LDFLAGS -Wl,-Bexport"
            cat >conftest.$ac_ext <<_ACEOF
@@ -3388,7 +3417,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7732,11 +8202,21 @@ int i;
+@@ -7732,11 +8198,21 @@ int i;
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3412,7 +3441,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7749,7 +8229,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7749,7 +8225,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  LDFLAGS=$hold_ldflags found=no
  fi
@@ -3422,7 +3451,7 @@
            echo "$as_me:$LINENO: result: $found" >&5
  echo "${ECHO_T}$found" >&6
            LD_SEARCH_FLAGS=""
-@@ -7784,7 +8265,6 @@ echo "$as_me: WARNING: \"64bit support b
+@@ -7784,7 +8261,6 @@ echo "$as_me: WARNING: \"64bit support b
        echo "$as_me:$LINENO: checking sys/exec.h" >&5
  echo $ECHO_N "checking sys/exec.h... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
@@ -3430,7 +3459,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7812,11 +8292,21 @@ main ()
+@@ -7812,11 +8288,21 @@ main ()
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3454,7 +3483,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7829,7 +8319,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7829,7 +8315,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  tcl_ok=unusable
  fi
@@ -3463,7 +3492,7 @@
        echo "$as_me:$LINENO: result: $tcl_ok" >&5
  echo "${ECHO_T}$tcl_ok" >&6
        if test $tcl_ok = usable; then
-@@ -7841,7 +8331,6 @@ _ACEOF
+@@ -7841,7 +8327,6 @@ _ACEOF
            echo "$as_me:$LINENO: checking a.out.h" >&5
  echo $ECHO_N "checking a.out.h... $ECHO_C" >&6
            cat >conftest.$ac_ext <<_ACEOF
@@ -3471,7 +3500,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7869,11 +8358,21 @@ main ()
+@@ -7869,11 +8354,21 @@ main ()
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3495,7 +3524,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7886,7 +8385,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7886,7 +8381,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  tcl_ok=unusable
  fi
@@ -3504,7 +3533,7 @@
            echo "$as_me:$LINENO: result: $tcl_ok" >&5
  echo "${ECHO_T}$tcl_ok" >&6
            if test $tcl_ok = usable; then
-@@ -7898,7 +8397,6 @@ _ACEOF
+@@ -7898,7 +8393,6 @@ _ACEOF
                echo "$as_me:$LINENO: checking sys/exec_aout.h" >&5
  echo $ECHO_N "checking sys/exec_aout.h... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF
@@ -3512,7 +3541,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7926,11 +8424,21 @@ main ()
+@@ -7926,11 +8420,21 @@ main ()
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3536,7 +3565,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7943,7 +8451,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7943,7 +8447,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  tcl_ok=unusable
  fi
@@ -3545,7 +3574,7 @@
                echo "$as_me:$LINENO: result: $tcl_ok" >&5
  echo "${ECHO_T}$tcl_ok" >&6
                if test $tcl_ok = usable; then
-@@ -8050,7 +8558,6 @@ echo $ECHO_N "checking for required earl
+@@ -8050,7 +8554,6 @@ echo $ECHO_N "checking for required earl
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3553,7 +3582,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8067,11 +8574,21 @@ char *p = (char *)strtoll; char *q = (ch
+@@ -8067,11 +8570,21 @@ char *p = (char *)strtoll; char *q = (ch
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3577,7 +3606,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8083,7 +8600,6 @@ else
+@@ -8083,7 +8596,6 @@ else
  sed 's/^/| /' conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -3585,7 +3614,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8101,11 +8617,21 @@ char *p = (char *)strtoll; char *q = (ch
+@@ -8101,11 +8613,21 @@ char *p = (char *)strtoll; char *q = (ch
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3609,7 +3638,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8118,9 +8644,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8118,9 +8640,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  tcl_cv_flag__isoc99_source=no
  fi
@@ -3621,7 +3650,7 @@
  fi
  
      if test "x${tcl_cv_flag__isoc99_source}" = "xyes" ; then
-@@ -8136,7 +8662,6 @@ _ACEOF
+@@ -8136,7 +8658,6 @@ _ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3629,7 +3658,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8153,11 +8678,21 @@ struct stat64 buf; int i = stat64("/", &
+@@ -8153,11 +8674,21 @@ struct stat64 buf; int i = stat64("/", &
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3653,7 +3682,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8169,7 +8704,6 @@ else
+@@ -8169,7 +8700,6 @@ else
  sed 's/^/| /' conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -3661,7 +3690,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8187,11 +8721,21 @@ struct stat64 buf; int i = stat64("/", &
+@@ -8187,11 +8717,21 @@ struct stat64 buf; int i = stat64("/", &
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3685,7 +3714,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8204,9 +8748,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8204,9 +8744,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  tcl_cv_flag__largefile64_source=no
  fi
@@ -3697,7 +3726,7 @@
  fi
  
      if test "x${tcl_cv_flag__largefile64_source}" = "xyes" ; then
-@@ -8235,7 +8779,6 @@ else
+@@ -8235,7 +8775,6 @@ else
        tcl_cv_type_64bit=none



Home | Main Index | Thread Index | Old Index