Attachment #228016 for bug #258608

View | Details | Raw Unified | Return to bug 258608
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/ftp/curl/Makefile (-1 / +1 lines)
1	# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>	1	# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
2		2
3	PORTNAME= curl	3	PORTNAME= curl
4	PORTVERSION= 7.78.0	4	PORTVERSION= 7.79.0
5	CATEGORIES= ftp net www	5	CATEGORIES= ftp net www
6	MASTER_SITES= https://curl.se/download/ \	6	MASTER_SITES= https://curl.se/download/ \
7	https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S\|.\|_\|g}/	7	https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S\|.\|_\|g}/

Lines 1-3 Link Here

(-)b/ftp/curl/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1626891030	1	TIMESTAMP = 1632072404
2	SHA256 (curl-7.78.0.tar.xz) = be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5	2	SHA256 (curl-7.79.0.tar.xz) = 2a1420076f9ffc35c982c78e85b7a69e2ef5d532267895fdb2eac16ad9b680c9
3	SIZE (curl-7.78.0.tar.xz) = 2440640	3	SIZE (curl-7.79.0.tar.xz) = 2463072




--- configure.orig	2021-09-13 14:46:32 UTC
+++ configure
@@ -4161,9 +4161,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be 
       -I*)
         xc_bad_var_ldflags=yes
         ;;

     esac
   done
   if test $xc_bad_var_ldflags = yes; then
@@ -4233,9 +4234,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use 
   xc_bad_var_cflags=no
   for xc_word in $CFLAGS; do
     case "$xc_word" in

       -U*)
         xc_bad_var_cflags=yes
         ;;
@@ -18092,6 +18094,8 @@ printf "%s\n" "$honor_optimize_option" >&6; }
     #
     if test "$honor_optimize_option" = "yes"; then
 

     ac_var_stripped=""
   for word1 in $tmp_CFLAGS; do
     ac_var_strip_word="no"
@@ -18122,6 +18126,7 @@ printf "%s\n" "$honor_optimize_option" >&6; }
   done
     tmp_CPPFLAGS="$ac_var_stripped"
   squeeze tmp_CPPFLAGS
+fi
 
       if test "$want_optimize" = "yes"; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
@@ -29490,31 +29495,31 @@ printf "%s\n" "found" >&6; }
     ;;
   off)
         LIB_RTMP="-lrtmp"

   CPPFLAGS="$CPPFLAGS $CPP_RTMP"
   LIBS="$LIB_RTMP $LIBS"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
-printf %s "checking for RTMP_Init in -lrtmp... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
+printf %s "checking for RTMP_Init in $LIB_RTMP... " >&6; }
 if test ${ac_cv_lib_rtmp_RTMP_Init+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrtmp  $LIBS"
+LIBS="$LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -46199,9 +46204,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be 
       -I*)
         xc_bad_var_ldflags=yes
         ;;

     esac
   done
   if test $xc_bad_var_ldflags = yes; then
@@ -46271,9 +46277,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use 
   xc_bad_var_cflags=no
   for xc_word in $CFLAGS; do
     case "$xc_word" in
- 

Return to bug 258608

Lines 1-6 Link Here

(-)b/ftp/curl/files/patch-configure (-17 / +17 lines)
1	--- configure.orig 2021-07-19 12:47:17 UTC	1	--- configure.orig 2021-09-13 14:46:32 UTC
2	+++ configure	2	+++ configure
3	@@ -3738,9 +3738,10 @@ $as_echo "$as_me: LIBS note: LIBS should only be used	3	@@ -4161,9 +4161,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be
4	-I*)	4	-I*)
5	xc_bad_var_ldflags=yes	5	xc_bad_var_ldflags=yes
6	;;	6	;;
Lines 14-20 Link Here
14	esac	14	esac
15	done	15	done
16	if test $xc_bad_var_ldflags = yes; then	16	if test $xc_bad_var_ldflags = yes; then
17	@@ -3810,9 +3811,10 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS	17	@@ -4233,9 +4234,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use
18	xc_bad_var_cflags=no	18	xc_bad_var_cflags=no
19	for xc_word in $CFLAGS; do	19	for xc_word in $CFLAGS; do
20	case "$xc_word" in	20	case "$xc_word" in
Lines 28-34 Link Here
28	-U*)	28	-U*)
29	xc_bad_var_cflags=yes	29	xc_bad_var_cflags=yes
30	;;	30	;;
31	@@ -17213,6 +17215,8 @@ $as_echo "$honor_optimize_option" >&6; }	31	@@ -18092,6 +18094,8 @@ printf "%s\n" "$honor_optimize_option" >&6; }
32	#	32	#
33	if test "$honor_optimize_option" = "yes"; then	33	if test "$honor_optimize_option" = "yes"; then
34		34
Lines 37-51 Link Here
37	ac_var_stripped=""	37	ac_var_stripped=""
38	for word1 in $tmp_CFLAGS; do	38	for word1 in $tmp_CFLAGS; do
39	ac_var_strip_word="no"	39	ac_var_strip_word="no"
40	@@ -17243,6 +17247,7 @@ $as_echo "$honor_optimize_option" >&6; }	40	@@ -18122,6 +18126,7 @@ printf "%s\n" "$honor_optimize_option" >&6; }
41	done	41	done
42	tmp_CPPFLAGS="$ac_var_stripped"	42	tmp_CPPFLAGS="$ac_var_stripped"
43	squeeze tmp_CPPFLAGS	43	squeeze tmp_CPPFLAGS
44	+fi	44	+fi
45		45
46	if test "$want_optimize" = "yes"; then	46	if test "$want_optimize" = "yes"; then
47	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5	47	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5
48	@@ -28147,30 +28152,30 @@ $as_echo "found" >&6; }	48	@@ -29490,31 +29495,31 @@ printf "%s\n" "found" >&6; }
49	;;	49	;;
50	off)	50	off)
51	LIB_RTMP="-lrtmp"	51	LIB_RTMP="-lrtmp"
Lines 72-91 Link Here
72	CPPFLAGS="$CPPFLAGS $CPP_RTMP"	72	CPPFLAGS="$CPPFLAGS $CPP_RTMP"
73	LIBS="$LIB_RTMP $LIBS"	73	LIBS="$LIB_RTMP $LIBS"
74		74
75	- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5	75	- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in -lrtmp" >&5
76	-$as_echo_n "checking for RTMP_Init in -lrtmp... " >&6; }	76	-printf %s "checking for RTMP_Init in -lrtmp... " >&6; }
77	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5	77	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTMP_Init in $LIB_RTMP" >&5
78	+$as_echo_n "checking for RTMP_Init in $LIB_RTMP... " >&6; }	78	+printf %s "checking for RTMP_Init in $LIB_RTMP... " >&6; }
79	if ${ac_cv_lib_rtmp_RTMP_Init+:} false; then :	79	if test ${ac_cv_lib_rtmp_RTMP_Init+y}
80	$as_echo_n "(cached) " >&6	80	then :
81	else	81	printf %s "(cached) " >&6
		82	else $as_nop
82	ac_check_lib_save_LIBS=$LIBS	83	ac_check_lib_save_LIBS=$LIBS
83	-LIBS="-lrtmp $LIBS"	84	-LIBS="-lrtmp $LIBS"
84	+LIBS="$LIBS"	85	+LIBS="$LIBS"
85	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	86	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
86	/* end confdefs.h. */	87	/* end confdefs.h. */
87		88
88	@@ -43354,9 +43359,10 @@ $as_echo "$as_me: LIBS note: LIBS should only be used	89	@@ -46199,9 +46204,10 @@ printf "%s\n" "$as_me: LIBS note: LIBS should only be
89	-I*)	90	-I*)
90	xc_bad_var_ldflags=yes	91	xc_bad_var_ldflags=yes
91	;;	92	;;
Lines 99-105 Link Here
99	esac	100	esac
100	done	101	done
101	if test $xc_bad_var_ldflags = yes; then	102	if test $xc_bad_var_ldflags = yes; then
102	@@ -43426,9 +43432,10 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS	103	@@ -46271,9 +46277,10 @@ printf "%s\n" "$as_me: $xc_bad_var_msg libraries. Use
103	xc_bad_var_cflags=no	104	xc_bad_var_cflags=no
104	for xc_word in $CFLAGS; do	105	for xc_word in $CFLAGS; do
105	case "$xc_word" in	106	case "$xc_word" in
106	-