Attachment #53673 for bug #81195

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




#

PORTNAME=	curl
PORTVERSION=	7.14.0
PORTREVISION=	1
CATEGORIES=	ftp ipv6 www
MASTER_SITES=	http://curl.haxx.se/download/ \
		${MASTER_SITE_SOURCEFORGE} \


GNU_CONFIGURE=	yes
USE_BZIP2=	yes

.if defined(WITH_GNUTLS)
WITHOUT_SSL=	yes
.endif

.if !defined(WITHOUT_SSL)
USE_OPENSSL=	yes
.endif


.if !defined(WITHOUT_SSL)
CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
PLIST_SUB+=	SSL=""
.else
CONFIGURE_ARGS=	--without-ssl
.endif

.if defined(WITH_GNUTLS)
LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
.else
CONFIGURE_ARGS+=--without-gnutls
.endif

.if !defined(WITHOUT_SSL) || defined(WITH_GNUTLS)
PLIST_SUB+=	SSL=""
.else
PLIST_SUB+=	SSL="@comment "
.endif


Lines 1-2 Link Here

(-)curl/distinfo (-2 / +2 lines)
1	MD5 (curl-7.13.1.tar.bz2) = d673f68dbab2553acdbfb5435bd1cd48	1	MD5 (curl-7.14.0.tar.bz2) = 46ce665e47d37fce1a0bad935cce58a9
2	SIZE (curl-7.13.1.tar.bz2) = 1860688	2	SIZE (curl-7.14.0.tar.bz2) = 1920305




--- tests/runtests.pl.orig	Wed May 18 11:50:16 2005
+++ tests/runtests.pl	Wed May 18 11:50:32 2005
@@ -29,7 +29,7 @@
 @INC=(@INC, $ENV{'srcdir'}, ".");
 
 require "getpart.pm"; # array functions
-require "valgrind.pm"; # valgrind report parser
+#require "valgrind.pm"; # valgrind report parser
 require "ftp.pm";
 
 my $srcdir = $ENV{'srcdir'} || '.';
 my $HOSTIP="127.0.0.1";

Lines 70-75 Link Here

(-)curl/pkg-plist (+1 lines)
70	%%PORTDOCS%%%%DOCSDIR%%/examples/multi-post.c	70	%%PORTDOCS%%%%DOCSDIR%%/examples/multi-post.c
71	%%PORTDOCS%%%%DOCSDIR%%/examples/multi-single.c	71	%%PORTDOCS%%%%DOCSDIR%%/examples/multi-single.c
72	%%PORTDOCS%%%%DOCSDIR%%/examples/multithread.c	72	%%PORTDOCS%%%%DOCSDIR%%/examples/multithread.c
		73	%%PORTDOCS%%%%DOCSDIR%%/examples/opensslthreadlock.c
73	%%PORTDOCS%%%%DOCSDIR%%/examples/persistant.c	74	%%PORTDOCS%%%%DOCSDIR%%/examples/persistant.c
74	%%PORTDOCS%%%%DOCSDIR%%/examples/post-callback.c	75	%%PORTDOCS%%%%DOCSDIR%%/examples/post-callback.c
75	%%PORTDOCS%%%%DOCSDIR%%/examples/postit2.c	76	%%PORTDOCS%%%%DOCSDIR%%/examples/postit2.c

Return to bug 81195

Lines 6-13 Link Here

(-)curl/Makefile (-3 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= curl	8	PORTNAME= curl
9	PORTVERSION= 7.13.1	9	PORTVERSION= 7.14.0
10	PORTREVISION= 1
11	CATEGORIES= ftp ipv6 www	10	CATEGORIES= ftp ipv6 www
12	MASTER_SITES= http://curl.haxx.se/download/ \	11	MASTER_SITES= http://curl.haxx.se/download/ \
13	${MASTER_SITE_SOURCEFORGE} \	12	${MASTER_SITE_SOURCEFORGE} \
Lines 49-54 Link Here
49		48
50	GNU_CONFIGURE= yes	49	GNU_CONFIGURE= yes
51	USE_BZIP2= yes	50	USE_BZIP2= yes
		51
		52	.if defined(WITH_GNUTLS)
		53	WITHOUT_SSL= yes
		54	.endif
		55
52	.if !defined(WITHOUT_SSL)	56	.if !defined(WITHOUT_SSL)
53	USE_OPENSSL= yes	57	USE_OPENSSL= yes
54	.endif	58	.endif
Lines 57-65 Link Here
57		61
58	.if !defined(WITHOUT_SSL)	62	.if !defined(WITHOUT_SSL)
59	CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}	63	CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
60	PLIST_SUB+= SSL=""
61	.else	64	.else
62	CONFIGURE_ARGS= --without-ssl	65	CONFIGURE_ARGS= --without-ssl
		66	.endif
		67
		68	.if defined(WITH_GNUTLS)
		69	LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
		70	CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
		71	.else
		72	CONFIGURE_ARGS+=--without-gnutls
		73	.endif
		74
		75	.if !defined(WITHOUT_SSL) \|\| defined(WITH_GNUTLS)
		76	PLIST_SUB+= SSL=""
		77	.else
63	PLIST_SUB+= SSL="@comment "	78	PLIST_SUB+= SSL="@comment "
64	.endif	79	.endif
65		80

Lines 1-11 Link Here

(-)curl/files/patch-tests::runtests.pl (-3 / +3 lines)
1	--- tests/runtests.pl.orig Sat Mar 12 03:40:30 2005	1	--- tests/runtests.pl.orig Wed May 18 11:50:16 2005
2	+++ tests/runtests.pl Sat Mar 12 03:40:39 2005	2	+++ tests/runtests.pl Wed May 18 11:50:32 2005
3	@@ -29,7 +29,7 @@	3	@@ -29,7 +29,7 @@
4	@INC=(@INC, $ENV{'srcdir'}, ".");	4	@INC=(@INC, $ENV{'srcdir'}, ".");
5		5
6	require "getpart.pm"; # array functions	6	require "getpart.pm"; # array functions
7	-require "valgrind.pm"; # valgrind report parser	7	-require "valgrind.pm"; # valgrind report parser
8	+#require "valgrind.pm"; # valgrind report parser	8	+#require "valgrind.pm"; # valgrind report parser
		9	require "ftp.pm";
9		10
10	my $srcdir = $ENV{'srcdir'} \|\| '.';	11	my $srcdir = $ENV{'srcdir'} \|\| '.';
11	my $HOSTIP="127.0.0.1";