[Midnightbsd-cvs] mports: net-p2p/transmission: update to 1.21

crash at midnightbsd.org crash at midnightbsd.org
Fri May 23 10:19:07 EDT 2008


Log Message:
-----------
update to 1.21

Modified Files:
--------------
    mports/net-p2p/transmission:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
    mports/net-p2p/transmission/files:
        patch-configure (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net-p2p/transmission/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-p2p/transmission/Makefile -L net-p2p/transmission/Makefile -u -r1.1 -r1.2
--- net-p2p/transmission/Makefile
+++ net-p2p/transmission/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	transmission
-PORTVERSION=	1.06
+PORTVERSION=	1.21
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 
@@ -15,6 +15,8 @@
 COMMENT?=	A free BitTorrent client written from scratch in C
 LICENSE=	mit
 
+LIB_DEPENDS=    curl.4:${PORTSDIR}/ftp/curl
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME?=	gnometarget intlhack
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net-p2p/transmission/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-p2p/transmission/distinfo -L net-p2p/transmission/distinfo -u -r1.1 -r1.2
--- net-p2p/transmission/distinfo
+++ net-p2p/transmission/distinfo
@@ -1,3 +1,3 @@
-MD5 (transmission-1.06.tar.bz2) = 471e4bd40e1464067a3e266ecf3cb724
-SHA256 (transmission-1.06.tar.bz2) = 44cffabf577f76ebef10405e337c55cac2a00644551dab8f68de2856f2147786
-SIZE (transmission-1.06.tar.bz2) = 4232766
+MD5 (transmission-1.21.tar.bz2) = 6ec565ac831484098a2db20ea0ca3ac7
+SHA256 (transmission-1.21.tar.bz2) = 4729dc752b6ce8d70c504c12839d9047df32eefc5dca545fff6eeb858487d157
+SIZE (transmission-1.21.tar.bz2) = 3978180
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/net-p2p/transmission/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-p2p/transmission/files/patch-configure -L net-p2p/transmission/files/patch-configure -u -r1.1 -r1.2
--- net-p2p/transmission/files/patch-configure
+++ net-p2p/transmission/files/patch-configure
@@ -1,28 +1,24 @@
---- configure.orig	Tue Feb 26 22:02:25 2008
-+++ configure	Sat Mar 15 17:26:02 2008
-@@ -880,11 +880,9 @@
- PTHREAD_CC
+--- configure.orig	2008-05-09 16:26:19.000000000 -0500
++++ configure	2008-05-09 16:27:32.000000000 -0500
+@@ -885,8 +885,6 @@
  PTHREAD_LIBS
  PTHREAD_CFLAGS
--PKG_CONFIG
+ PKG_CONFIG
 -OPENSSL_CFLAGS
 -OPENSSL_LIBS
+ LIBCURL_CFLAGS
+ LIBCURL_LIBS
  subdirs
- LIBEVENT_CPPFLAGS
-+PKG_CONFIG
- GTK_CFLAGS
- GTK_LIBS
- WITH_GTK_TRUE
-@@ -971,8 +969,6 @@
+@@ -985,8 +983,6 @@
  F77
  FFLAGS
  PKG_CONFIG
 -OPENSSL_CFLAGS
 -OPENSSL_LIBS
+ LIBCURL_CFLAGS
+ LIBCURL_LIBS
  GTK_CFLAGS
- GTK_LIBS'
- ac_subdirs_all='third-party/libevent'
-@@ -1593,10 +1589,6 @@
+@@ -1620,10 +1616,6 @@
    F77         Fortran 77 compiler command
    FFLAGS      Fortran 77 compiler flags
    PKG_CONFIG  path to pkg-config utility
@@ -30,253 +26,180 @@
 -              C compiler flags for OPENSSL, overriding pkg-config
 -  OPENSSL_LIBS
 -              linker flags for OPENSSL, overriding pkg-config
-   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
-   GTK_LIBS    linker flags for GTK, overriding pkg-config
- 
-@@ -4322,13 +4314,13 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | dragonfly*)
-+midnightbsd* | freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (MidnightBSD|FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -4501,7 +4493,7 @@
+   LIBCURL_CFLAGS
+               C compiler flags for LIBCURL, overriding pkg-config
+   LIBCURL_LIBS
+@@ -4542,7 +4534,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4504 "configure"' > conftest.$ac_ext
-+  echo '#line 4496 "configure"' > conftest.$ac_ext
+-  echo '#line 4545 "configure"' > conftest.$ac_ext
++  echo '#line 4537 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7244,11 +7236,11 @@
+@@ -7285,11 +7277,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7247: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7239: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7288: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7280: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7251: \$? = $ac_status" >&5
-+   echo "$as_me:7243: \$? = $ac_status" >&5
+-   echo "$as_me:7292: \$? = $ac_status" >&5
++   echo "$as_me:7284: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7534,11 +7526,11 @@
+@@ -7575,11 +7567,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7537: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7529: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7570: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7541: \$? = $ac_status" >&5
-+   echo "$as_me:7533: \$? = $ac_status" >&5
+-   echo "$as_me:7582: \$? = $ac_status" >&5
++   echo "$as_me:7574: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -7638,11 +7630,11 @@
+@@ -7679,11 +7671,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7641: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7633: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7682: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7674: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:7645: \$? = $ac_status" >&5
-+   echo "$as_me:7637: \$? = $ac_status" >&5
+-   echo "$as_me:7686: \$? = $ac_status" >&5
++   echo "$as_me:7678: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -8349,7 +8341,7 @@
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | dragonfly*)
-+    midnightbsd* | freebsd* | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -9989,7 +9981,7 @@
+@@ -10030,7 +10022,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9992 "configure"
-+#line 9984 "configure"
+-#line 10033 "configure"
++#line 10025 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10089,7 +10081,7 @@
+@@ -10130,7 +10122,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 10092 "configure"
-+#line 10084 "configure"
+-#line 10133 "configure"
++#line 10125 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11417,7 +11409,7 @@
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | dragonfly*)
-+  midnightbsd* | freebsd* | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -12306,7 +12298,7 @@
- 	    ;;
- 	esac
- 	;;
--      freebsd* | dragonfly*)
-+      midnightbsd* | freebsd* | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -12509,11 +12501,11 @@
+@@ -12550,11 +12542,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12512: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12504: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12553: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12545: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:12516: \$? = $ac_status" >&5
-+   echo "$as_me:12508: \$? = $ac_status" >&5
+-   echo "$as_me:12557: \$? = $ac_status" >&5
++   echo "$as_me:12549: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -12613,11 +12605,11 @@
+@@ -12654,11 +12646,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12616: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12608: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12657: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12649: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12620: \$? = $ac_status" >&5
-+   echo "$as_me:12612: \$? = $ac_status" >&5
+-   echo "$as_me:12661: \$? = $ac_status" >&5
++   echo "$as_me:12653: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -14177,11 +14169,11 @@
+@@ -14218,11 +14210,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14180: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14172: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14221: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14213: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14184: \$? = $ac_status" >&5
-+   echo "$as_me:14176: \$? = $ac_status" >&5
+-   echo "$as_me:14225: \$? = $ac_status" >&5
++   echo "$as_me:14217: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14281,11 +14273,11 @@
+@@ -14322,11 +14314,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14284: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14276: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14325: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14317: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14288: \$? = $ac_status" >&5
-+   echo "$as_me:14280: \$? = $ac_status" >&5
+-   echo "$as_me:14329: \$? = $ac_status" >&5
++   echo "$as_me:14321: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16470,11 +16462,11 @@
+@@ -16511,11 +16503,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16473: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16465: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16514: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16506: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16477: \$? = $ac_status" >&5
-+   echo "$as_me:16469: \$? = $ac_status" >&5
+-   echo "$as_me:16518: \$? = $ac_status" >&5
++   echo "$as_me:16510: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16760,11 +16752,11 @@
+@@ -16801,11 +16793,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16763: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16755: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16804: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16796: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16767: \$? = $ac_status" >&5
-+   echo "$as_me:16759: \$? = $ac_status" >&5
+-   echo "$as_me:16808: \$? = $ac_status" >&5
++   echo "$as_me:16800: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16864,11 +16856,11 @@
+@@ -16905,11 +16897,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16867: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16859: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16908: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16900: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16871: \$? = $ac_status" >&5
-+   echo "$as_me:16863: \$? = $ac_status" >&5
+-   echo "$as_me:16912: \$? = $ac_status" >&5
++   echo "$as_me:16904: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -20783,8 +20775,8 @@
- 
- 
- if test "x$GCC" = "xyes" ; then
--    CFLAGS="-g -Wall -W -O3 -funroll-loops"
--    CXXFLAGS="-g -Wall -W -O3 -funroll-loops"
-+    CFLAGS="-O2 -fno-strict-aliasing -pipe  -Wall -W"
-+    CXXFLAGS="-O2 -fno-strict-aliasing -pipe -Wall -W"
+@@ -22377,6 +22369,148 @@
  fi
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-@@ -21826,7 +21818,7 @@
- # which indicates that we try without any flags at all, and "pthread-config"
- # which is a program returning the flags for the Pth emulation library.
- 
--acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+acx_pthread_flags="-pthread"
- 
- # The ordering *is* (sometimes) important.  Some notes on the
- # individual items follow:
-@@ -21859,7 +21851,7 @@
-         # who knows whether they'll stub that too in a future libc.)  So,
-         # we'll just look for -pthreads and -lpthread first:
  
--        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-+        acx_pthread_flags="-pthread"
-         ;;
- esac
  
-@@ -22161,6 +22153,148 @@
- 
- 
- 
-+
 +{ echo "$as_me:$LINENO: checking for CRYPTO_new_ex_data in -lcrypto" >&5
 +echo $ECHO_N "checking for CRYPTO_new_ex_data in -lcrypto... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_crypto_CRYPTO_new_ex_data+set}" = set; then
@@ -418,134 +341,14 @@
 +
 +fi
 +
- { echo "$as_me:$LINENO: checking for library containing socket" >&5
- echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
- if test "${ac_cv_search_socket+set}" = set; then
-@@ -22328,237 +22462,6 @@
- fi
++
  
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+@@ -22498,117 +22632,6 @@
+ fi
  
--
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--	if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
--set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_path_PKG_CONFIG"; then
--  ac_pt_PKG_CONFIG=$PKG_CONFIG
--  # Extract the first word of "pkg-config", so it can be a program name with args.
--set dummy pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $ac_pt_PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--  if test "x$ac_pt_PKG_CONFIG" = x; then
--    PKG_CONFIG=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
--    PKG_CONFIG=$ac_pt_PKG_CONFIG
--  fi
--else
--  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
--fi
--
--fi
--if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=0.9.0
--	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
--	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	else
--		{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--		PKG_CONFIG=""
--	fi
--
--fi
--
--pkg_failed=no
+ pkg_failed=no
 -{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
 -echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
 -
@@ -554,12 +357,12 @@
 -        pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
 -    else
 -        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.4\"") >&5
--  ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.4") 2>&5
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl >= \$OPENSSL_MINIMUM\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "openssl >= $OPENSSL_MINIMUM") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
--  pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.4" 2>/dev/null`
+-  pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= $OPENSSL_MINIMUM" 2>/dev/null`
 -else
 -  pkg_failed=yes
 -fi
@@ -572,12 +375,12 @@
 -        pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
 -    else
 -        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.4\"") >&5
--  ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.4") 2>&5
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl >= \$OPENSSL_MINIMUM\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "openssl >= $OPENSSL_MINIMUM") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
--  pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.4" 2>/dev/null`
+-  pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= $OPENSSL_MINIMUM" 2>/dev/null`
 -else
 -  pkg_failed=yes
 -fi
@@ -596,14 +399,14 @@
 -        _pkg_short_errors_supported=no
 -fi
 -        if test $_pkg_short_errors_supported = yes; then
--	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl >= 0.9.4"`
+-	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl >= $OPENSSL_MINIMUM"`
 -        else
--	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= 0.9.4"`
+-	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= $OPENSSL_MINIMUM"`
 -        fi
 -	# Put the nasty error message in config.log where it belongs
 -	echo "$OPENSSL_PKG_ERRORS" >&5
 -
--	{ { echo "$as_me:$LINENO: error: Package requirements (openssl >= 0.9.4) were not met:
+-	{ { echo "$as_me:$LINENO: error: Package requirements (openssl >= $OPENSSL_MINIMUM) were not met:
 -
 -$OPENSSL_PKG_ERRORS
 -
@@ -614,7 +417,7 @@
 -and OPENSSL_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -" >&5
--echo "$as_me: error: Package requirements (openssl >= 0.9.4) were not met:
+-echo "$as_me: error: Package requirements (openssl >= $OPENSSL_MINIMUM) were not met:
 -
 -$OPENSSL_PKG_ERRORS
 -
@@ -656,155 +459,41 @@
 -	:
 -fi
 -
- # Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then
-   enableval=$enable_largefile;
-@@ -23027,6 +22930,126 @@
- 
- have_gtk=yes
+-pkg_failed=no
+ { echo "$as_me:$LINENO: checking for LIBCURL" >&5
+ echo $ECHO_N "checking for LIBCURL... $ECHO_C" >&6; }
  
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
-+else
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	else
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+		PKG_CONFIG=""
-+	fi
-+
-+fi
-+
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GTK" >&5
- echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
-@@ -26480,11 +26503,9 @@
- PTHREAD_CC!$PTHREAD_CC$ac_delim
+@@ -27105,8 +27128,6 @@
  PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim
  PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim
--PKG_CONFIG!$PKG_CONFIG$ac_delim
+ PKG_CONFIG!$PKG_CONFIG$ac_delim
 -OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim
 -OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
+ LIBCURL_CFLAGS!$LIBCURL_CFLAGS$ac_delim
+ LIBCURL_LIBS!$LIBCURL_LIBS$ac_delim
  subdirs!$subdirs$ac_delim
- LIBEVENT_CPPFLAGS!$LIBEVENT_CPPFLAGS$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
- GTK_CFLAGS!$GTK_CFLAGS$ac_delim
- GTK_LIBS!$GTK_LIBS$ac_delim
- WITH_GTK_TRUE!$WITH_GTK_TRUE$ac_delim
-@@ -26556,7 +26577,7 @@
+@@ -27183,6 +27204,8 @@
+ BUILD_CLI_TRUE!$BUILD_CLI_TRUE$ac_delim
+ BUILD_CLI_FALSE!$BUILD_CLI_FALSE$ac_delim
+ BUILD_DARWIN_TRUE!$BUILD_DARWIN_TRUE$ac_delim
++BUILD_DARWIN_FALSE!$BUILD_DARWIN_FALSE$ac_delim
++BUILD_DAEMON_TRUE!$BUILD_DAEMON_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -27224,14 +27247,12 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
+-BUILD_DARWIN_FALSE!$BUILD_DARWIN_FALSE$ac_delim
+-BUILD_DAEMON_TRUE!$BUILD_DAEMON_TRUE$ac_delim
+ BUILD_DAEMON_FALSE!$BUILD_DAEMON_FALSE$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5


More information about the Midnightbsd-cvs mailing list