Update to 7.15.1 [1]

Reorganize Makefile

PR:		90079 [1]
Submitted by:	Vasil Dimov <vd@datamax.bg>
Approved by:	maintainer timeout (security 1 day, simon with secteam hat)
Security:	http://curl.haxx.se/docs/adv_20051207.html
		http://secunia.com/advisories/17907/

3 files changed, 27 insertions, 25 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 03924b13d5a2..0b956fa15413 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.15.0
+PORTVERSION=	7.15.1
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -21,24 +21,18 @@ COMMENT=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
 MAN1=		curl.1 curl-config.1
 MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
 		curl_easy_init.3 curl_easy_perform.3 curl_easy_reset.3 \
-		curl_easy_setopt.3 curl_easy_strerror.3 \
-		curl_escape.3 curl_unescape.3 \
-		curl_formadd.3 curl_formfree.3 \
-		curl_free.3 \
-		curl_getdate.3 curl_getenv.3 \
-		curl_global_init.3 curl_global_init_mem.3 curl_global_cleanup.3 \
-		curl_mprintf.3 \
+		curl_easy_setopt.3 curl_easy_strerror.3 curl_escape.3 \
+		curl_unescape.3 curl_formadd.3 curl_formfree.3 curl_free.3 \
+		curl_getdate.3 curl_getenv.3 curl_global_init.3 \
+		curl_global_init_mem.3 curl_global_cleanup.3 curl_mprintf.3 \
 		curl_multi_add_handle.3 curl_multi_cleanup.3 \
 		curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \
 		curl_multi_perform.3 curl_multi_remove_handle.3 \
-		curl_multi_strerror.3 \
-		curl_share_cleanup.3 curl_share_init.3 curl_share_setopt.3 \
-		curl_share_strerror.3 \
-		curl_slist_append.3 curl_slist_free_all.3 \
-		curl_strequal.3 \
-		curl_version.3 curl_version_info.3 \
-		libcurl.3 libcurl-easy.3 libcurl-errors.3 libcurl-multi.3 \
-		libcurl-share.3 libcurl-tutorial.3
+		curl_multi_strerror.3 curl_share_cleanup.3 curl_share_init.3 \
+		curl_share_setopt.3 curl_share_strerror.3 curl_slist_append.3 \
+		curl_slist_free_all.3 curl_strequal.3 curl_version.3 \
+		curl_version_info.3 libcurl.3 libcurl-easy.3 libcurl-errors.3 \
+		libcurl-multi.3 libcurl-share.3 libcurl-tutorial.3
 
 INSTALLS_SHLIB=	yes
 SHLIB_VER=	3
@@ -46,9 +40,10 @@ SHLIB_VER=	3
 MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
 
+USE_BZIP2=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_BZIP2=	yes
 
 .if defined(WITH_GNUTLS)
 WITHOUT_SSL=	yes
@@ -94,15 +89,19 @@ CONFIGURE_ARGS+=	--without-libidn
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
-# the user's locale when dates are sent to the server.
-test:	build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} test
+post-patch:
+	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 	${CP} -r ${WRKSRC}/docs/* ${DOCSDIR}/
 .endif
 
+# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
+# the user's locale when dates are sent to the server.
+test:	build
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} test
+
 .include <bsd.port.post.mk>
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 040a8c983c7b..18396a15771c 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,2 +1,3 @@
-MD5 (curl-7.15.0.tar.bz2) = e3b130320d3704af375c097606f49c01
-SIZE (curl-7.15.0.tar.bz2) = 1426714
+MD5 (curl-7.15.1.tar.bz2) = d330d48580bfade58c82d4f295f171f0
+SHA256 (curl-7.15.1.tar.bz2) = 8b1ea75a91ef7d1e00086865eba9a4cf8baefcb212ce451a61348e00b8756324
+SIZE (curl-7.15.1.tar.bz2) = 1437950
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 43e5c1bc95c2..15ff99f7220b 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -11,6 +11,7 @@ include/curl/types.h
 lib/libcurl.a
 lib/libcurl.so
 lib/libcurl.so.%%SHLIB_VER%%
+libdata/pkgconfig/libcurl.pc
 %%SSL%%%%DATADIR%%/curl-ca-bundle.crt
 %%SSL%%@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/BINDINGS
@@ -21,6 +22,7 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/FEATURES
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.devcpp
 %%PORTDOCS%%%%DOCSDIR%%/INTERNALS
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE-MIXING