Date: Tue, 17 Jul 2012 19:30:37 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/169946: [PATCH] ftp/curl: prepare for slave curl-hiphop Message-ID: <20120717173037.5A919BC75@neo.vx.sk> Resent-Message-ID: <201207171740.q6HHe9hM063709@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169946
>Category: ports
>Synopsis: [PATCH] ftp/curl: prepare for slave curl-hiphop
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 17 17:40:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.0-STABLE FreeBSD 9.0-STABLE #6 r237147M: Sat Jun 16 01:05:38 CEST
>Description:
Prepare ftp/curl for slave port ftp/curl-hiphop
This will be only a patched static version of the library installed together
with other hiphop stuff in ${LOCALBASE}/share/hiphop-php/ext for use with
the HipHop PHP compiler.
If this is not desired, I will SVN copy and modify ftp/curl for this purpose.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:
--- curl-7.24.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/Makefile,v
retrieving revision 1.118
diff -u -r1.118 Makefile
--- Makefile 3 Mar 2012 08:05:19 -0000 1.118
+++ Makefile 17 Jul 2012 17:28:10 -0000
@@ -12,8 +12,8 @@
LOCAL/sunpoet
EXTRACT_SUFX= .tar.lzma
-MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
+MAINTAINER?= sunpoet@FreeBSD.org
+COMMENT?= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
LICENSE= MIT
@@ -33,17 +33,20 @@
RTMP "RTMP streams support" off \
TRACKMEMORY "Enable curl memory diagnostic output" off
-CONFIGURE_ARGS= --disable-threaded-resolver --disable-werror \
+CONFIGURE_ARGS+= --disable-threaded-resolver --disable-werror \
--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
CONFIGURE_ENV= LOCALBASE="${LOCALBASE}"
GNU_CONFIGURE= yes
MAKE_ENV= SHLIB_VER="${SHLIB_VER}"
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomehack
+.if !defined(_BUILDING_CURL_HIPHOP)
USE_LDCONFIG= yes
+.endif #defined(_BUILDING_CURL_HIPHOP)
USE_PERL5_BUILD= yes
USE_XZ= yes
+.if !defined(_BUILDING_CURL_HIPHOP)
DOCS= BINDINGS BUGS CONTRIBUTE DISTRO-DILEMMA FAQ FEATURES HISTORY \
INSTALL INSTALL.devcpp INTERNALS KNOWN_BUGS LICENSE-MIXING \
MANUAL README.netware README.win32 RESOURCES SSLCERTS THANKS \
@@ -69,9 +72,10 @@
curl_version.3 curl_version_info.3 libcurl.3 libcurl-easy.3 \
libcurl-errors.3 libcurl-multi.3 libcurl-share.3 \
libcurl-tutorial.3
-PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
+PLIST_SUB+= SHLIB_VER="${SHLIB_VER}"
SHLIB_VER= 6
+.endif #defined(_BUILDING_CURL_HIPHOP)
.include <bsd.port.options.mk>
@@ -207,6 +211,7 @@
@${REINPLACE_CMD} -e '/require "valgrind.pm";/d' ${WRKSRC}/tests/runtests.pl
post-install:
+.if !defined(_BUILDING_CURL_HIPHOP)
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/
cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
@@ -216,6 +221,7 @@
${MKDIR} ${EXAMPLESDIR}/
cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${EXAMPLESDIR}/
.endif
+.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.
--- curl-7.24.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120717173037.5A919BC75>