head 1.8; access; symbols pkgsrc-2015Q3:1.7.0.40 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.38 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.36 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.34 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.32 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.30 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.28 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.26 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.24 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.22 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.20 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.18 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.16 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.14 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.12 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.10 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.8 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.6 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.4 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.2 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.6.0.2 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.5.0.2 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.4.0.4 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.36 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.34 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.32 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.22 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.1.1.1.0.2 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-base:1.1.1.2 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2015.10.24.19.14.16; author joerg; state dead; branches; next 1.7; commitid MGizk3NMP7tIyoGy; 1.7 date 2010.12.22.19.44.24; author chuck; state Exp; branches; next 1.6; 1.6 date 2010.08.18.10.05.08; author obache; state Exp; branches; next 1.5; 1.5 date 2010.06.13.22.45.53; author wiz; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2009.11.29.20.16.20; author joerg; state Exp; branches; next 1.3; 1.3 date 2005.11.07.17.58.00; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.10.11.02.40.21; author ben; state Exp; branches; next 1.1; 1.1 date 2005.08.07.11.27.29; author wiz; state Exp; branches 1.1.1.1; next ; 1.5.2.1 date 2010.08.19.19.51.48; author tron; state Exp; branches; next ; 1.1.1.1 date 2005.08.07.11.27.29; author wiz; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2008.09.22.19.43.11; author joerg; state Exp; branches; next ; desc @@ 1.8 log @Retire wxGTK24. @ text @$NetBSD: patch-aa,v 1.7 2010/12/22 19:44:24 chuck Exp $ --- configure.orig 2003-09-21 07:31:30.000000000 -0400 +++ configure 2010-12-22 13:41:03.000000000 -0500 @@@@ -1247,7 +1247,7 @@@@ DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; - *-*-freebsd*) + *-*-freebsd*|*-*-dragonfly*) USE_BSD=1 USE_FREEBSD=1 cat >> confdefs.h <<\EOF @@@@ -1396,6 +1396,21 @@@@ DEFAULT_DEFAULT_wxUSE_MAC=1 ;; + i386-*-darwin* ) + USE_BSD=1 + USE_DARWIN=1 + SO_SUFFIX=dylib + cat >> confdefs.h <<\EOF +#define __BSD__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __DARWIN__ 1 +EOF + + DEFAULT_DEFAULT_wxUSE_MAC=1 + ;; + *-*-beos* ) USE_BEOS=1 cat >> confdefs.h <<\EOF @@@@ -11436,6 +11451,7 @@@@ SEARCH_INCLUDE="\ + ${BUILDLINK_DIR}/include \ /usr/local/include \ \ /usr/Motif-1.2/include \ @@@@ -11500,7 +11516,7 @@@@ \ /usr/openwin/share/include" -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " +SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" cat > confcache <<\EOF @@@@ -11972,9 +11988,9 @@@@ echo "$ac_t""$ac_cv_header_png_h" 1>&6 if test "$ac_cv_header_png_h" = "yes"; then - echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:11977: checking for png_check_sig in -lpng" >&5 -ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` + echo $ac_n "checking for png_sig_cmp in -lpng""... $ac_c" 1>&6 +echo "configure:11977: checking for png_sig_cmp in -lpng" >&5 +ac_lib_var=`echo png'_'png_sig_cmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -11986,10 +12002,10 @@@@ /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char png_check_sig(); +char png_sig_cmp(); int main() { -png_check_sig() +png_sig_cmp() ; return 0; } EOF if { (eval echo configure:11996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@@@ -13381,6 +13397,101 @@@@ fi fi + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:14533: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for pangox""... $ac_c" 1>&6 +echo "configure:14577: checking for pangox" >&5 + + if $PKG_CONFIG --exists "pangox" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6 +echo "configure:14584: checking PANGOX_CFLAGS" >&5 + PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"` + echo "$ac_t""$PANGOX_CFLAGS" 1>&6 + + echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6 +echo "configure:14589: checking PANGOX_LIBS" >&5 + PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"` + echo "$ac_t""$PANGOX_LIBS" 1>&6 + else + PANGOX_CFLAGS="" + PANGOX_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + + CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS" + LIBS="$LIBS $PANGOX_LIBS" + + else + + { echo "configure: error: pangox library not found, library cannot be compiled in Unicode mode" 1>&2; exit 1; } + + + fi + else if test "$wxUSE_UNICODE" = "yes"; then echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2 @@@@ -16104,8 +16215,8 @@@@ WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" -WXCONFIG_LIBS="-l${WX_LIBRARY}" -WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a" +WXCONFIG_LIBS="-l${WX_LIBRARY_BASENAME}" +WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY_BASENAME}.a" if test "$wxUSE_OPENGL" = "yes"; then WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}" @@@@ -16331,7 +16442,7 @@@@ *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ - *-*-sysv5* ) + *-*-sysv5* | *-*-dragonfly*) ;; *) @@@@ -18668,6 +18779,9 @@@@ THREAD_OPTS="-mt $THREAD_OPTS" fi ;; + *-*-dragonfly*) + THREAD_OPTS="-pthread $THREAD_OPTS" + ;; *-*-freebsd*) THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ;; @@@@ -18751,7 +18865,7 @@@@ LDFLAGS="-L/usr/lib/threads $LDFLAGS" flag="-D_THREAD_SAFE" ;; - *-freebsd*) + *-freebsd* | *-*-dragonfly*) flag="-D_THREAD_SAFE" ;; *-hp-hpux* ) @@@@ -22777,6 +22891,7 @@@@ s%@@WX_LIBRARY_NAME_STATIC@@%$WX_LIBRARY_NAME_STATIC%g s%@@WX_LIBRARY_NAME_SHARED@@%$WX_LIBRARY_NAME_SHARED%g s%@@WX_LIBRARY_BASENAME@@%$WX_LIBRARY_BASENAME%g +s%@@WX_LIBRARY_GL@@%$WX_LIBRARY_GL%g s%@@WX_LIBRARY_IMPORTLIB@@%$WX_LIBRARY_IMPORTLIB%g s%@@WX_TARGET_LIBRARY@@%$WX_TARGET_LIBRARY%g s%@@WX_LIBRARY_LINK1@@%$WX_LIBRARY_LINK1%g @ 1.7 log @make it compile on i386 macox (missing case in configure, cast in dynlib.cpp) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $ @ 1.6 log @Let to use BUILDLINK_DIR first for find header/library files. It should fixes PR#43215. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2010/06/13 22:45:53 wiz Exp $ d3 3 a5 3 --- configure.orig 2003-09-21 11:31:30.000000000 +0000 +++ configure @@@@ -1247,7 +1247,7 @@@@ EOF d14 23 a36 1 @@@@ -11436,6 +11436,7 @@@@ EOF d44 1 a44 1 @@@@ -11500,7 +11501,7 @@@@ SEARCH_INCLUDE="\ d53 1 a53 1 @@@@ -11972,9 +11973,9 @@@@ fi d66 1 a66 1 @@@@ -11986,10 +11987,10 @@@@ cat > conftest.$ac_ext <>confdefs.h <<\_ACEOF @@@@ -23445,7 +23445,8 @@@@ SEARCH_INCLUDE="\ /usr/XFree86/include/X11 \ /usr/pkg/include \ d13 2 a14 41 echo "$as_me:$LINENO: checking for libraries directory" >&5 echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6 @@@@ -36663,6 +36664,9 @@@@ echo "$as_me: WARNING: BeOS threads are THREAD_OPTS="-mt $THREAD_OPTS" fi ;; + *-*-dragonfly*) + THREAD_OPTS="-pthread $THREAD_OPTS" + ;; *-*-freebsd*) THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ;; @@@@ -36797,7 +36801,7 @@@@ echo $ECHO_N "checking if more special f LDFLAGS="-L/usr/lib/threads $LDFLAGS" flag="-D_THREAD_SAFE" ;; - *-freebsd*) + *-freebsd*|*-*-dragonfly*) flag="-D_THREAD_SAFE" ;; *-hp-hpux* ) @@@@ -42959,7 +42963,7 @@@@ echo "$as_me: WARNING: GStreamer install - if test "x$GST_INSPECT" == "x"; then + if test "x$GST_INSPECT" = "x"; then # Extract the first word of "gst-inspect", so it can be a program name with args. set dummy gst-inspect; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@@@ -44788,7 +44792,7 @@@@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6 SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" fi - if test "x$GCC" == "xyes"; then + if test "x$GCC" = "xyes"; then PIC_FLAG="-dynamic -fPIC" fi if test "x$XLCC" = "xyes"; then @@@@ -45354,7 +45358,7 @@@@ EOF ;; a15 8 powerpc-apple-macos* | \ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-dragonfly* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ @@@@ -45396,7 +45400,7 @@@@ echo "$as_me: error: unknown system type SONAME_FLAG= d17 20 a36 6 case "${BAKEFILE_HOST}" in - *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) + *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu | *-*-dragonfly*) SONAME_FLAG="-Wl,-soname," USE_SOVERSION=1 USE_SOVERLINUX=1 @