head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.60 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.58 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.56 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.54 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.52 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.50 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.48 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.46 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.44 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.42 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.40 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.38 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.36 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.34 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.32 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.30 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.28 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.26 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.24 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.22 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.20 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.18 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.16 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.14 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.10 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.12 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.8 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.6 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.4 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.2 pkgsrc-2018Q4-base:1.3 pkgsrc-2014Q4:1.1.0.8 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.6 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.4 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.2 pkgsrc-2014Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2018.11.18.12.06.23; author bsiegert; state Exp; branches; next 1.2; commitid sH8mBuPgu4AQ9q0B; 1.2 date 2015.01.16.08.57.46; author wiz; state dead; branches; next 1.1; commitid SONtNNZVp4Tgbe6y; 1.1 date 2014.01.10.09.50.42; author wiz; state Exp; branches; next ; commitid ARPST6ECZtsOoykx; desc @@ 1.3 log @Port mcabber to enchant2, bump revision. @ text @$NetBSD$ Enchant2 support. --- configure.orig 2017-06-04 21:13:23.000000000 +0000 +++ configure @@@@ -16361,12 +16361,12 @@@@ if test -n "$ENCHANT_CFLAGS"; then pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5 - ($PKG_CONFIG --exists --print-errors "enchant") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant" 2>/dev/null` + pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@@@ -16378,12 +16378,12 @@@@ if test -n "$ENCHANT_LIBS"; then pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5 - ($PKG_CONFIG --exists --print-errors "enchant") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant" 2>/dev/null` + pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@@@ -16404,9 +16404,9 @@@@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant" 2>&1` + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant-2" 2>&1` else - ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant" 2>&1` + ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant-2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ENCHANT_PKG_ERRORS" >&5 @ 1.2 log @Update to 0.10.3: mcabber (0.10.3) * [UI] Add option 'iq_time_hide' * [UI] Add 'iq_version_hide', 'iq_version_hide_version' * Improved handling of damaged history log files * Switch to libotr v4 API (Myhailo Danylenko) * Add SSL options (Frank Zschockelt) These options require a patched Loudmouth library. - "ssl_ciphers" to define the allowed ciphers - "ssl_ca" to set additional trusted certificates * Fix compilation for old loudmouth libraries (Frank Zschockelt) * Add 'color_timestamp' to highlight timestamp added by server (Hermitifier) * New python based event script using OS X 10.8 notification center (Sharoon Thomas) * Handle SIGHUP signal (Dominik George) * Misc. bugfixes -- Mikael, 2014-05-08 @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2014/01/10 09:50:42 wiz Exp $ d3 1 a3 1 Fix libotr>=4 detection. d5 1 a5 1 --- configure.orig 2012-12-02 13:30:10.000000000 +0000 d7 30 a36 206 @@@@ -15502,7 +15502,7 @@@@ else fi if test "x$enable_otr" = "xyes"; then - # Look for libgcrypt and libotr + # Look for libgcrypt and libotr # Check whether --with-libgcrypt-prefix was given. if test "${with_libgcrypt_prefix+set}" = set; then : @@@@ -15687,7 +15687,182 @@@@ $as_echo "does not match. want=$req_libg LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - libotr_save_CFLAGS="$CFLAGS" + libotr_save_CFLAGS="$CFLAGS" +libotr_save_LDFLAGS="$LDFLAGS" +libotr_save_LIBS="$LIBS" +libotr_found=yes + + +# Check whether --with-libotr-prefix was given. +if test "${with_libotr_prefix+set}" = set; then : + withval=$with_libotr_prefix; libotr_prefix="$withval" +else + libotr_prefix="" +fi + + + +# Check whether --with-libotr-inc-prefix was given. +if test "${with_libotr_inc_prefix+set}" = set; then : + withval=$with_libotr_inc_prefix; libotr_inc_prefix="$withval" +else + libotr_inc_prefix="" +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libotr CFLAGS" >&5 +$as_echo_n "checking for libotr CFLAGS... " >&6; } +if test "$libotr_inc_prefix" != "" ; then + LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" + CFLAGS="$CFLAGS $LIBOTR_CFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBOTR_CFLAGS" >&5 +$as_echo "$LIBOTR_CFLAGS" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libotr LIBS" >&5 +$as_echo_n "checking for libotr LIBS... " >&6; } +if test "$libotr_prefix" != "" ; then + LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" + LDFLAGS="$LDFLAGS $LIBOTR_LIBS" +fi + +LIBOTR_LIBS="$LIBOTR_LIBS -lotr" +LIBS="$LIBOTR_LIBS $LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBOTR_LIBS" >&5 +$as_echo "$LIBOTR_LIBS" >&6; } + +min_libotr_version=4.0.0 +no_libotr="" + libotr_min_major_version=`echo $min_libotr_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + libotr_min_minor_version=`echo $min_libotr_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + libotr_min_sub_version=`echo $min_libotr_version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libotr headers version $libotr_min_major_version.x >= $min_libotr_version" >&5 +$as_echo_n "checking for libotr headers version $libotr_min_major_version.x >= $min_libotr_version... " >&6; } + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + +# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) +# error not present +# else + +# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) + exit(0); +# else +# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) +# error not present +# endif + +# if(OTRL_VERSION_SUB < $libotr_min_sub_version) +# error not present +# endif +# endif +# endif +exit(0); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5 +$as_echo "found." >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present." >&5 +$as_echo "not present." >&6; } + + libotr_found=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for otrl_message_receiving in -lotr" >&5 +$as_echo_n "checking for otrl_message_receiving in -lotr... " >&6; } +if ${ac_cv_lib_otr_otrl_message_receiving+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lotr $LIBGCRYPT_LIBS + $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char otrl_message_receiving (); +int +main () +{ +return otrl_message_receiving (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_otr_otrl_message_receiving=yes +else + ac_cv_lib_otr_otrl_message_receiving=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_otr_otrl_message_receiving" >&5 +$as_echo "$ac_cv_lib_otr_otrl_message_receiving" >&6; } +if test "x$ac_cv_lib_otr_otrl_message_receiving" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBOTR 1 +_ACEOF + + LIBS="-lotr $LIBS" + +else + + libotr_found=no +fi + + +LDFLAGS="$libotr_save_LDFLAGS" +LIBS="$libotr_save_LIBS" + +if test "x$libotr_found" = "xyes" ; then + + +$as_echo "#define HAVE_LIBOTR 1" >>confdefs.h + + +else + LIBOTR_CFLAGS="" + LIBOTR_LIBS="" + + libotr_save_CFLAGS="$CFLAGS" libotr_save_LDFLAGS="$LDFLAGS" libotr_save_LIBS="$LIBS" libotr_found=yes @@@@ -15853,11 +16028,26 @@@@ LDFLAGS="$libotr_save_LDFLAGS" LIBS="$libotr_save_LIBS" if test "x$libotr_found" = "xyes" ; then - : + + +$as_echo "#define HAVE_LIBOTR 1" >>confdefs.h + + +$as_echo "#define HAVE_LIBOTR3 1" >>confdefs.h + + d38 3 a40 12 LIBOTR_CFLAGS="" LIBOTR_LIBS="" - as_fn_error $? "libotr 3.1.0 or newer is required." "$LINENO" 5 + + as_fn_error $? "libotr 3.1.0 or newer is required." "$LINENO" 5 + +fi + + + + + d42 9 a50 12 @@@@ -15890,7 +16080,8 @@@@ $as_echo "$as_me: WARNING: else LIBGCRYPT_CFLAGS="" LIBGCRYPT_LIBS="" - as_fn_error $? "libgcrypt 1.2.2 or newer is required." "$LINENO" 5 + + as_fn_error $? "libgcrypt 1.2.2 or newer is required." "$LINENO" 5 fi @ 1.1 log @Import mcabber-0.10.2 as chat/mcabber, packaged for wip by kh-p, zul_, khorben, netcap, and jihbed. mcabber is a small Jabber console client, it supports SSL, OTR, MUC, history logging, commands completion and external actions triggers. @ text @d1 1 a1 1 $NetBSD$ @