head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.82 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.80 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.78 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.76 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.74 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.72 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.70 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.68 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.66 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.64 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.62 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.60 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.58 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.56 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.54 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.52 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.50 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.48 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.46 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.44 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.42 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.40 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.38 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.34 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.14 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.36 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.32 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.30 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.28 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.26 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.24 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.22 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.20 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.18 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.16 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.12 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.10 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.8 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.6 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.4 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.2 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.3.0.82 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.80 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.78 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.76 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.74 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.72 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.70 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.68 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.66 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.64 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.62 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.60 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.58 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.56 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.54 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.52 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.48 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.46 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.44 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.42 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.40 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.38 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.36 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.32 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.30 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.28 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2; locks; strict; comment @# @; 1.4 date 2015.12.29.23.34.44; author dholland; state Exp; branches; next 1.3; commitid J5mAcuIF0darSTOy; 1.3 date 2006.04.04.16.53.59; author jlam; state Exp; branches; next 1.2; 1.2 date 2001.04.21.01.10.58; author jtb; state Exp; branches; next 1.1; 1.1 date 2001.02.16.05.44.05; author jtb; state Exp; branches; next ; desc @@ 1.4 log @Add patch comments. @ text @$NetBSD: patch-aa,v 1.3 2006/04/04 16:53:59 jlam Exp $ Don't use LTCONFIG_OVERRIDE and let pkgsrc automatically use the pkgsrc-installed libtool. Modify the configure script to grep the libtool we're using for the values of various libtool-derived variables. --- configure.orig 1999-11-05 16:07:44.000000000 -0500 +++ configure @@@@ -3279,14 +3279,16 @@@@ EOF +test -z "$libtool_path" || libtool_path="./libtool" + echo $ac_n "checking grepping libtool to find wl_flag""... $ac_c" 1>&6 echo "configure:3284: checking grepping libtool to find wl_flag" >&5 if eval "test \"`echo '$''{'cim_cv_wl_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -eval `grep wl= libtool` -cim_cv_wl_flag=$pic_flag +eval `grep ^wl= $libtool_path` +cim_cv_wl_flag=$wl fi @@@@ -3303,7 +3305,7 @@@@ if eval "test \"`echo '$''{'cim_cv_link_ echo $ac_n "(cached) $ac_c" 1>&6 else -eval `grep link_static_flag libtool` +eval `grep ^link_static_flag= $libtool_path` cim_cv_link_static_flag=$link_static_flag fi @@@@ -3321,7 +3323,7 @@@@ if eval "test \"`echo '$''{'cim_cv_pic_f echo $ac_n "(cached) $ac_c" 1>&6 else -eval `grep pic_flag libtool` +eval `grep ^pic_flag= $libtool_path` cim_cv_pic_flag=$pic_flag fi @ 1.3 log @* Don't use LTCONFIG_OVERRIDE and let pkgsrc automatically use the pkgsrc-installed libtool. Modify the configure script to grep the libtool we're using for the values of various libtool-derived variables. While here, fix the name of the variable that contains the flags to pass linker options to the compiler. * Drop the use of SUBST_FILES to directly substitute into cimcomp.c and just patch the Makefile to pass the proper flags when compilng. @ text @d1 6 a6 1 $NetBSD$ @ 1.2 log @Patch "configure" rather than "aclocal.m4". @ text @d3 1 a3 1 --- configure.orig Fri Nov 5 21:07:44 1999 d5 9 a13 1 @@@@ -3285,7 +3285,7 @@@@ d18 3 a20 2 +eval `grep ^wl libtool` cim_cv_wl_flag=$pic_flag d23 2 a24 1 @@@@ -3303,7 +3303,7 @@@@ d29 1 a29 1 +eval `grep ^link_static_flag libtool` d33 1 a33 1 @@@@ -3321,7 +3321,7 @@@@ d38 1 a38 1 +eval `grep ^pic_flag libtool` @ 1.1 log @Fix the configuration process to work with the current libtool. Back out previous change. Thanks to Nick Hudson for pointing out the stupidity of my last change. @ text @d3 15 a17 6 --- aclocal.m4.orig Fri Feb 16 05:23:28 2001 +++ aclocal.m4 @@@@ -30,7 +30,7 @@@@ [ AC_MSG_CHECKING(grepping libtool to find link_static_flag) AC_CACHE_VAL(cim_cv_link_static_flag,[ d21 6 a26 6 ]) AC_MSG_RESULT($cim_cv_link_static_flag) @@@@ -41,7 +41,7 @@@@ [ AC_MSG_CHECKING(grepping libtool to find pic_flag) AC_CACHE_VAL(cim_cv_pic_flag,[ d30 2 a31 11 ]) AC_MSG_RESULT($cim_cv_pic_flag) @@@@ -52,7 +52,7 @@@@ [ AC_MSG_CHECKING(grepping libtool to find wl_flag) AC_CACHE_VAL(cim_cv_wl_flag,[ -eval `grep wl= libtool` +eval `grep ^wl= libtool` cim_cv_wl_flag=$pic_flag ]) AC_MSG_RESULT($cim_cv_wl_flag) @