diff options
Diffstat (limited to 'cad/xcircuit/patches/patch-ab')
| -rw-r--r-- | cad/xcircuit/patches/patch-ab | 61 |
1 files changed, 42 insertions, 19 deletions
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab index c5676e09c4d..df22b0a8007 100644 --- a/cad/xcircuit/patches/patch-ab +++ b/cad/xcircuit/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.8 2006/10/14 02:21:22 rillig Exp $ +$NetBSD: patch-ab,v 1.9 2006/11/12 14:25:50 dmcmahill Exp $ ---- configure.orig 2004-10-01 06:25:07.000000000 +0200 -+++ configure 2006-10-14 04:20:29.000000000 +0200 -@@ -7393,7 +7393,7 @@ if test "${with_tcl+set}" = set; then +--- configure.orig 2006-06-09 17:54:33.000000000 +0000 ++++ configure +@@ -7765,7 +7765,7 @@ if test "${enable_double_buffer+set}" = + + else + +- if test "x$xc_with_GL" == "x" ; then ++ if test "x$xc_with_GL" = "x" ; then + cat >>confdefs.h <<\_ACEOF + #define DOUBLEBUFFER 1 + _ACEOF +@@ -8144,7 +8144,7 @@ if test "${with_tcl+set}" = set; then withval="$with_tcl" xc_with_tcl=$withval @@ -11,24 +20,31 @@ $NetBSD: patch-ab,v 1.8 2006/10/14 02:21:22 rillig Exp $ xc_with_tcl="" fi -@@ -7629,6 +7629,7 @@ fi - if test "x$xc_with_tcl" != "x" ; then - . $tcl_config_sh - . $tk_config_sh -+ LIBS="${LIBS} ${TCL_LIBS}" - - if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then - : -@@ -7704,7 +7705,7 @@ fi +@@ -8735,12 +8735,12 @@ if test "x$xc_with_tcl" != "x" ; then + if test "x${xc_with_tcl_includes}" != "x" ; then + if test -r "${xc_with_tcl_includes}/tcl.h" ; then + TCL_INC_DIR=${xc_with_tcl_includes} +- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then ++ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then + echo "Can't find tcl.h in \"${xc_with_tcl_includes}\"" + echo "Reverting to non-Tcl compilation" + xc_with_tcl="" + fi +- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then ++ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then + for dir in \ + ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \ + ${TCL_PREFIX}/include \ +@@ -8794,7 +8794,7 @@ fi if test "x$xc_with_tcl" != "x" ; then case $target in -- *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*) +- *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*) + *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-dragonfly*) TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" ;; -@@ -8105,7 +8106,7 @@ fi +@@ -9246,7 +9246,7 @@ fi EXTRA_LIB_SPECS="-ldl" ;; @@ -37,16 +53,23 @@ $NetBSD: patch-ab,v 1.8 2006/10/14 02:21:22 rillig Exp $ # Not available on all versions: check for include file. if test "${ac_cv_header_dlfcn_h+set}" = set; then echo "$as_me:$LINENO: checking for dlfcn.h" >&5 -@@ -8244,9 +8245,9 @@ fi +@@ -9393,8 +9393,8 @@ fi if test "$test_ok" = yes; then - SHLIB_CFLAGS="-fpic" - SHLIB_LD="ld" -- LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}" + SHLIB_CFLAGS="-fPIC" + SHLIB_LD=$CC -+ LDDL_FLAGS="-shared" + LDDL_FLAGS="-shared" fi ;; - +@@ -10542,6 +10542,8 @@ do + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + ac_cs_recheck=: ;; + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; |