head	1.15;
access;
symbols
	RELEASE_8_3_0:1.15
	RELEASE_9_0_0:1.14
	RELEASE_7_4_0:1.14
	RELEASE_8_2_0:1.14
	RELEASE_6_EOL:1.13
	RELEASE_7_2_0:1.11
	RELEASE_7_1_0:1.9
	RELEASE_6_4_0:1.9
	RELEASE_5_EOL:1.9
	RELEASE_7_0_0:1.8
	RELEASE_6_3_0:1.8
	PRE_XORG_7:1.7
	RELEASE_4_EOL:1.6
	RELEASE_6_2_0:1.6
	RELEASE_5_5_0:1.5
	RELEASE_6_1_0:1.5
	RELEASE_6_0_0:1.4
	RELEASE_5_4_0:1.4
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.2
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1
	RELEASE_4_8_0:1.1
	RELEASE_5_0_0:1.1
	RELEASE_4_7_0:1.1;
locks; strict;
comment	@# @;


1.15
date	2012.03.03.08.05.19;	author sunpoet;	state Exp;
branches;
next	1.14;

1.14
date	2010.12.19.20.04.23;	author roam;	state Exp;
branches;
next	1.13;

1.13
date	2010.09.12.21.05.48;	author roam;	state Exp;
branches;
next	1.12;

1.12
date	2009.05.19.13.43.45;	author roam;	state dead;
branches;
next	1.11;

1.11
date	2009.03.07.03.57.38;	author roam;	state Exp;
branches;
next	1.10;

1.10
date	2009.01.23.15.40.33;	author roam;	state Exp;
branches;
next	1.9;

1.9
date	2008.04.23.11.33.34;	author roam;	state Exp;
branches;
next	1.8;

1.8
date	2007.08.27.15.44.22;	author roam;	state Exp;
branches;
next	1.7;

1.7
date	2007.03.09.14.45.32;	author roam;	state Exp;
branches;
next	1.6;

1.6
date	2006.07.13.08.54.04;	author roam;	state Exp;
branches;
next	1.5;

1.5
date	2005.09.05.18.12.41;	author roam;	state Exp;
branches;
next	1.4;

1.4
date	2005.03.12.02.36.52;	author roam;	state Exp;
branches;
next	1.3;

1.3
date	2004.12.21.09.51.09;	author roam;	state Exp;
branches;
next	1.2;

1.2
date	2004.04.09.12.14.13;	author roam;	state Exp;
branches;
next	1.1;

1.1
date	2002.06.24.16.03.00;	author roam;	state Exp;
branches;
next	;


desc
@@


1.15
log
@- Update to 7.24.0

Changes:	http://curl.haxx.se/changes.html
@
text
@Description: Tweak the build for a FreeBSD environment.
 Respect user-supplied CFLAGS
 Use the FreeBSD location of pkg-config's library directory.
 Check for librtmp in sensible locations in all cases.
Forwarded: not-needed
Author: Peter Pentchev <roam@@FreeBSD.org>
Last-Update: 2010-12-19

--- configure.orig	2012-02-26 17:52:21.904908587 +0800
+++ configure	2012-02-26 17:52:21.929909948 +0800
@@@@ -15049,10 +15049,10 @@@@
     flags_dbg_all="$flags_dbg_all -gdwarf-2"
     flags_dbg_all="$flags_dbg_all -gvms"
     flags_dbg_yes="-g"
-    flags_dbg_off="-g0"
+    flags_dbg_off=""
     flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
     flags_opt_yes="-O2"
-    flags_opt_off="-O0"
+    flags_opt_off=""
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@@@ -15892,6 +15892,9 @@@@
     tmp_CFLAGS="$CFLAGS"
     tmp_CPPFLAGS="$CPPFLAGS"
 
+# Do not remove the user-supplied debug flags in CFLAGS
+# PR: 150854
+if false; then
     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
@@@@ -15922,6 +15925,7 @@@@
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS
+fi
 
     #
     if test "$want_debug" = "yes"; then
@@@@ -16139,6 +16143,9 @@@@
     #
     if test "$honor_optimize_option" = "yes"; then
 
+# Do not remove the user-supplied optimization flags in CFLAGS
+# PR: 150854
+if false; then
     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
@@@@ -16169,6 +16176,7 @@@@
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS
+fi
 
       if test "$want_optimize" = "yes"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
@@@@ -20137,7 +20145,8 @@@@
         PKGTEST="no"
     PREFIX_OPENSSL=$OPT_SSL
 
-                OPENSSL_PCDIR="$OPT_SSL/lib/pkgconfig"
+                # Use the FreeBSD location of the pkg-config libdir
+                OPENSSL_PCDIR="$LOCALBASE/libdata/pkgconfig"
     { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5
 $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;}
     if test -f "$OPENSSL_PCDIR/openssl.pc"; then
@@@@ -23231,29 +23240,30 @@@@
     ;;
   off)
         LIB_RTMP="-lrtmp"
+        LD_RTMP=""
+        CPP_RTMP=""
+        DIR_RTMP=""
     ;;
   *)
         PREFIX_RTMP=$OPT_LIBRTMP
+        LIB_RTMP="-lrtmp"
+        LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
+        CPP_RTMP=-I${PREFIX_RTMP}/include
+        DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
     ;;
   esac
 
-    if test -n "$PREFIX_RTMP"; then
-    LD_RTMP=-L${PREFIX_RTMP}/lib$libsuff
-    CPP_RTMP=-I${PREFIX_RTMP}/include
-    DIR_RTMP=${PREFIX_RTMP}/lib$libsuff
-  fi
-
   LDFLAGS="$LDFLAGS $LD_RTMP"
   CPPFLAGS="$CPPFLAGS $CPP_RTMP"
   LIBS="$LIBS $LIB_RTMP"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
-$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
+$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; }
 if test "${ac_cv_lib_rtmp_RTMP_Init+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrtmp  $LIBS"
+LIBS="$LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@


1.14
log
@Update cURL to 7.21.3 and fix its librtmp detection.  In the process:
- disable the -Werror build option by popular demand
- do not override the user's debug and optimization settings

PR:		150854 (the debug and optimization CFLAGS)
Reported by:	Anonymous <swell.k@@gmail.com>
@
text
@d9 3
a11 3
--- a/configure
+++ b/configure
@@@@ -14201,10 +14201,10 @@@@
d24 1
a24 1
@@@@ -15041,6 +15041,9 @@@@
d34 1
a34 1
@@@@ -15071,6 +15074,7 @@@@
d42 1
a42 1
@@@@ -15283,6 +15287,9 @@@@
d52 1
a52 1
@@@@ -15313,6 +15320,7 @@@@
d60 1
a60 1
@@@@ -19224,7 +19232,8 @@@@
d69 2
a70 2
     if test -e "$OPENSSL_PCDIR/openssl.pc"; then
@@@@ -21264,29 +21273,30 @@@@
@


1.13
log
@Update to curl-7.21.1; in the process:
- add a knob for the compiler's -Werror checking, on by default
- add a knob for RTMP streams support
- reflect reality: actually disable the diagnostic memory tracking
  if the user has turned the knob off!
- fix a bashism in the configure script
- remove two patches to the test framework that were integrated upstream
@
text
@d1 5
a5 2
Description: Fix a bashism - "test" uses "=", not "==".
Forwarded: http://sourceforge.net/tracker/?func=detail&aid=3064939&group_id=976&atid=100976
d7 1
a7 1
Last-Update: 2010-09-12
d11 16
a26 1
@@@@ -2992,7 +2992,7 @@@@
d28 11
d40 69
a108 5
 CURL_CFLAG_EXTRAS=""
-if test X"$want_werror" == Xyes; then
+if test X"$want_werror" = Xyes; then
   CURL_CFLAG_EXTRAS="-Werror"
 fi
@


1.12
log
@Update to curl-7.19.5.
@
text
@d1 4
a4 2
Do not needlessly add /usr/include and /usr/lib to the compiler and
linker flags if the base system OpenSSL is used.
d8 9
a16 9
@@@@ -23435,7 +23435,7 @@@@
         PKGTEST="no"
     PREFIX_OPENSSL=$OPT_SSL
     LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
-    if  "$PREFIX_OPENSSL" != "/usr"  ; then
+    if [ "$PREFIX_OPENSSL" != "/usr" ] ; then
       LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
       CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
     fi
@


1.11
log
@Update to curl-7.19.4, which fixes a redirection vulnerability.
The changes in the patch files are almost the same as in Eugene's PR,
although I arrived at them mostly independently :)
Reformat all patch files now that I use quilt to manage them.
Fix two complaints from portlint: needless use of CFLAGS and differentiation
between NOPORTDOCS and NOPORTEXAMPLES.  Thanks, Eugene!

PR:		132358
Submitted by:	Eygene Ryabinkin <rea-fbsd@@codelabs.ru>
@
text
@@


1.10
log
@At long last, update the curl port to its almost-current version, 7.19.2.
Yes, there's been a new 7.19.3 version for a couple of days now,
but I figure you folks have been waiting for me much too much as it is :(
Apologies all around!

Prompted by:	several PR's and more people (and portmgrs) than I dare admit
@
text
@d1 6
a6 4
diff -urN -x .svn ../../vendor/curl/configure ./configure
--- ../../vendor/curl/configure	2008-11-02 00:09:51.000000000 +0200
+++ ./configure	2009-01-21 16:12:08.000000000 +0200
@@@@ -32237,8 +32237,10 @@@@
d10 5
a14 7
+    if ! [ "$PREFIX_OPENSSL" = "/usr" ]; then
     LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
     CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
+    fi
     ;;
   esac
 
@


1.9
log
@Update to curl-7.18.0.
@
text
@d2 3
a4 21
--- ../../vendor/curl/configure	2008-03-20 15:23:26.000000000 +0200
+++ ./configure	2008-03-20 23:55:32.000000000 +0200
@@@@ -5488,7 +5488,7 @@@@
 { echo "$as_me:$LINENO: checking if arch-OS host is AMD64-linux (to build static libraries with PIC)" >&5
 echo $ECHO_N "checking if arch-OS host is AMD64-linux (to build static libraries with PIC)... $ECHO_C" >&6; }
 case $host in
-  x86_64*linux*)
+  x86_64*linux*|amd64*freebsd*|ia64*freebsd*)
     { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
     with_pic=yes
@@@@ -20913,7 +20913,7 @@@@
 
 case $host in
   #
-  x86_64*linux*)
+  x86_64*linux*|amd64*freebsd*|ia64*freebsd*)
     #
         if test "z$ICC" = "z"; then
 
@@@@ -25496,8 +25496,10 @@@@
@


1.8
log
@Update to curl-7.16.3.
Fix the (still present in 7.16.3) libssh2 problems, at least so that
cURL works with the libssh2 0.17 in our ports tree.

PR:		114215 (the basic update)
Submitted by:	pesho.petrov@@gmail.com
@
text
@d1 4
a4 3
--- configure.old	Fri Apr 13 18:29:31 2007
+++ configure	Fri Apr 13 18:29:33 2007
@@@@ -5497,7 +5497,7 @@@@
d13 10
a22 1
@@@@ -24467,8 +24467,10 @@@@
@


1.7
log
@Update to curl 7.16.1, loosely based on the PR.  Also:
- add a LIBSSH2 option for SCP and SFTP support using security/libssh2;
- add a patch from the cURL CVS repository to fix an expired cookie in
  test 62.

PR:		109670
Submitted by:	Eygene Ryabinkin <rea-fbsd@@codelabs.ru>
@
text
@d1 12
a12 3
--- configure.orig	Thu Jun  8 09:12:53 2006
+++ configure	Wed Jul 12 16:44:43 2006
@@@@ -26690,8 +26690,10 @@@@
@


1.6
log
@Update to 7.15.4, mostly by Vasil Dimov's PR.
In addition, OPTIONS'ify everything but OpenSSL support.

PR:		99050
Submitted by:	vd
@
text
@a13 9
@@@@ -35638,7 +35640,7 @@@@
 main ()
 {
 #ifndef basename
-  char *p = (char *) basename;
+  char *(*p)(const char *) = basename;
   return !p;
 #endif
 
@


1.5
log
@Update to 7.14.1.
@
text
@d1 3
a3 3
--- configure.orig	Fri Sep  2 20:22:43 2005
+++ configure	Fri Sep  2 20:37:36 2005
@@@@ -24917,8 +24917,10 @@@@
d14 1
a14 1
@@@@ -32576,7 +32578,7 @@@@
d20 1
a22 1
   ;
@


1.4
log
@Update to curl 7.13.1, which also takes care of the recent security
issue.
@
text
@d1 3
a3 4
--- configure.orig	Mon Dec 20 11:39:59 2004
+++ configure	Thu Feb 17 19:07:53 2005
@@@@ -24438,8 +24438,10 @@@@
   *)
d5 5
a9 4
     EXTRA_SSL=$OPT_SSL
+    if ! [ "$EXTRA_SSL" = "/usr" ]; then
     LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
     CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
d14 1
a14 1
@@@@ -31950,7 +31952,7 @@@@
@


1.3
log
@Update to curl-7.12.3 (yes, we skipped 7.12.2 for various reasons).
Explicitly disable libidn support so that it is not even probed if libidn
is installed; I will look into enabling it after some more testing.

Testing paid off on:	ref4 (lib/select.c), sledge (lib/sendf.c)
@
text
@d1 3
a3 3
--- configure.orig	Mon Oct 18 01:22:10 2004
+++ configure	Mon Dec 13 14:59:23 2004
@@@@ -24217,8 +24217,10 @@@@
d14 9
@


1.2
log
@Update to curl 7.11.1.
@
text
@d1 3
a3 4
--- configure.orig	Fri Apr  9 14:00:52 2004
+++ configure	Fri Apr  9 14:01:29 2004
@@@@ -24123,8 +24123,10 @@@@
     EXTRA_SSL= ;;
d5 3
a7 2
         EXTRA_SSL=$OPT_SSL
+    if [ ! "$EXTRA_SSL" = "/usr" ]; then
@


1.1
log
@Fix a segfault in an IPv4-only case - realloc() may really, well,
"reallocate" memory even when the programmer only asks for a resizing
of the region.

Reported by:	Steve Ames <steve@@energistic.com>

While I'm here, change the way SSL header and library paths are handled
to avoid specifically referencing /usr/lib and /usr/include; while
-STABLE's GCC shrugs this off, GCC 3.1 whines loudly about an explicit
-I/usr/include (and rightly so, IMHO).
@
text
@d1 3
a3 3
--- configure.curl	Mon Jun 24 17:23:46 2002
+++ configure	Mon Jun 24 17:24:10 2002
@@@@ -9868,8 +9868,10 @@@@
d8 1
a8 1
     LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
@

